From 5384d5c78d1f7bcdbe15093034e41f88224e8465 Mon Sep 17 00:00:00 2001
From: Roger Rehnelt <noreply@maennchen1.de>
Date: Sun, 27 Sep 2026 13:55:40 +0200
Subject: Befunde aus den Hilfetexten behoben (K36, K37, KU10, Z22–Z25, P29,
 P30, D27, M8, M9)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 views/mods/mod_amazon/settings_edit.phtml           |  1 -
 views/mods/mod_amazon_v2/settings_edit.phtml        |  1 -
 views/mods/mod_autodebit/settings_edit.phtml        |  1 -
 views/mods/mod_creditcard/settings_edit.phtml       |  1 -
 views/mods/mod_debitpayment/settings_edit.phtml     |  1 -
 views/mods/mod_flexipay/settings_edit.phtml         |  1 -
 views/mods/mod_giropay/settings_edit.phtml          |  3 ---
 views/mods/mod_icp/settings_edit.phtml              |  1 -
 views/mods/mod_klarna/settings_edit.phtml           |  1 -
 .../mod_micropayment_paywindow/settings_edit.phtml  |  1 -
 views/mods/mod_mollie/settings_edit.phtml           |  1 -
 views/mods/mod_paypal/settings_edit.phtml           |  1 -
 views/mods/mod_paypalapi/settings_edit.phtml        |  1 -
 .../mod_prepayment/mail_html_payment_after.phtml    |  2 +-
 views/mods/mod_prepayment/settings_edit.phtml       |  1 -
 views/mods/mod_shs/settings_edit.phtml              |  1 -
 views/mods/mod_skrill/settings_edit.phtml           |  1 -
 views/mods/mod_statistics/settings_edit.phtml       |  6 ------
 views/mods/mod_su/settings_edit.phtml               |  1 -
 views/mods/mod_targo/settings_edit.phtml            |  1 -
 views/mods/mod_trustedshops/settings_edit.phtml     |  2 +-
 views/mods/mod_userpayment/list.phtml               | 21 ---------------------
 views/mods/mod_userpayment/settings_edit.phtml      | 19 -------------------
 views/mods/mod_versandarten/list.phtml              | 21 ---------------------
 views/mods/mod_versandarten/settings_edit.phtml     | 19 -------------------
 views/mods/mod_willcollect/settings_edit.phtml      |  1 -
 views/warenkorb/ajaxDialog.phtml                    |  5 +++++
 27 files changed, 7 insertions(+), 109 deletions(-)

(limited to 'views')

diff --git a/views/mods/mod_amazon/settings_edit.phtml b/views/mods/mod_amazon/settings_edit.phtml
index 7b0d95a..827c68f 100644
--- a/views/mods/mod_amazon/settings_edit.phtml
+++ b/views/mods/mod_amazon/settings_edit.phtml
@@ -25,7 +25,6 @@
 
 <?php echo wpsg_drawForm_Input('wpsg_mod_amazon_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_amazon_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_mod_amazon_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_amazon_mwst'), array('help' => 'wpsg_mod_amazon_mwst')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_amazon_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_amazon_mwstland'), array('help' => 'wpsg_mod_amazon_mwstland')); ?>
 
 <br />
 
diff --git a/views/mods/mod_amazon_v2/settings_edit.phtml b/views/mods/mod_amazon_v2/settings_edit.phtml
index 7366201..da9b3a6 100644
--- a/views/mods/mod_amazon_v2/settings_edit.phtml
+++ b/views/mods/mod_amazon_v2/settings_edit.phtml
@@ -44,5 +44,4 @@
 
 <?php echo wpsg_drawForm_Input('wpsg_mod_amazon_v2_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_amazon_v2_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_mod_amazon_v2_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_amazon_v2_mwst'), array('help' => 'wpsg_mod_amazon_v2_mwst')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_amazon_v2_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_amazon_v2_mwstland'), array('help' => 'wpsg_mod_amazon_v2_mwstland')); ?>
 
diff --git a/views/mods/mod_autodebit/settings_edit.phtml b/views/mods/mod_autodebit/settings_edit.phtml
index 2906dc3..7acf981 100644
--- a/views/mods/mod_autodebit/settings_edit.phtml
+++ b/views/mods/mod_autodebit/settings_edit.phtml
@@ -12,7 +12,6 @@
 <br />
 <?php echo wpsg_drawForm_Input('wpsg_mod_autodebit_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_autodebit_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_mod_autodebit_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_autodebit_mwst')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_autodebit_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_autodebit_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_autodebit_iban', __('IBAN/BIC statt Kontonummer/BLZ verwenden', 'wpsg'), $this->get_option('wpsg_mod_autodebit_iban'), array('help' => 'wpsg_mod_autodebit_iban')); ?>
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_autodebit_bic', __('BIC validieren', 'wpsg'), $this->get_option('wpsg_mod_autodebit_bic'), array('help' => 'wpsg_mod_autodebit_bic')); ?>
 <?php // echo wpsg_drawForm_Button('wpsg_mod_autodebit_ibanbicconvert2',  __('BIC/IBAN Konvertierung', 'wpsg'), array('button_text' => __('BIC/IBAN Konvertieren', 'wpsg'), 'button_class' => 'wpsg_mod_autodebit_button', 'button_onclick' => 'if (!confirm(\''.wpsg_hspc(__('Es werden die Bankdaten von allen Bestellungen mit Bankeinzug in BIC/IBAN konvertiert, sofern noch nicht angegeben. Die Länderkürzel müssen den IBAN Länderkürzeln entsprechen.', 'wpsg')).'\')) return false; location.href=\''.WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_autodebit&wpsg_mod_autodebit_bicibanconverter=1&mail=0&noheader=1\'')); ?>
diff --git a/views/mods/mod_creditcard/settings_edit.phtml b/views/mods/mod_creditcard/settings_edit.phtml
index 94a7ba6..82ebeea 100644
--- a/views/mods/mod_creditcard/settings_edit.phtml
+++ b/views/mods/mod_creditcard/settings_edit.phtml
@@ -12,5 +12,4 @@
 <br />
 <?php echo wpsg_drawForm_Input('wpsg_mod_creditcard_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_creditcard_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_mod_creditcard_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_creditcard_mwst')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_creditcard_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_creditcard_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_creditcard_schluessel', __('AES-256 Passwort', 'wpsg'), $this->get_option('wpsg_mod_creditcard_schluessel'), array('help' => 'wpsg_mod_creditcard_schluessel')); ?>
diff --git a/views/mods/mod_debitpayment/settings_edit.phtml b/views/mods/mod_debitpayment/settings_edit.phtml
index 65af1bc..1c3d706 100644
--- a/views/mods/mod_debitpayment/settings_edit.phtml
+++ b/views/mods/mod_debitpayment/settings_edit.phtml
@@ -12,4 +12,3 @@
 <br />
 <?php echo wpsg_drawForm_Input('wpsg_mod_debitpayment_rabgeb', __('Rabatt/Gebühr', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_debitpayment_rabgeb'), true), array('help' => 'wpsg_mod_debitpayment_rabgeb', 'unit' => $this->get_option('wpsg_currency').' / %')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_mod_debitpayment_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_debitpayment_mwst'), array('help' => 'wpsg_mod_debitpayment_mwst')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_debitpayment_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_debitpayment_mwstland'), array('help' => 'wpsg_mod_debitpayment_mwstland')); ?>
\ No newline at end of file
diff --git a/views/mods/mod_flexipay/settings_edit.phtml b/views/mods/mod_flexipay/settings_edit.phtml
index a504b91..654a1c9 100644
--- a/views/mods/mod_flexipay/settings_edit.phtml
+++ b/views/mods/mod_flexipay/settings_edit.phtml
@@ -70,7 +70,6 @@
 ), $this->get_option('wpsg_mod_flexipay_language'), array('help' => 'wpsg_mod_flexipay_language')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_flexipay_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_flexipay_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_flexipay_gebuehr')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_mod_flexipay_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_flexipay_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_flexipay_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_flexipay_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>			
 <br />
 
 <?php echo wpsg_drawForm_Select('wpsg_mod_flexipay_successPage', __('Seite nach erfolgreicher Zahlung', 'wpsg'), $this->view['wpsg_mod_flexipay']['arPages'], $this->get_option('wpsg_mod_flexipay_successPage'), array('help' => 'wpsg_mod_flexipay_successPage')); ?>
diff --git a/views/mods/mod_giropay/settings_edit.phtml b/views/mods/mod_giropay/settings_edit.phtml
index e1d1620..b148082 100755
--- a/views/mods/mod_giropay/settings_edit.phtml
+++ b/views/mods/mod_giropay/settings_edit.phtml
@@ -31,7 +31,6 @@
             <?php echo wpsg_drawForm_Input('wpsg_mod_giropay_giropay_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_giropay_giropay_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
             <?php echo wpsg_drawForm_Select('wpsg_mod_giropay_giropay_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_giropay_giropay_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>
 
-            <?php echo wpsg_drawForm_Checkbox('wpsg_mod_giropay_giropay_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_giropay_giropay_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>
             
         </div>
         <div id="tab2" role="tabpanel" class="tab-pane active" >
@@ -44,7 +43,6 @@
             <?php echo wpsg_drawForm_Input('wpsg_mod_giropay_creditcard_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_giropay_creditcard_logo'), array('help' => 'wpsg_shippay_logo')); ?>
             <?php echo wpsg_drawForm_Input('wpsg_mod_giropay_creditcard_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_giropay_creditcard_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
             <?php echo wpsg_drawForm_Select('wpsg_mod_giropay_creditcard_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_giropay_creditcard_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>
-            <?php echo wpsg_drawForm_Checkbox('wpsg_mod_giropay_creditcard_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_giropay_creditcard_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>
             
         </div>
         <div id="tab3" role="tabpanel" class="tab-pane active" >
@@ -57,7 +55,6 @@
             <?php echo wpsg_drawForm_Input('wpsg_mod_giropay_directdebit_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_giropay_directdebit_logo'), array('help' => 'wpsg_shippay_logo')); ?>
             <?php echo wpsg_drawForm_Input('wpsg_mod_giropay_directdebit_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_giropay_directdebit_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
             <?php echo wpsg_drawForm_Select('wpsg_mod_giropay_directdebit_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_giropay_directdebit_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>
-            <?php echo wpsg_drawForm_Checkbox('wpsg_mod_giropay_directdebit_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_giropay_directdebit_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>
             
         </div>
     </div>
diff --git a/views/mods/mod_icp/settings_edit.phtml b/views/mods/mod_icp/settings_edit.phtml
index b8566fc..c9de970 100644
--- a/views/mods/mod_icp/settings_edit.phtml
+++ b/views/mods/mod_icp/settings_edit.phtml
@@ -66,7 +66,6 @@
 ), $this->get_option('wpsg_mod_icp_language'), array('help' => 'wpsg_mod_icp_language')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_icp_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_icp_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_mod_icp_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_icp_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_icp_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_icp_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>			
 <br />
 
 <?php echo wpsg_drawForm_Select('wpsg_mod_icp_successPage', __('Seite nach erfolgreicher Zahlung', 'wpsg'), $this->view['wpsg_mod_icp']['arPages'], $this->get_option('wpsg_mod_icp_successPage'), array('help' => 'wpsg_mod_icp_successPage')); ?>
diff --git a/views/mods/mod_klarna/settings_edit.phtml b/views/mods/mod_klarna/settings_edit.phtml
index 40ef6b4..e9c53b2 100644
--- a/views/mods/mod_klarna/settings_edit.phtml
+++ b/views/mods/mod_klarna/settings_edit.phtml
@@ -54,5 +54,4 @@
 
 <?php echo wpsg_drawForm_Input('wpsg_mod_klarna_fee', __('Gebühr', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_klarna_fee'), true), array('help' => 'wpsg_mod_klarna_fee','unit' => $this->get_option('wpsg_currency').' / %')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_mod_klarna_tax_key', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_klarna_tax_key'), array('help' => 'wpsg_mod_klarna_tax_key')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_klarna_notaxcountry', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_klarna_notaxcountry'), array('help' => 'wpsg_mod_klarna_notaxcountry')); ?>
 <?php echo wpsg_drawForm_Textarea('wpsg_mod_klarna_hint', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_klarna_hint'), array('help' => 'wpsg_mod_klarna_hint')); ?>
diff --git a/views/mods/mod_micropayment_paywindow/settings_edit.phtml b/views/mods/mod_micropayment_paywindow/settings_edit.phtml
index 224f120..07f6d01 100644
--- a/views/mods/mod_micropayment_paywindow/settings_edit.phtml
+++ b/views/mods/mod_micropayment_paywindow/settings_edit.phtml
@@ -32,7 +32,6 @@
         <?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_paywindow_'.$pw_key.'_logo', __('Alternative Logo URL', 'wpsg'), $this->get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_logo'), array('help' => 'wpsg_mod_micropayment_paywindow_logo')); ?>
         <?php echo wpsg_drawForm_Input('wpsg_mod_micropayment_paywindow_'.$pw_key.'_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_mod_micropayment_paywindow_gebuehr')); ?>
         <?php echo wpsg_drawForm_Select('wpsg_mod_micropayment_paywindow_'.$pw_key.'_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_mwst'), array('help' => 'wpsg_mod_micropayment_paywindow_mwst')); ?>
-    <?php echo wpsg_drawForm_Checkbox('wpsg_mod_micropayment_paywindow_'.$pw_key.'_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_micropayment_paywindow_'.$pw_key.'_mwstland'), array('help' => 'wpsg_mod_micropayment_paywindow_mwstland')); ?>
 
     <?php echo wpsg_drawForm_AdminboxEnd(); ?>
 
diff --git a/views/mods/mod_mollie/settings_edit.phtml b/views/mods/mod_mollie/settings_edit.phtml
index 9917eb5..ab362c5 100644
--- a/views/mods/mod_mollie/settings_edit.phtml
+++ b/views/mods/mod_mollie/settings_edit.phtml
@@ -29,7 +29,6 @@
 	'pl_PL' => __('Polnisch', 'wpsg')
 ], $this->get_option('wpsg_mod_mollie_locale')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_mollie_description', __('Beschreibung der Zahlung', 'wpsg'), $this->get_option('wpsg_mod_mollie_description'), ['hint' => __('Erscheint auf dem Kontoauszug des Kunden, maximal 255 Zeichen. Platzhalter wie %order_id% oder %kunde_id% sind möglich.', 'wpsg')]); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_mollie_notaxcountry', __('Keine MwSt. auf die Gebühr, wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_mollie_notaxcountry'), ['help' => 'wpsg_shippay_mwstland']); ?>
 
 <br />
 
diff --git a/views/mods/mod_paypal/settings_edit.phtml b/views/mods/mod_paypal/settings_edit.phtml
index daedb77..41bd9bd 100644
--- a/views/mods/mod_paypal/settings_edit.phtml
+++ b/views/mods/mod_paypal/settings_edit.phtml
@@ -87,7 +87,6 @@
 	<?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(); ?>
 
diff --git a/views/mods/mod_paypalapi/settings_edit.phtml b/views/mods/mod_paypalapi/settings_edit.phtml
index 61f322a..7576912 100644
--- a/views/mods/mod_paypalapi/settings_edit.phtml
+++ b/views/mods/mod_paypalapi/settings_edit.phtml
@@ -37,7 +37,6 @@
 
 <?php echo wpsg_drawForm_Input('wpsg_mod_paypalapi_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_paypalapi_gebuehr')), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_shippay_gebuehr')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_mod_paypalapi_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_paypalapi_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_paypalapi_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_paypalapi_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>
 
 <br />
 
diff --git a/views/mods/mod_prepayment/mail_html_payment_after.phtml b/views/mods/mod_prepayment/mail_html_payment_after.phtml
index 1398228..0726d69 100644
--- a/views/mods/mod_prepayment/mail_html_payment_after.phtml
+++ b/views/mods/mod_prepayment/mail_html_payment_after.phtml
@@ -18,7 +18,7 @@
 
 			<tr>
 				<td>
-					<?php if ($this->get_option('wpsg_mod_prepayment_qrcode') == true) {
+					<?php if ($this->get_option('wpsg_mod_prepayment_qrcode_mail') == '1') {
 						
 						require_once WPSG_PATH_LIB.'phpgirocode.class.php';
 		
diff --git a/views/mods/mod_prepayment/settings_edit.phtml b/views/mods/mod_prepayment/settings_edit.phtml
index 7d99ebe..d8bdbe3 100644
--- a/views/mods/mod_prepayment/settings_edit.phtml
+++ b/views/mods/mod_prepayment/settings_edit.phtml
@@ -23,7 +23,6 @@
 <br />
 <?php echo wpsg_drawForm_Input('wpsg_mod_prepayment_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_prepayment_gebuehr'), true), array('help' => 'wpsg_mod_prepayment_gebuehr','unit' => $this->get_option('wpsg_currency').' / %')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_mod_prepayment_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_prepayment_mwst'), array('help' => 'wpsg_mod_prepayment_mwst')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_prepayment_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_prepayment_mwstland'), array('help' => 'wpsg_mod_prepayment_mwstland')); ?>
 
 <br />
 <?php echo wpsg_drawForm_Input('wpsg_mod_prepayment_kinhaber', __('Kontoinhaber', 'wpsg'), $this->get_option('wpsg_mod_prepayment_kinhaber'), array('help' => 'wpsg_mod_prepayment_kinhaber')); ?>
diff --git a/views/mods/mod_shs/settings_edit.phtml b/views/mods/mod_shs/settings_edit.phtml
index fc94581..df10ecb 100644
--- a/views/mods/mod_shs/settings_edit.phtml
+++ b/views/mods/mod_shs/settings_edit.phtml
@@ -34,7 +34,6 @@
 <br />
 <?php echo wpsg_drawForm_Input('wpsg_mod_shs_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_shs_gebuehr'), true), array('help' => 'wpsg_mod_shs_gebuehr','unit' => $this->get_option('wpsg_currency').' / %')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_mod_shs_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_shs_mwst'), array('help' => 'wpsg_mod_shs_mwst')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_shs_mwstland'), array('help' => 'wpsg_mod_shs_mwstland')); ?>
 <br />
 
 <?php echo wpsg_drawForm_Checkbox('wpsg_mod_shs_mobileversion', __('Mobile Version nutzen', 'wpsg'), $this->get_option('wpsg_mod_shs_mobileversion')); ?>
diff --git a/views/mods/mod_skrill/settings_edit.phtml b/views/mods/mod_skrill/settings_edit.phtml
index 0db9ade..da85c01 100644
--- a/views/mods/mod_skrill/settings_edit.phtml
+++ b/views/mods/mod_skrill/settings_edit.phtml
@@ -12,7 +12,6 @@
 <br />
 <?php echo wpsg_drawForm_Input('wpsg_mod_skrill_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_skrill_gebuehr'), true), array('help' => 'wpsg_mod_skrill_gebuehr','unit' => $this->get_option('wpsg_currency'), ' / %')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_mod_skrill_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_skrill_mwst'), array('help' => 'wpsg_mod_skrill_mwst')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_skrill_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_skrill_mwstland'), array('help' => 'wpsg_mod_skrill_mwstland')); ?>
 
 <br />
 <?php echo wpsg_drawForm_Input('wpsg_mod_skrill_currency', __('Währungscode (Standard: EUR)', 'wpsg'), $this->get_option('wpsg_mod_skrill_currency'), array('help' => 'wpsg_mod_skrill_curreny')); ?>
diff --git a/views/mods/mod_statistics/settings_edit.phtml b/views/mods/mod_statistics/settings_edit.phtml
index 7585406..6b7a565 100644
--- a/views/mods/mod_statistics/settings_edit.phtml
+++ b/views/mods/mod_statistics/settings_edit.phtml
@@ -5,7 +5,6 @@
         <li role="presentation" class="active"><a href="#tab1" aria-controls="home" role="tab" data-toggle="tab"><?php echo __('Auswertung Bestellstatus', 'wpsg'); ?></a></li>
         <li role="presentation"><a href="#tab2" aria-controls="profile" role="tab" data-toggle="tab"><?php echo __('Matomo', 'wpsg'); ?></a></li>
         <li role="presentation"><a href="#tab3" aria-controls="profile" role="tab" data-toggle="tab"><?php echo __('Google', 'wpsg'); ?></a></li>
-        <!-- <li role="presentation"><a href="#tab4" aria-controls="profile" role="tab" data-toggle="tab"><?php echo __('Social Media', 'wpsg'); ?></a></li> -->
         <li role="presentation"><a href="#tab5" aria-controls="messages" role="tab" data-toggle="tab"><?php echo __('Sonstiges', 'wpsg'); ?></a></li>
     </ul>
 
@@ -211,11 +210,6 @@
 
 		</script>
 
-		<!-- <div role="tabpanel" id="tab4" class="tab-pane">
-			<?php // echo wpsg_drawForm_input('wpsg_mod_statistics_socialmedia_fb_px', __('Facebook Pixel', 'wpsg'), $this->get_option('wpsg_mod_statistics_socialmedia_fb_px'), array('help' => 'wpsg_mod_statistics_socialmedia_fb_px')); ?>
-			<div class="wpsg_clearer"></div>
-		</div> -->
-
 		<div role="tabpanel" class="tab-pane" id="tab5">
 			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_line_chart_width', __('Liniendiagramm (Breite in px)', 'wpsg'), $this->get_option('wpsg_mod_statistics_line_chart_width'), array('help' => 'wpsg_mod_statistics_line_chart_width')); ?>
 			<?php echo wpsg_drawForm_Input('wpsg_mod_statistics_line_chart_height', __('Liniendiagramm (Höhe in px)', 'wpsg'), $this->get_option('wpsg_mod_statistics_line_chart_height'), array('help' => 'wpsg_mod_statistics_line_chart_height')); ?>
diff --git a/views/mods/mod_su/settings_edit.phtml b/views/mods/mod_su/settings_edit.phtml
index 5b36993..472cf73 100644
--- a/views/mods/mod_su/settings_edit.phtml
+++ b/views/mods/mod_su/settings_edit.phtml
@@ -45,7 +45,6 @@
 <br />
 <?php echo wpsg_drawForm_Input('wpsg_mod_su_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_su_gebuehr'), true), array('unit' => $this->get_option('wpsg_currency').' / %', 'help' => 'wpsg_mod_su_gebuehr')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_mod_su_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_su_mwst'), array('help' => 'wpsg_mod_su_mwst')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_su_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_su_mwstland'), array('help' => 'wpsg_mod_su_mwstland')); ?>
 
 <br />
 <?php echo wpsg_drawForm_Select('wpsg_mod_su_currency', __('Verwendete Währung', 'wpsg'), array('EUR' => __('Euro', 'wpsg'), 'CHF' => __('Schweizer Franken', 'wpsg'), 'GBP' => __('Britische Pfund', 'wpsg')), $this->get_option('wpsg_mod_su_currency'), array('help' => 'wpsg_mod_su_currency')); ?>
diff --git a/views/mods/mod_targo/settings_edit.phtml b/views/mods/mod_targo/settings_edit.phtml
index c1e915e..945fa57 100644
--- a/views/mods/mod_targo/settings_edit.phtml
+++ b/views/mods/mod_targo/settings_edit.phtml
@@ -38,5 +38,4 @@
 
 <?php echo wpsg_drawForm_Input('wpsg_mod_targo_gebuehr', __('Gebühr/Rabatt', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_targo_gebuehr'), true), array('help' => 'wpsg_shippay_gebuehr', 'unit' => $this->get_option('wpsg_currency').' / %')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_mod_targo_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_targo_mwst'), array('help' => 'wpsg_shippay_mwst')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_targo_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_targo_mwstland'), array('help' => 'wpsg_shippay_mwstland')); ?>
   
diff --git a/views/mods/mod_trustedshops/settings_edit.phtml b/views/mods/mod_trustedshops/settings_edit.phtml
index e6cc08b..1b66130 100644
--- a/views/mods/mod_trustedshops/settings_edit.phtml
+++ b/views/mods/mod_trustedshops/settings_edit.phtml
@@ -84,7 +84,7 @@
 
 			<?php echo wpsg_drawForm_Checkbox('wpsg_mod_trustedshops_reminder', __('Erinnerung', 'wpsg'), $this->get_option('wpsg_mod_trustedshops_reminder'), array('help' => 'wpsg_mod_trustedshops_reminder')); ?>
 			<div id="wpsg_mod_trustedshops_reminder_layer" style="display:none;">
-				<?php echo wpsg_drawForm_Input('wpsg_mod_trustedshops_reminderDays', __('Zeitspanne zum Versenden der Erinnerungsmail in Tagen', 'wpsg'), $this->get_option('wpsg_mod_trustedshops_reminderDays'), array('help' => 'wpsg_mod_trustedshops_reminderDays')); ?>
+				<?php echo wpsg_drawForm_Input('wpsg_mod_trustedshops_reminderDays', __('Erinnerung an den Export nach Tagen', 'wpsg'), $this->get_option('wpsg_mod_trustedshops_reminderDays'), array('help' => 'wpsg_mod_trustedshops_reminderDays')); ?>
 			</div>
 
 			<br />
diff --git a/views/mods/mod_userpayment/list.phtml b/views/mods/mod_userpayment/list.phtml
index 4b3fa42..cd5aa82 100644
--- a/views/mods/mod_userpayment/list.phtml
+++ b/views/mods/mod_userpayment/list.phtml
@@ -99,27 +99,6 @@
             });
         /* ]]> */</script>
 
-        <?php echo wpsg_drawForm_TextStart(); ?>
-		<input type="checkbox" value="1" <?php echo (($zv['mwst_laender'] == '1')?'checked="checked"':''); ?> id="zv_mwst_laender_<?php echo $zv['id']; ?>" />
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign form-control-feedback" data-wpsg-tip="wpsg_shippay_mwstland" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland"></a>
-        <?php echo wpsg_drawForm_TextEnd(__('Keine MwSt. wenn Land steuerfrei', 'wpsg')); ?>
-        <script type="text/javascript">/* <![CDATA[ */
-			jQuery('#zv_mwst_laender_<?php echo $zv['id']; ?>').bind('change', function() {
-
-				var value = 0;
-				if (jQuery(this).prop("checked") === true) value = 1;
-
-				jQuery.ajax( {
-					url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1',
-					data: {
-						field: 'mwst_laender',
-						zv_id: '<?php echo $zv['id']; ?>',
-						value: value
-					}	
-				} );
-			} );
-        /* ]]> */</script>
-
 	</div>
 
 	<?php if ($i == sizeof($this->view['wpsg_mod_userpayment']['data'])) { ?><hr /><?php } ?>
diff --git a/views/mods/mod_userpayment/settings_edit.phtml b/views/mods/mod_userpayment/settings_edit.phtml
index c67ccf0..c1ce75b 100644
--- a/views/mods/mod_userpayment/settings_edit.phtml
+++ b/views/mods/mod_userpayment/settings_edit.phtml
@@ -7,25 +7,6 @@
 ?>
 <script type="text/javascript">
 
-	/**
-	 * Speichert die Änderung in der Checkbox der MwSt.
-	 */
-	function wpsg_saveZVMwSt(oElement, zv_id)
-	{
-	
-		if (jQuery(oElement).attr("checked")) value = '1'; else value = '0';
-		
-		jQuery.ajax( {
-			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_userpayment&do=inlinedit&noheader=1',
-			data: {
-				field: 'mwst_laender',
-				zv_id: zv_id,
-				value: value
-			}		
-		} );
-		
-	} // function wpsg_saveZVMwSt(oElement, va_id)	
-
 	function wpsg_addZV() 
 	{
 
diff --git a/views/mods/mod_versandarten/list.phtml b/views/mods/mod_versandarten/list.phtml
index 70c022b..e6f6257 100644
--- a/views/mods/mod_versandarten/list.phtml
+++ b/views/mods/mod_versandarten/list.phtml
@@ -164,27 +164,6 @@
                 }
             });
         /* ]]> */</script>
-
-        <?php echo wpsg_drawForm_TextStart(); ?>
-		<input type="checkbox" value="1" <?php echo (($va['mwst_laender'] == '1')?'checked="checked"':''); ?> id="va_mwst_laender_<?php echo $va['id']; ?>" />
-		<a class="wpsg_glyphicon_right glyphicon glyphicon-question-sign" data-wpsg-tip="wpsg_shippay_mwstland" rel="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland" href="?page=wpsg-Admin&subaction=loadHelp&noheader=1&field=wpsg_shippay_mwstland"></a>
-        <?php echo wpsg_drawForm_TextEnd(__('Keine MwSt. wenn Land steuerfrei', 'wpsg')); ?>
-        <script type="text/javascript">/* <![CDATA[ */
-			jQuery('#va_mwst_laender_<?php echo $va['id']; ?>').bind('change', function() {
-
-				var value = 0;
-				if (jQuery(this).attr("checked") == "checked") value = 1;
-
-				jQuery.ajax( {
-					url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1',
-					data: {
-						field: 'mwst_laender',
-						va_id: '<?php echo $va['id']; ?>',
-						value: value
-					}	
-				} );
-			} );
-        /* ]]> */</script>
 		
 		<?php /* Paketverfolgung */ ?>
 		<?php if ($this->hasMod('wpsg_mod_packagetracking') == '1') { ?>
diff --git a/views/mods/mod_versandarten/settings_edit.phtml b/views/mods/mod_versandarten/settings_edit.phtml
index 5a373e5..34cfe1c 100644
--- a/views/mods/mod_versandarten/settings_edit.phtml
+++ b/views/mods/mod_versandarten/settings_edit.phtml
@@ -41,25 +41,6 @@
 		
 	} // function wpsg_addVA()	
 
-	/**
-	 * Speichert die Änderung in der Checkbox der MwSt.
-	 */
-	function wpsg_saveVAMwSt(oElement, va_id)
-	{
-
-		if (jQuery(oElement).attr("checked")) value = '1'; else value = '0';
-		
-		jQuery.ajax( {
-			url: '<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_versandarten&do=inlinedit&noheader=1',
-			data: {
-				field: 'mwst_laender',
-				va_id: va_id,
-				value: value
-			}		
-		} );
-		
-	} // function wpsg_saveVAMwSt(oElement, va_id)		
-	
 	/**
 	 * Wird aufgerufen wenn eine Versandart entfernt werden soll
 	 */
diff --git a/views/mods/mod_willcollect/settings_edit.phtml b/views/mods/mod_willcollect/settings_edit.phtml
index 47e3beb..a1abbf8 100644
--- a/views/mods/mod_willcollect/settings_edit.phtml
+++ b/views/mods/mod_willcollect/settings_edit.phtml
@@ -22,4 +22,3 @@
 <?php echo wpsg_drawForm_Input('wpsg_mod_willcollect_gebuehr', __('Gebühr/Rabatt (Versandart)', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_willcollect_gebuehr'), true), array('help' => 'wpsg_mod_willcollect_gebuehr','unit' => $this->get_option('wpsg_currency').' / %')); ?>
 <?php echo wpsg_drawForm_Input('wpsg_mod_willcollect_payment_gebuehr', __('Gebühr/Rabatt (Zahlungsart)', 'wpsg'), wpsg_ff($this->get_option('wpsg_mod_willcollect_payment_gebuehr'), true), array('help' => 'wpsg_mod_willcollect_payment_gebuehr','unit' => $this->get_option('wpsg_currency').' / %')); ?>
 <?php echo wpsg_drawForm_Select('wpsg_mod_willcollect_mwst', __('Mehrwertsteuersatz', 'wpsg'), wpsg_tax_groups(), $this->get_option('wpsg_mod_willcollect_mwst'), array('help' => 'wpsg_mod_willcollect_mwst')); ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_willcollect_mwstland', __('Keine MwSt. wenn Land steuerfrei', 'wpsg'), $this->get_option('wpsg_mod_willcollect_mwstland'), array('help' => 'wpsg_mod_willcollect_mwstland')); ?>
\ No newline at end of file
diff --git a/views/warenkorb/ajaxDialog.phtml b/views/warenkorb/ajaxDialog.phtml
index fcb07e4..60043d6 100644
--- a/views/warenkorb/ajaxDialog.phtml
+++ b/views/warenkorb/ajaxDialog.phtml
@@ -78,6 +78,8 @@
 	<?php /* Zubehörprodukte START */?>
 	<?php if ($this->hasMod('wpsg_mod_relatedproducts') && $this->get_option('wpsg_mod_relatedproducts_showAjaxDialog') === '1') { ?>
 		<?php $arRelatedProducts = $this->callMod('wpsg_mod_relatedproducts', 'getRelatedProducts', array($this->getProduktID($this->view['product_key']))); ?>
+		<?php $limit = intval($this->get_option('wpsg_mod_relatedproducts_showAjaxDialogLimit')); if ($limit > 0 && is_array($arRelatedProducts)) $arRelatedProducts = array_slice($arRelatedProducts, 0, $limit); ?>
+		<?php $ajax_template = strval($this->get_option('wpsg_mod_relatedproducts_showAjaxDialogTemplate')); ?>
 		<?php if (wpsg_isSizedArray($arRelatedProducts)) { ?> 			 
 			<div class="wpsg_ajaxdialog_relatedproducts">
 				<h3><?php echo __('Das könnte Ihnen auch gefallen:', 'wpsg'); ?></h3>
@@ -85,6 +87,9 @@
 				<div class="wpsg_clear"></div>
 				
 				<?php foreach ($arRelatedProducts as $rp_data) { $product_data = $this->loadProduktArray($rp_data['product_id']); ?>
+				<?php if (($ajax_template !== '' && $ajax_template !== '0') || !in_array(strval($rp_data['template']??''), ['', '0'], true)) { ?>
+					<?php echo $this->callMod('wpsg_mod_relatedproducts', 'renderRelatedProduct', array(&$rp_data, $ajax_template)); ?>
+				<?php continue; } ?>
 				
 				<div class="wpsg_ajaxdialog_productrow">
 					<h4><?php echo $this->getProductName($rp_data['product_id']); ?></h4>
-- 
cgit v1.2.3