Merge remote-tracking branch 'origin/main'

8 files changed, 240 insertions, 134 deletions

diff --git a/views/mods/mod_paypal/order_done.phtml b/views/mods/mod_paypal/order_done.phtml
index 12f66a7..9f45680 100644
--- a/views/mods/mod_paypal/order_done.phtml
+++ b/views/mods/mod_paypal/order_done.phtml
@@ -1,39 +1,48 @@
 <?php

 

 	/**

-	 * Dieses Template wird nach einer PayPal Zahlung angezeigt

+	 * Dieses Template wird nach dem Bestellabschluss mit der Zahlungsart PayPal angezeigt

 	 */

 

+	if (!defined('ABSPATH')) exit;

+

+	$bDone = (($this->view['wpsg_mod_paypal']['done']??'') === '1');

+	$strLink = (string)($this->view['paypalLink']??'');

+

 ?>

 

-<?php if (!wpsg_isSizedInt($this->view['wpsg_mod_paypal']['done'])) { ?>

-	

-	<p><?php echo __('Um den Betrag mit PayPal zu bezahlen klicken Sie bitte auf folgendes Logo.', 'wpsg'); ?></p> 

-		

+<?php if (!$bDone) { ?>

+

+	<p><?php echo esc_html__('Um den Betrag mit PayPal zu bezahlen klicken Sie bitte auf folgendes Logo.', 'wpsg'); ?></p>

+

 	<p>

-		<a title="<?php echo __('Mit PayPal bezahlen', 'wpsg'); ?>" href="<?php echo $this->view['paypalLink']; ?>">

-			<img src="<?php echo $this->getRessourceURL('mods/mod_paypal/gfx/pp-logo-big.png'); ?>" align="left" alt="<?php echo __('Mit PayPal bezahlen', 'wpsg'); ?>" style="margin-right:7px;">

+		<a title="<?php echo esc_attr__('Mit PayPal bezahlen', 'wpsg'); ?>" href="<?php echo esc_url($strLink); ?>">

+			<img src="<?php echo esc_url($this->getRessourceURL('mods/mod_paypal/gfx/pp-logo-big.png')); ?>" align="left" alt="<?php echo esc_attr__('Mit PayPal bezahlen', 'wpsg'); ?>" style="margin-right:7px;">

 		</a>

 	</p>

-		

+

 	<?php if ($this->get_option('wpsg_mod_paypal_autostart') == '1') { ?>

-	

+

 		<script>

-		 

-			jQuery(document).ready(function() { 

+

+			jQuery(document).ready(function() {

+

 				window.setTimeout(function() {

-				location.href = "<?php echo $this->view['paypalLink']; ?>";

+

+					location.href = <?php echo wp_json_encode($strLink); ?>;

+

 				}, 1000);

-			} );

-		

+

+			});

+

 		</script>

-	

+

 	<?php } ?>

-		

+

 <?php } else { ?>

 

 	<p>

-		<?php echo __('Die Zahlung wurde bereits mit PayPal abgeschlossen.', 'wpsg'); ?>

+		<?php echo esc_html__('Die Zahlung wurde bereits mit PayPal abgeschlossen.', 'wpsg'); ?>

 	</p>

 

 <?php } ?>

diff --git a/views/mods/mod_paypal/order_view_afterpayment.phtml b/views/mods/mod_paypal/order_view_afterpayment.phtml
index af7c067..20bbfd2 100644
--- a/views/mods/mod_paypal/order_view_afterpayment.phtml
+++ b/views/mods/mod_paypal/order_view_afterpayment.phtml
@@ -3,32 +3,64 @@
 	/**

 	 * Template für die Integration der PayPal Zahlungsart in die Bestellverwaltung

 	 */

-	

-	$wpsg_mod_paypal_paymentid = $this->view['oOrder']->getMeta('wpsg_mod_paypal_paymentid');

-	$wpsg_mod_paypal_saleid = $this->view['oOrder']->getMeta('wpsg_mod_paypal_saleid');

-	

+

+	if (!defined('ABSPATH')) exit;

+

+	$oOrder = $this->view['oOrder'];

+

+	$strPaymentID = (string)$oOrder->getMeta(wpsg_mod_paypal::META_PAYPAL_ID);

+	$strPaymentState = strtolower((string)$oOrder->getMeta(wpsg_mod_paypal::META_STATE));

+	$strSaleID = (string)$oOrder->getMeta(wpsg_mod_paypal::META_CAPTURE_ID);

+	$bLegacy = ((string)$oOrder->getMeta(wpsg_mod_paypal::META_API) !== 'v2');

+

+	// Farbe des Status: eingezogen grün, offen gelb, abgebrochen rot

+	$arStateClass = [

+		'completed' => 'success',

+		'approved' => (($bLegacy)?'success':'warning'),

+		'created' => 'warning',

+		'saved' => 'warning',

+		'payer_action_required' => 'warning',

+		'pending' => 'warning',

+		'voided' => 'danger',

+		'failed' => 'danger',

+		'canceled' => 'danger'

+	];

+

+	$strRefreshURL = wpsg_admin_url('Order', 'view', ['action' => 'ajax', 'mod' => 'wpsg_mod_paypal', 'do' => 'refresh', 'edit_id' => $oOrder->getId()], ['noheader' => '1']);

+

 ?>

 

-<?php if (wpsg_isSizedString($wpsg_mod_paypal_paymentid)) { ?>

-	

-	<div class="wpsg_form_field ">

-		<div class="wpsg_form_left">

-			<label for=""><?php echo __('PaymentID', 'wpsg'); ?>: [<a href="<?php 

-				

-				echo wpsg_admin_url('Order', 'view', ['action' => 'ajax', 'mod' => 'wpsg_mod_paypal', 'do' => 'refresh', 'edit_id' => $this->view['oOrder']->getId()], ['noheader' => '1']);

-					

-			?>"><?php echo __('Status Aktualisieren', 'wpsg'); ?></a>]</label>

-		</div>

-		<div class="wpsg_form_right">

-			<p class="" id=""><?php echo wpsg_translate(__('#1# (#2#)', 'wpsg'), $this->view['oOrder']->getMeta('wpsg_mod_paypal_paymentid'), $this->view['oOrder']->getMeta('wpsg_mod_paypal_paymentstate')); ?></p>

-		</div>

-		<div class="wpsg_clear"></div>

-	</div>

-		

-<?php } ?>

+<?php if ($strPaymentID !== '') { ?>

+

+	<?php

+

+		if ($strPaymentState !== '') {

+

+			$strState = '<span class="label label-'.esc_attr($arStateClass[$strPaymentState]??'default').'" style="font-size:12px;">'.esc_html(strtoupper($strPaymentState)).'</span>';

+

+		} else {

+

+			$strState = '<span class="label label-default" style="font-size:12px;">'.esc_html__('Unbekannt', 'wpsg').'</span>';

+

+		}

+

+		$strState .= ' &nbsp;<a class="btn btn-default btn-xs" href="'.esc_url($strRefreshURL).'"><span class="glyphicon glyphicon-refresh" aria-hidden="true"></span> '.esc_html__('Status Aktualisieren', 'wpsg').'</a>';

+

+	?>

+

+	<?php echo wpsg_drawForm_Text(__('PayPal Status', 'wpsg'), $strState); ?>

+	<?php echo wpsg_drawForm_Text((($bLegacy)?__('PaymentID', 'wpsg'):__('PayPal Order-ID', 'wpsg')), '<code>'.esc_html($strPaymentID).'</code>'); ?>

+

+	<?php if ($strSaleID !== '') { ?>

+

+		<?php echo wpsg_drawForm_Text((($bLegacy)?__('SaleID', 'wpsg'):__('Transaktions-ID', 'wpsg')), '<code>'.esc_html($strSaleID).'</code>'); ?>

+

+	<?php } ?>

+

+	<?php if ($bLegacy) { ?>

+

+		<?php echo wpsg_drawForm_Text(__('Schnittstelle', 'wpsg'), esc_html__('Payments API v1 (bestehende Zahlung)', 'wpsg')); ?>

 

-<?php if (wpsg_isSizedString($wpsg_mod_paypal_saleid)) { ?>

+	<?php } ?>

 

-	<?php echo wpsg_drawForm_Input('', __('SaleID', 'wpsg'), $this->view['oOrder']->getMeta('wpsg_mod_paypal_saleid'), array('text' => true)); ?>

-		

 <?php } ?>

diff --git a/views/mods/mod_paypal/settings_edit.phtml b/views/mods/mod_paypal/settings_edit.phtml
index a366dff..daedb77 100644
--- a/views/mods/mod_paypal/settings_edit.phtml
+++ b/views/mods/mod_paypal/settings_edit.phtml
@@ -1,77 +1,131 @@
-<?php 

+<?php

 

 	/**

 	 * Templatedatei für die Einstellungen des PayPal Moduls

 	 */

 

+	if (!defined('ABSPATH')) exit;

+

+	$arView = $this->view['wpsg_mod_paypal'];

+	$arStatus = (array)($arView['arStatus']??[]);

+	$bSandbox = (bool)$arView['bSandbox'];

+

+	$arStornoStatus = (array)$this->get_option('wpsg_mod_paypal_stornostate');

+	$strDeveloperURL = 'https://developer.paypal.com/dashboard/applications/'.(($bSandbox)?'sandbox':'live');

+

+	// Das gespeicherte Prüfergebnis gilt nur für den aktuell eingestellten Modus

+	$bChecked = (isset($arStatus['time']) && (bool)($arStatus['sandbox']??false) === $bSandbox);

+

+	$strBadge = '<span class="label label-%s" style="font-size:12px;">%s</span>';

+

+	if ($bSandbox) {

+

+		$strMode = sprintf($strBadge, 'warning', esc_html__('Sandbox (Testbetrieb)', 'wpsg'));

+

+	} else {

+

+		$strMode = sprintf($strBadge, 'success', esc_html__('Live', 'wpsg'));

+

+	}

+

+	if (!$arView['bCredentials']) {

+

+		$strConnection = sprintf($strBadge, 'default', esc_html__('Keine Zugangsdaten hinterlegt', 'wpsg'));

+

+	} else if (!$bChecked) {

+

+		$strConnection = sprintf($strBadge, 'default', esc_html__('Noch nicht geprüft, bitte speichern', 'wpsg'));

+

+	} else if ($arStatus['connected'] === true) {

+

+		$strConnection = sprintf($strBadge, 'success', esc_html__('Verbindung erfolgreich', 'wpsg'));

+

+	} else {

+

+		$strConnection = sprintf($strBadge, 'danger', esc_html__('Anmeldung fehlgeschlagen', 'wpsg'));

+

+		if ((string)($arStatus['message']??'') !== '') $strConnection .= '<br /><small class="text-danger">'.esc_html($arStatus['message']).'</small>';

+

+	}

+

+	if ($bChecked && $arStatus['connected'] === true) {

+

+		$strWebHook = sprintf($strBadge, (($arStatus['webhook'] === true)?'success':'warning'), (($arStatus['webhook'] === true)?esc_html__('Angemeldet', 'wpsg'):esc_html__('Nicht angemeldet', 'wpsg')));

+

+	} else {

+

+		$strWebHook = sprintf($strBadge, 'default', esc_html__('Unbekannt', 'wpsg'));

+

+	}

+

 ?>

 

-<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_bezeichnung', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_paypal_bezeichnung'), array('help' => 'wpsg_shippay_name')); ?>

-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypal_aktiv', __('Aktiv', 'wpsg'), $this->get_option('wpsg_mod_paypal_aktiv'), array('help' => 'wpsg_shippay_activ')); ?>

-<?php echo wpsg_drawForm_Textarea('wpsg_mod_paypal_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_paypal_hint'), array('help' => 'wpsg_shippay_hint')); ?>

-

-<br />

-	

-<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_clientid', __('Client ID', 'wpsg'), $this->get_option('wpsg_mod_paypal_clientid'), array('hint' => wpsg_translate(__('Erhalten Sie im <a target="_blank" href="#1#">PayPal Developer Interface</a>.', 'wpsg'), 'https://developer.paypal.com/'), 'help' => 'wpsg_mod_paypal_clientid')); ?>

-<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_secret', __('Secret', 'wpsg'), $this->get_option('wpsg_mod_paypal_secret'), array('hint' => wpsg_translate(__('Erhalten Sie im <a target="_blank" href="#1#">PayPal Developer Interface</a>.', 'wpsg'), 'https://developer.paypal.com/'), 'help' => 'wpsg_mod_paypal_secret')); ?>

-		

-<div class="wpsg_form_field ">

-	<div class="wpsg_form_left">

-		<label for=""><?php echo __('Stornierung bei Statuswechsel', 'wpsg'); ?>:</label>

-	</div>

-	<div class="wpsg_form_right">

-		<a href="#" class="wpsg_mod_paypal_stornostate"><?php echo __('Bearbeiten', 'wpsg'); ?></a>

-	</div>

-	<div class="wpsg_clear"></div>

-</div>

-<div class="wpsg_mod_paypal_stornostate_layer" style="display:none;">

-	

-	<?php foreach ($this->arStatus as $status_id => $status_label) { $arStornoStatus = (array)$this->get_option('wpsg_mod_paypal_stornostate'); ?>

-	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypal_stornostate['.$status_id.']', __($status_label, 'wpsg'), $arStornoStatus[$status_id], array('labelright' => true)); ?>	

-	<?php } ?> 

-	

-	<br />

-	

-</div>

-

-<?php echo wpsg_drawForm_Input('', __('WebHook URL', 'wpsg'), $this->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_paypal', 'webHook', array(), true), array('readonly' => true, 'help' => 'wpsg_mod_paypal_webhook_url')); ?>

-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypal_createwebhook',  __('Beim speichern versuchen den WebHook anzumelden.', 'wpsg'), 0, array('labelright' => true, 'noDoubleDot' => true, 'help' => 'wpsg_mod_paypal_createwebhook')); ?>

-			

-<script type="text/javascript">/* <![CDATA[ */

-

-	jQuery(document).ready(function() {

- 

-		jQuery('.wpsg_mod_paypal_stornostate').bind('click', function() {

-

-			jQuery('.wpsg_mod_paypal_stornostate_layer').toggle();

-

-			if (jQuery('.wpsg_mod_paypal_stornostate_layer').is(':visible')) jQuery(this).html('<?php echo __('Ausblenden', 'wpsg'); ?>');

-			else jQuery(this).html('<?php echo __('Bearbeiten', 'wpsg'); ?>');

-			

-			return false;

-			

-		} );

-		

-	} );

-

-/* ]]> */</script>

-

-<br />

-

-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypal_sandbox', __('Sandbox Modus', 'wpsg'), $this->get_option('wpsg_mod_paypal_sandbox'), array('help' => 'wpsg_mod_paypal_sandbox')); ?>

-<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_subject', __('Betreff der Überweisung', 'wpsg'), $this->get_option('wpsg_mod_paypal_subject'), array('help' => 'wpsg_mod_paypal_subject')); ?>

-<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_invoicenumber', __('Formatierung InvoiceNumber', 'wpsg'), $this->get_option('wpsg_mod_paypal_invoicenumber'), array('help' => 'wpsg_mod_paypal_invoicenumber')); ?>

-

-<br />

-

-<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_paypal_gebuehr'), true), array('help' => 'wpsg_shippay_gebuehr', 'unit' => $this->get_option('wpsg_currency').' / %')); ?>

-<?php echo wpsg_drawForm_Select('wpsg_mod_paypal_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_paypal_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>

-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypal_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_paypal_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>

-

-<br />

-

-<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_currency', __('Währungscode (Standard: EUR)', 'wpsg'), $this->get_option('wpsg_mod_paypal_currency'), array('help' => 'wpsg_mod_paypal_currency')); ?>

-<?php echo wpsg_drawForm_Select('wpsg_mod_paypal_language', __('Sprache im PayPal Interface', 'wpsg'), array('DE' => __('Deutsch', 'wpsg'), 'US' => __('Englisch', 'wpsg'), 'FR' => __('Französisch', 'wpsg')), $this->get_option('wpsg_mod_paypal_language'), array('help' => 'wpsg_mod_paypal_language')); ?>

-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypal_autostart', __('Zahlung sofort starten', 'wpsg'), $this->get_option('wpsg_mod_paypal_autostart'), array('help' => 'wpsg_shippay_paystart')); ?>

-<?php echo wpsg_drawForm_Select('wpsg_page_mod_paypal_success', __('Erfolgsseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_paypal_success'), array('help' => 'wpsg_page_mod_paypal_success')); ?>

-<?php echo wpsg_drawForm_Select('wpsg_page_mod_paypal_error', __('Fehlerseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_paypal_error'), array('help' => 'wpsg_page_mod_paypal_error')); ?>

+<?php wpsg_drawForm_AdminboxStart(__('Verbindung zu PayPal', 'wpsg'), 'wpsg_mod_paypal_status'); ?>

+

+	<?php echo wpsg_drawForm_Text(__('Umgebung', 'wpsg'), $strMode); ?>

+	<?php echo wpsg_drawForm_Text(__('Zugangsdaten', 'wpsg'), $strConnection); ?>

+	<?php echo wpsg_drawForm_Text(__('WebHook', 'wpsg'), $strWebHook); ?>

+

+	<?php if ($bChecked) { ?>

+

+		<?php echo wpsg_drawForm_Text(__('Zuletzt geprüft', 'wpsg'), esc_html(wpsg_formatTimestamp($arStatus['time']))); ?>

+

+	<?php } ?>

+

+	<?php if ($bChecked && $arStatus['connected'] === true && $arStatus['webhook'] !== true) { ?>

+

+		<div class="wpsg_hinweis"><?php echo esc_html__('Der WebHook ist bei PayPal noch nicht angemeldet. Aktivieren Sie unten "WebHook beim Speichern anmelden" und speichern Sie die Einstellungen.', 'wpsg'); ?></div>

+

+	<?php } ?>

+

+<?php wpsg_drawForm_AdminboxEnd(); ?>

+

+<?php wpsg_drawForm_AdminboxStart(__('Zahlungsart im Shop', 'wpsg'), 'wpsg_mod_paypal_payment'); ?>

+

+	<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_bezeichnung', __('Bezeichnung', 'wpsg'), $this->get_option('wpsg_mod_paypal_bezeichnung'), ['help' => 'wpsg_shippay_name']); ?>

+	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypal_aktiv', __('Aktiv', 'wpsg'), $this->get_option('wpsg_mod_paypal_aktiv'), ['help' => 'wpsg_shippay_activ']); ?>

+	<?php echo wpsg_drawForm_Textarea('wpsg_mod_paypal_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_paypal_hint'), ['help' => 'wpsg_shippay_hint']); ?>

+	<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_paypal_gebuehr'), true), ['help' => 'wpsg_shippay_gebuehr', 'unit' => $this->get_option('wpsg_currency').' / %']); ?>

+	<?php echo wpsg_drawForm_Select('wpsg_mod_paypal_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_paypal_mwst'), ['help' => 'wpsg_shippay_mwst']); ?>

+	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypal_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_paypal_mwstland'), ['help' => 'wpsg_shippay_mwstland']); ?>

+

+<?php wpsg_drawForm_AdminboxEnd(); ?>

+

+<?php wpsg_drawForm_AdminboxStart(__('Zugangsdaten', 'wpsg'), 'wpsg_mod_paypal_credentials'); ?>

+

+	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypal_sandbox', __('Sandbox Modus', 'wpsg'), $this->get_option('wpsg_mod_paypal_sandbox'), ['help' => 'wpsg_mod_paypal_sandbox', 'hint' => esc_html__('Im Sandbox Modus werden keine echten Zahlungen ausgeführt. Sandbox und Live haben eigene Zugangsdaten.', 'wpsg')]); ?>

+	<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_clientid', __('Client ID', 'wpsg'), $this->get_option('wpsg_mod_paypal_clientid'), ['help' => 'wpsg_mod_paypal_clientid']); ?>

+	<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_secret', __('Secret', 'wpsg'), $this->get_option('wpsg_mod_paypal_secret'), ['help' => 'wpsg_mod_paypal_secret', 'hint' => wpsg_translate(__('Client ID und Secret erhalten Sie im <a target="_blank" href="#1#">PayPal Developer Dashboard</a> unter "Apps & Credentials".', 'wpsg'), esc_url($strDeveloperURL))]); ?>

+

+<?php wpsg_drawForm_AdminboxEnd(); ?>

+

+<?php wpsg_drawForm_AdminboxStart(__('WebHook', 'wpsg'), 'wpsg_mod_paypal_webhook'); ?>

+

+	<?php echo wpsg_drawForm_Input('', __('WebHook URL', 'wpsg'), $arView['webhookURL'], ['readonly' => true, 'help' => 'wpsg_mod_paypal_webhook_url', 'hint' => esc_html__('Über den WebHook meldet PayPal den Zahlungseingang an den Shop. Die URL muss per HTTPS von außen erreichbar sein.', 'wpsg')]); ?>

+	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypal_createwebhook', __('WebHook beim Speichern anmelden', 'wpsg'), 0, ['help' => 'wpsg_mod_paypal_createwebhook']); ?>

+

+<?php wpsg_drawForm_AdminboxEnd(); ?>

+

+<?php wpsg_drawForm_AdminboxStart(__('Zahlungsablauf', 'wpsg'), 'wpsg_mod_paypal_process'); ?>

+

+	<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_subject', __('Betreff der Überweisung', 'wpsg'), $this->get_option('wpsg_mod_paypal_subject'), ['help' => 'wpsg_mod_paypal_subject']); ?>

+	<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_invoicenumber', __('Formatierung InvoiceNumber', 'wpsg'), $this->get_option('wpsg_mod_paypal_invoicenumber'), ['help' => 'wpsg_mod_paypal_invoicenumber']); ?>

+	<?php echo wpsg_drawForm_Input('wpsg_mod_paypal_currency', __('Währungscode (Standard: EUR)', 'wpsg'), $this->get_option('wpsg_mod_paypal_currency'), ['help' => 'wpsg_mod_paypal_currency']); ?>

+	<?php echo wpsg_drawForm_Select('wpsg_mod_paypal_language', __('Sprache im PayPal Interface', 'wpsg'), ['DE' => __('Deutsch', 'wpsg'), 'US' => __('Englisch', 'wpsg'), 'FR' => __('Französisch', 'wpsg')], $this->get_option('wpsg_mod_paypal_language'), ['help' => 'wpsg_mod_paypal_language']); ?>

+	<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypal_autostart', __('Zahlung sofort starten', 'wpsg'), $this->get_option('wpsg_mod_paypal_autostart'), ['help' => 'wpsg_shippay_paystart']); ?>

+	<?php echo wpsg_drawForm_Select('wpsg_page_mod_paypal_success', __('Erfolgsseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_paypal_success'), ['help' => 'wpsg_page_mod_paypal_success']); ?>

+	<?php echo wpsg_drawForm_Select('wpsg_page_mod_paypal_error', __('Fehlerseite', 'wpsg'), $this->view['pages'], $this->get_option('wpsg_page_mod_paypal_error'), ['help' => 'wpsg_page_mod_paypal_error']); ?>

+

+<?php wpsg_drawForm_AdminboxEnd(); ?>

+

+<?php wpsg_drawForm_AdminboxStart(__('Stornierung bei Statuswechsel', 'wpsg'), 'wpsg_mod_paypal_storno'); ?>

+

+	<p class="text-muted"><?php echo esc_html__('Wechselt eine mit PayPal bezahlte Bestellung in einen der markierten Status, wird der Betrag automatisch über PayPal erstattet.', 'wpsg'); ?></p>

+

+	<?php foreach ($this->arStatus as $status_id => $status_label) { ?>

+

+		<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypal_stornostate['.$status_id.']', __($status_label, 'wpsg'), ($arStornoStatus[$status_id]??'0')); ?>

+

+	<?php } ?>

+

+<?php wpsg_drawForm_AdminboxEnd(); ?>

diff --git a/views/mods/mod_weight/basket_row.phtml b/views/mods/mod_weight/basket_row.phtml
index e47000b..1f8b2aa 100644
--- a/views/mods/mod_weight/basket_row.phtml
+++ b/views/mods/mod_weight/basket_row.phtml
@@ -4,11 +4,14 @@
 	 * Template für die Anzeige des Produktgewichts im Warenkorb

 	 */

 	//wpsg_debug($this->view);

+

+	if (!defined('ABSPATH')) exit;

+

 ?>

 <div class="product_info">

 	<div class="title">

-		<span class="fa  fa-balance-scale"></span>

-		<?php echo __("Gewicht", "wpsg"); ?>:

-		<strong><?php echo wpsg_ff($this->view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?></strong>

-	</div> 

+		<span class="fa fa-balance-scale"></span>

+		<?php echo esc_html__('Gewicht', 'wpsg'); ?>:

+		<strong><?php echo esc_html(wpsg_ff($this->view['weight'], $this->get_option('wpsg_mod_weight_unit'))); ?></strong>

+	</div>

 </div>
\ No newline at end of file
diff --git a/views/mods/mod_weight/basket_row_end.phtml b/views/mods/mod_weight/basket_row_end.phtml
index 21d98b5..a58d2e0 100644
--- a/views/mods/mod_weight/basket_row_end.phtml
+++ b/views/mods/mod_weight/basket_row_end.phtml
@@ -4,15 +4,17 @@
 	 * Template für die Anzeige des Gesamtgewichts innerhalb des Warenkorbs

 	 */

 

+	if (!defined('ABSPATH')) exit;

+

 ?>

 <div class="basket_sum_row">

 	<div class="title">

-		<?php echo __('Gesamtgewicht', 'wpsg'); ?>:

+		<?php echo esc_html__('Gesamtgewicht', 'wpsg'); ?>:

+	</div>

+	<div class="value">

+		<?php echo esc_html(wpsg_ff($this->view['wpsg_mod_weight']['weight'], $this->get_option('wpsg_mod_weight_unit'))); ?>

 	</div>

 	<div class="value">

-		<?php echo wpsg_ff($this->view['wpsg_mod_weight']['weight'], $this->get_option('wpsg_mod_weight_unit')); ?>

+		&nbsp;

 	</div>

-    <div class="value">

-        <?php echo __('&nbsp;', 'wpsg'); ?>

-    </div>

 </div>
\ No newline at end of file
diff --git a/views/mods/mod_weight/overview_row.phtml b/views/mods/mod_weight/overview_row.phtml
index a1cd49e..beac1f1 100644
--- a/views/mods/mod_weight/overview_row.phtml
+++ b/views/mods/mod_weight/overview_row.phtml
@@ -4,12 +4,14 @@
 	 * Template für die Integration des Produktgewichts in die Bestellzusammenfassung

 	 */

 

+	if (!defined('ABSPATH')) exit;

+

 ?>

 <div class="product_info">

-	<div 

+	<div

 		<?php if ($this->view['$bPicture'] == true) { ?>class="titlep"><?php } else { ?>class="title"><?php } ?>

-		<span class="fa  fa-balance-scale"></span>

-		<?php echo __("Gewicht", "wpsg"); ?>:

-		<strong><?php echo wpsg_ff($this->view['weight'], $this->get_option('wpsg_mod_weight_unit')); ?></strong>

-	</div> 

+		<span class="fa fa-balance-scale"></span>

+		<?php echo esc_html__('Gewicht', 'wpsg'); ?>:

+		<strong><?php echo esc_html(wpsg_ff($this->view['weight'], $this->get_option('wpsg_mod_weight_unit'))); ?></strong>

+	</div>

 </div>
\ No newline at end of file
diff --git a/views/mods/mod_weight/overview_row_end.phtml b/views/mods/mod_weight/overview_row_end.phtml
index 84a3d83..d9a7f3e 100644
--- a/views/mods/mod_weight/overview_row_end.phtml
+++ b/views/mods/mod_weight/overview_row_end.phtml
@@ -4,15 +4,17 @@
 	 * Template für die Integration des Produktgewichts in die Bestellzusammenfassung

 	 */

 

+	if (!defined('ABSPATH')) exit;

+

 ?>

 <div class="overview_sum_row">

 	<div class="title">

-		<?php echo __('Gesamtgewicht', 'wpsg'); ?>:

+		<?php echo esc_html__('Gesamtgewicht', 'wpsg'); ?>:

+	</div>

+	<div class="value">

+		<?php echo esc_html(wpsg_ff($this->view['wpsg_mod_weight']['weight'], $this->get_option('wpsg_mod_weight_unit'))); ?>

 	</div>

 	<div class="value">

-		<?php echo wpsg_ff($this->view['wpsg_mod_weight']['weight'], $this->get_option('wpsg_mod_weight_unit')); ?>

+		&nbsp;

 	</div>

-    <div class="value">

-        <?php echo __('&nbsp;', 'wpsg'); ?>

-    </div>

 </div>
\ No newline at end of file
diff --git a/views/mods/mod_weight/product_addedit_content.phtml b/views/mods/mod_weight/product_addedit_content.phtml
index 3f9be4e..34bd8ff 100644
--- a/views/mods/mod_weight/product_addedit_content.phtml
+++ b/views/mods/mod_weight/product_addedit_content.phtml
@@ -1,17 +1,19 @@
 <?php

- 

+

 	/**

 	 * Template für die Integration des Produktgewichts in die Produktverwaltung

 	 */

 

+	if (!defined('ABSPATH')) exit;

+

 ?>

 

 <?php echo wpsg_drawForm_AdminboxStart(__('Produktgewicht', 'wpsg')); ?>

 

-    <?php echo wpsg_drawForm_Input('wpsg_mod_weight[weight]', __('Produktgewicht', 'wpsg'), wpsg_ff($this->view['wpsg_mod_weight']['weight']), array('unit' => $this->get_option('wpsg_mod_weight_unit'))); ?>

+	<?php echo wpsg_drawForm_Input('wpsg_mod_weight[weight]', __('Produktgewicht', 'wpsg'), wpsg_ff($this->view['wpsg_mod_weight']['weight']), ['unit' => $this->get_option('wpsg_mod_weight_unit')]); ?>

 

-    <br />

+	<br />

 

-	<a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_weight"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo __('Zur Konfiguration des Gewichtsmoduls', 'wpsg'); ?></a>

+	<a href="<?php echo esc_url(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_weight'); ?>"><span class="wpsg-glyphicon glyphicon glyphicon-wrench"></span><?php echo esc_html__('Zur Konfiguration des Gewichtsmoduls', 'wpsg'); ?></a>

 

 <?php echo wpsg_drawForm_AdminboxEnd(); ?>