Index: /changelog
===================================================================
--- /changelog	(revision 7822)
+++ /changelog	(revision 7823)
@@ -417,2 +417,3 @@
 - Bugfix: Benutzerwechsel ÃŒber das Backend funktioniert wieder
 - Bugfix: Bootstrap auf Version 3.4.1. Aktualisiert
+
Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 7822)
+++ /lib/wpsg_basket.class.php	(revision 7823)
@@ -1286,5 +1286,5 @@
 			
 			$noMwSt = false;
-			
+
 			if (isset($this->arCheckout['land'])) {
 			
@@ -1337,5 +1337,5 @@
 					
 					// in $b sind eventuell auch Moduldaten drin (Produktvariablen)
-					$this->shop->country = $land['id'];
+					$this->shop->country = wpsg_getInt($land['id'], 0);
 					$b = $this->shop->loadProduktArray($produkt_id, $b, true);
 					//$this->shop->country = 0;
Index: /lib/wpsg_calculation.class.php
===================================================================
--- /lib/wpsg_calculation.class.php	(revision 7822)
+++ /lib/wpsg_calculation.class.php	(revision 7823)
@@ -102,5 +102,5 @@
 			}
 	
-			throw new \Exception(__('Kein Rechnungslaud fÃŒr die Berechnung gesetzt.', 'wpsg'));
+			throw new \Exception(__('Kein Rechnungsland fÃŒr die Berechnung gesetzt.', 'wpsg'));
         	
 		}
@@ -116,5 +116,5 @@
 			}
 			
-			throw new \Exception(__('Kein Rechnungslaud fÃŒr die Berechnung gesetzt.', 'wpsg'));
+			throw new \Exception(__('Kein Rechnungsland fÃŒr die Berechnung gesetzt.', 'wpsg'));
         	
 		}
@@ -380,5 +380,5 @@
 				]
 			];
-	
+
 			$this->arCalculation = null;
             
@@ -428,7 +428,11 @@
             		
 				});
-            	
-            	//wpsg_debug($this->arCalculationRow);
-				
+
+            	if (isset($this->arCalculationRow['payment']) && sizeof($this->arCalculationRow['payment']) > 0) {
+
+            		$this->arCalculation['payment'] = [];
+
+	            }
+
                 foreach ($this->arCalculationRow as $cr) {
                 	             
@@ -739,5 +743,5 @@
                 
             }
-             
+
             return $this->arCalculation;
 
@@ -1109,5 +1113,5 @@
             $db_order = $this->db->fetchRow("SELECT O.*, A.`land` FROM `".WPSG_TBL_ORDER."` AS O LEFT JOIN `".WPSG_TBL_ADRESS."` AS A ON (O.`adress_id` = A.`id`) WHERE O.`id` = '".wpsg_q($id)."' ");
             $db_products = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_ORDERPRODUCT."` WHERE `o_id` = '".wpsg_q($id)."' ");
-            
+
             if (!wpsg_isSizedInt($db_order['calculation'])) {
             	
Index: /model/wpsg_customer.class.php
===================================================================
--- /model/wpsg_customer.class.php	(revision 7822)
+++ /model/wpsg_customer.class.php	(revision 7823)
@@ -148,6 +148,6 @@
 			$title = "";
 			
-			if ($this->adress_data === false) $title = $this->data['title'];
-			else $title = $this->adress_data['title'];
+			if ($this->adress_data === false) $title = wpsg_getStr($this->data['title']);
+			else $title = wpsg_getStr($this->adress_data['title']);
 			
 			$arAnrede = explode('|', $this->shop->get_option('wpsg_admin_pflicht')['anrede_auswahl']);
Index: /mods/wpsg_mod_abo.class.php
===================================================================
--- /mods/wpsg_mod_abo.class.php	(revision 7822)
+++ /mods/wpsg_mod_abo.class.php	(revision 7823)
@@ -13,5 +13,6 @@
 
 		const CONFIG = '-1';
-		
+
+		const EXPIRE_NONE = '0';
         const EXPIRE_MAIL = '1';
         const EXPIRE_AUTO = '2';
@@ -112,5 +113,4 @@
 
 			$this->shop->checkDefault('wpsg_mod_abo_wpsgmodabofirstbuy', '1');
-			$this->shop->checkDefault('wpsg_mod_abo_wpsgmodaboexpiration', '1');
 			$this->shop->checkDefault('wpsg_mod_abo_wpsgmodabrebuy', '1');
 
@@ -233,7 +233,7 @@
 
 			$this->shop->update_option('wpsg_mod_abo_wpsgmodabofirstbuy', $_REQUEST['wpsg_mod_abo_wpsgmodabofirstbuy'], false, false, WPSG_SANITIZE_CHECKBOX);
-			$this->shop->update_option('wpsg_mod_abo_wpsgmodaboexpiration', $_REQUEST['wpsg_mod_abo_wpsgmodaboexpiration'], false, false, WPSG_SANITIZE_CHECKBOX);
 			$this->shop->update_option('wpsg_mod_abo_wpsgmodabrebuy', $_REQUEST['wpsg_mod_abo_wpsgmodabrebuy'], false, false, WPSG_SANITIZE_CHECKBOX);
 			$this->shop->update_option('wpsg_mod_abo_expiremode', $_REQUEST['wpsg_mod_abo_expiremode'], false, false, WPSG_SANITIZE_VALUES, [wpsg_mod_abo::EXPIRE_AUTO, wpsg_mod_abo::EXPIRE_MAIL]);
+			$this->shop->update_option('wpsg_mod_abo_premode', $_REQUEST['wpsg_mod_abo_premode'], false, false, WPSG_SANITIZE_VALUES, [wpsg_mod_abo::EXPIRE_NONE, wpsg_mod_abo::EXPIRE_AUTO, wpsg_mod_abo::EXPIRE_MAIL]);
             
 			$this->shop->update_option('wpsg_mod_abo_autoexpire_payment', $_REQUEST['wpsg_mod_abo_autoexpire_payment'], false, false, WPSG_SANITIZE_VALUES, array_merge(['origin'], array_keys($this->shop->arPayment)));
@@ -241,5 +241,4 @@
 			$this->shop->update_option('wpsg_mod_abo_autoexpire_adminmail', $_REQUEST['wpsg_mod_abo_autoexpire_adminmail'], false, false, WPSG_SANITIZE_CHECKBOX);
 			$this->shop->update_option('wpsg_mod_abo_autoexpire_customer', $_REQUEST['wpsg_mod_abo_autoexpire_customer'], false, false, WPSG_SANITIZE_VALUES, [wpsg_mod_abo::CUSTOMER_AUTO_DIRECT, wpsg_mod_abo::CUSTOMER_AUTO_MAIL, wpsg_mod_abo::CUSTOMER_AUTO_NOTHING]);
-			$this->shop->update_option('wpsg_mod_abo_autoexpire_information', $_REQUEST['wpsg_mod_abo_autoexpire_information'], false, false, WPSG_SANITIZE_CHECKBOX);
 			$this->shop->update_option('wpsg_mod_abo_autoexpire_informationtime', wpsg_xss($_REQUEST['wpsg_mod_abo_autoexpire_informationtime']), false, false, WPSG_SANITIZE_TEXTFIELD);
             
@@ -270,9 +269,8 @@
 
             $this->shop->view['product']['wpsg_mod_abo_expiremode'] = $oProduct->getMeta('wpsg_mod_abo_expiremode', false, wpsg_mod_abo::CONFIG);
-            $this->shop->view['product']['wpsg_mod_abo_wpsgmodaboexpiration'] = $oProduct->getMeta('wpsg_mod_abo_wpsgmodaboexpiration', false, wpsg_mod_abo::CONFIG);
+            $this->shop->view['product']['wpsg_mod_abo_premode'] = $oProduct->getMeta('wpsg_mod_abo_premode', false, wpsg_mod_abo::CONFIG);
             $this->shop->view['product']['wpsg_mod_abo_autoexpire_payment'] = $oProduct->getMeta('wpsg_mod_abo_autoexpire_payment', false, wpsg_mod_abo::CONFIG);
             $this->shop->view['product']['wpsg_mod_abo_autoexpire_customermail'] = $oProduct->getMeta('wpsg_mod_abo_autoexpire_customermail', false, wpsg_mod_abo::CONFIG);
             $this->shop->view['product']['wpsg_mod_abo_autoexpire_adminmail'] = $oProduct->getMeta('wpsg_mod_abo_autoexpire_adminmail', false, wpsg_mod_abo::CONFIG);
-            $this->shop->view['product']['wpsg_mod_abo_autoexpire_information'] = $oProduct->getMeta('wpsg_mod_abo_autoexpire_information', false, wpsg_mod_abo::CONFIG);
             $this->shop->view['product']['wpsg_mod_abo_autoexpire_informationtime'] = $oProduct->getMeta('wpsg_mod_abo_autoexpire_informationtime', false, '');
             $this->shop->view['product']['wpsg_mod_abo_autoexpire_customer'] = $oProduct->getMeta('wpsg_mod_abo_autoexpire_customer', false, wpsg_mod_abo::CONFIG);
@@ -331,23 +329,23 @@
 		    if (wpsg_checkInput($_REQUEST['wpsg_mod_abo_expiremode'], WPSG_SANITIZE_VALUES, [self::CONFIG, self::EXPIRE_AUTO, self::EXPIRE_MAIL]))
 		        $oProduct->setMeta('wpsg_mod_abo_expiremode', $_REQUEST['wpsg_mod_abo_expiremode']);
+
+		    if (wpsg_checkInput($_REQUEST['wpsg_mod_abo_premode'], WPSG_SANITIZE_VALUES, [self::CONFIG, self::EXPIRE_AUTO, self::EXPIRE_MAIL]))
+		    	$oProduct->setMeta('wpsg_mod_abo_premode', $_REQUEST['wpsg_mod_abo_premode']);
 		    
-		    if ($_REQUEST['wpsg_mod_abo_expiremode'] === wpsg_mod_abo::EXPIRE_MAIL) {
-		        
-		        if (wpsg_checkInput($_REQUEST['wpsg_mod_abo_wpsgmodaboexpiration'], WPSG_SANITIZE_VALUES, [self::CONFIG, '0', '1'])) $oProduct->setMeta('wpsg_mod_abo_wpsgmodaboexpiration', $_REQUEST['wpsg_mod_abo_wpsgmodaboexpiration']);
-		        
-            } else if ($_REQUEST['wpsg_mod_abo_expiremode'] === wpsg_mod_abo::EXPIRE_AUTO) {
+		    if ($_REQUEST['wpsg_mod_abo_expiremode'] === wpsg_mod_abo::EXPIRE_AUTO) {
                 
                 if (wpsg_checkInput($_REQUEST['wpsg_mod_abo_autoexpire_payment'], WPSG_SANITIZE_VALUES, array_merge(['origin'], array_keys($this->shop->arPayment)))) $oProduct->setMeta('wpsg_mod_abo_autoexpire_payment', $_REQUEST['wpsg_mod_abo_autoexpire_payment']);
                 if (wpsg_checkInput($_REQUEST['wpsg_mod_abo_autoexpire_customermail'], WPSG_SANITIZE_VALUES, [self::CONFIG, '0', '1'])) $oProduct->setMeta('wpsg_mod_abo_autoexpire_customermail', $_REQUEST['wpsg_mod_abo_autoexpire_customermail']);
                 if (wpsg_checkInput($_REQUEST['wpsg_mod_abo_autoexpire_adminmail'], WPSG_SANITIZE_VALUES, [self::CONFIG, '0', '1'])) $oProduct->setMeta('wpsg_mod_abo_autoexpire_adminmail', $_REQUEST['wpsg_mod_abo_autoexpire_adminmail']);
-                if (wpsg_checkInput($_REQUEST['wpsg_mod_abo_autoexpire_information'], WPSG_SANITIZE_VALUES, [self::CONFIG, '0', '1'])) $oProduct->setMeta('wpsg_mod_abo_autoexpire_information', $_REQUEST['wpsg_mod_abo_autoexpire_information']);
-                
-                if ($_REQUEST['wpsg_mod_abo_autoexpire_information'] === '1')
-                    if (wpsg_checkInput($_REQUEST['wpsg_mod_abo_autoexpire_informationtime'], WPSG_SANITIZE_INT, ['allowEmpty' => true])) $oProduct->setMeta('wpsg_mod_abo_autoexpire_informationtime', $_REQUEST['wpsg_mod_abo_autoexpire_informationtime']);
-                
-                if (wpsg_checkInput($_REQUEST['wpsg_mod_abo_autoexpire_customer'], WPSG_SANITIZE_VALUES, [wpsg_mod_abo::CONFIG, wpsg_mod_abo::CUSTOMER_AUTO_NOTHING, wpsg_mod_abo::CUSTOMER_AUTO_DIRECT, wpsg_mod_abo::CUSTOMER_AUTO_MAIL])) $oProduct->setMeta('wpsg_mod_abo_autoexpire_customer', $_REQUEST['wpsg_mod_abo_autoexpire_customer']);
+				if (wpsg_checkInput($_REQUEST['wpsg_mod_abo_autoexpire_customer'], WPSG_SANITIZE_VALUES, [wpsg_mod_abo::CONFIG, wpsg_mod_abo::CUSTOMER_AUTO_NOTHING, wpsg_mod_abo::CUSTOMER_AUTO_DIRECT, wpsg_mod_abo::CUSTOMER_AUTO_MAIL])) $oProduct->setMeta('wpsg_mod_abo_autoexpire_customer', $_REQUEST['wpsg_mod_abo_autoexpire_customer']);
 		        
             }
-		    
+
+		    if (isset($_REQUEST['wpsg_mod_abo_autoexpire_informationtime'])) {
+
+		    	if (wpsg_checkInput($_REQUEST['wpsg_mod_abo_autoexpire_informationtime'], WPSG_SANITIZE_INT, ['allowEmpty' => true])) $oProduct->setMeta('wpsg_mod_abo_autoexpire_informationtime', $_REQUEST['wpsg_mod_abo_autoexpire_informationtime']);
+
+		    }
+
         }
         
@@ -587,8 +585,7 @@
                 if ($wpsg_mod_abo_autoexpire_informationtime > 0 && $interval <= $wpsg_mod_abo_autoexpire_informationtime) {
                     
-                    $wpsg_mod_abo_expiremode = $this->getSetting('wpsg_mod_abo_expiremode', $product_id);
-                    $wpsg_mod_abo_autoexpire_information = $this->getSetting('wpsg_mod_abo_autoexpire_information', $product_id);
-                    
-                    if ($wpsg_mod_abo_expiremode === self::EXPIRE_AUTO && $wpsg_mod_abo_autoexpire_information == '1') {
+                    $wpsg_mod_abo_expiremode = $this->getSetting('wpsg_mod_abo_premode', $product_id);
+
+                    if ($wpsg_mod_abo_expiremode === self::EXPIRE_MAIL) {
                     
                         $this->sendAboRenewInformation($a['order_id'], $a['order_product_id']);
@@ -598,4 +595,8 @@
                         ), "`id` = '".wpsg_q($a['id'])."'");
                         
+                    } else if ($wpsg_mod_abo_expiremode === self::EXPIRE_AUTO) {
+
+                    	$this->autoExtendOrder($a['order_id'], $a['order_product_id']);
+
                     }
                     
@@ -1319,5 +1320,5 @@
 		public function autoExtendOrder($order_id, $order_product_id) {
             
-		    $oOrderProduct = wpsg_order_product::getInstance($order_product_id);
+		    $oOrderProduct = wpsg_order_prodcuct::getInstance($order_product_id);
             $product_id = $oOrderProduct->getProductId();
 		    
@@ -1602,6 +1603,6 @@
             
             $product_id = $oOrderProduct->getProductId();
-            
-            if ($this->getSetting('wpsg_mod_abo_autoexpire_information', $product_id) !== '1') return;
+
+            if ($this->getSetting('wpsg_mod_abo_premode', $product_id) !== self::EXPIRE_MAIL) return;
             
             $product_data = $this->shop->cache->loadProduct($product_id);
@@ -1641,7 +1642,7 @@
 		    
 		    $product_id = $oOrderProduct->getProductId();
-		    $wpsg_mod_abo_wpsgmodaboexpiration = $this->getSetting('wpsg_mod_abo_wpsgmodaboexpiration', $product_id);
+		    $wpsg_mod_abo_expiremode = $this->getSetting('wpsg_mod_abo_expiremode', $product_id);
 		    
-			if ($wpsg_mod_abo_wpsgmodaboexpiration != '1') return;
+			if ($wpsg_mod_abo_expiremode != self::EXPIRE_MAIL) return;
 
 			$product_data = $this->shop->cache->loadProduct($product_id);
Index: /views/mods/mod_abo/produkt_addedit_content.phtml
===================================================================
--- /views/mods/mod_abo/produkt_addedit_content.phtml	(revision 7822)
+++ /views/mods/mod_abo/produkt_addedit_content.phtml	(revision 7823)
@@ -68,16 +68,54 @@
             ), $this->view['product']['wpsg_mod_abo_expiremode'], array('help' => 'wpsg_mod_abo_expiremode')); ?>
 
+            <?php
+
+                $strLabelPreModeDefault = '';
+
+                if ($this->get_option('wpsg_mod_abo_premode') == wpsg_mod_abo::EXPIRE_MAIL) $strLabelPreModeDefault = ' / '.__('Mail versenden', 'wpsg');
+                else if ($this->get_option('wpsg_mod_abo_premode') === wpsg_mod_abo::EXPIRE_AUTO) $strLabelPreModeDefault = ' / '.__('Automatisch verlÀngern', 'wpsg');
+
+            ?>
+
+            <?php echo wpsg_drawForm_Select('wpsg_mod_abo_premode', __('X - Tage vor Ablauf des Abos', 'wpsg'), [
+                wpsg_mod_abo::CONFIG => __('Standard', 'wpsg').$strLabelPreModeDefault,
+                wpsg_mod_abo::EXPIRE_MAIL => __('Mail versenden', 'wpsg'),
+                wpsg_mod_abo::EXPIRE_AUTO => __('Automatisch verlÀngern', 'wpsg')
+            ], $this->view['product']['wpsg_mod_abo_premode'], ['help' => 'wpsg_mod_abo_premode']); ?>
+
+            <div id="wpsg_mod_abo_premode_greater0" style="display:none;">
+
+                <?php echo wpsg_drawForm_Input('wpsg_mod_abo_autoexpire_informationtime', __('Zeitspanne zum Versenden der Informationsmail in Tagen', 'wpsg'), $this->view['product']['wpsg_mod_abo_autoexpire_informationtime'], [
+                    'help' => 'wpsg_mod_abo_autoexpire_informationtime'
+                ]); ?>
+
+            </div>
+
+            <script>
+
+                let wpsg_mod_abo_premodeSELECT = document.getElementById('wpsg_mod_abo_premode');
+                let wpsg_mod_abo_premode_greater0DIV = document.getElementById('wpsg_mod_abo_premode_greater0');
+
+                wpsg_mod_abo_premodeSELECT.addEventListener('change', () => {
+
+                	console.log(parseInt(wpsg_mod_abo_premodeSELECT.value));
+
+                	if (parseInt(wpsg_mod_abo_premodeSELECT.value) > 0 || (parseInt(wpsg_mod_abo_premodeSELECT.value) === -1 && <?php echo ((intval($this->get_option('wpsg_mod_abo_premode')) > 0)?'true':'false'); ?>)) {
+
+                		wpsg_mod_abo_premode_greater0DIV.style.display = 'block';
+
+                    } else {
+
+                        wpsg_mod_abo_premode_greater0DIV.style.display = 'none';
+
+                    }
+
+                });
+
+                wpsg_mod_abo_premodeSELECT.dispatchEvent(new Event('change'));
+
+            </script>
+
 			<br />
-			
-			<div class="wpsg_mod_abo_expiremode wpsg_mod_abo_expiremode_<?php echo wpsg_mod_abo::EXPIRE_MAIL; ?>" style="display:none;">
-			 
-				<?php echo wpsg_drawForm_Select('wpsg_mod_abo_wpsgmodaboexpiration', __('Mail bei Auslauf eines Abos', 'wpsg'), [
-					wpsg_mod_abo::CONFIG => __('Standard', 'wpsg'),
-					'0' => __('Nein', 'wpsg'),
-					'1' => __('Ja', 'wpsg')
-				], $this->view['product']['wpsg_mod_abo_wpsgmodaboexpiration'], array('hint' => wpsg_translate(__('Mail wird bei Auslauf eines Abos versendet. (mail_expiration.phtml) -> <a href="#1#">Konfiguration</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#wpsgmodaboexpiration'), 'help' => 'wpsg_mod_abo_wpsgmodaboexpiration',)); ?>
 
-			</div>
-			
 			<div class="wpsg_mod_abo_expiremode wpsg_mod_abo_expiremode_<?php echo wpsg_mod_abo::EXPIRE_AUTO; ?>" style="display:none;">
 				
@@ -96,21 +134,4 @@
                 ], $this->view['product']['wpsg_mod_abo_autoexpire_adminmail'], ['help' => 'wpsg_mod_abo_autoexpire_adminmail']); ?>
 
-                <?php echo wpsg_drawForm_Select('wpsg_mod_abo_autoexpire_information', __('Mail vor automatischer VerlÀngerung versenden', 'wpsg'), [
-                    wpsg_mod_abo::CONFIG => __('Standard', 'wpsg'),
-                    '0' => __('Nein', 'wpsg'),
-                    '1' => __('Ja', 'wpsg')
-                ], $this->view['product']['wpsg_mod_abo_autoexpire_information'], [
-                    'help' => 'wpsg_mod_abo_autoexpire_information',
-                    'hint' => wpsg_translate(__('Mail wird X-Tage vor einer automatischen VerlÀngerung versendet. (mail_autoinformation.phtml) -> <a href="#1#">Konfiguration</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#wpsgmodabautoinfo')
-                ]); ?>
-				
-				<div class="wpsg_mod_abo_autoexpire_information wpsg_mod_abo_autoexpire_information_1" style="display:none;">
-
-                    <?php echo wpsg_drawForm_Input('wpsg_mod_abo_autoexpire_informationtime', __('Zeitspanne zum Versenden der Informationsmail in Tagen', 'wpsg'), $this->view['product']['wpsg_mod_abo_autoexpire_informationtime'], [
-                    	'help' => 'wpsg_mod_abo_autoexpire_informationtime'
-					]); ?>
-					
-				</div>
-				
                 <?php echo wpsg_drawForm_Select('wpsg_mod_abo_autoexpire_customer', __('Kunde kann im Frontend', 'wpsg'), [
                     wpsg_mod_abo::CONFIG => __('Standard', 'wpsg'),
@@ -129,13 +150,6 @@
 				    jQuery('.wpsg_mod_abo_expiremode_' + jQuery(this).val()).show();
 				    
-				}).change();
-				
-				jQuery('#wpsg_mod_abo_autoexpire_information').on('change', function() {
+				}).trigger('change');
 
-                    jQuery('.wpsg_mod_abo_autoexpire_information').hide();
-                    jQuery('.wpsg_mod_abo_autoexpire_information_' + jQuery(this).val()).show();
-				    
-				}).change();
-				
 			</script>
 
Index: /views/mods/mod_abo/settings_edit.phtml
===================================================================
--- /views/mods/mod_abo/settings_edit.phtml	(revision 7822)
+++ /views/mods/mod_abo/settings_edit.phtml	(revision 7823)
@@ -28,14 +28,44 @@
 ), $this->get_option('wpsg_mod_abo_expiremode'), array('help' => 'wpsg_mod_abo_expiremode')); ?>
 
-<br />
+<?php echo wpsg_drawForm_Select('wpsg_mod_abo_premode', __('X - Tage vor Ablauf des Abos', 'wpsg'), [
+    wpsg_mod_abo::EXPIRE_NONE => __('Nichts', 'wpsg'),
+    wpsg_mod_abo::EXPIRE_MAIL => __('Mail versenden', 'wpsg'),
+    wpsg_mod_abo::EXPIRE_AUTO => __('Automatisch verlÀngern', 'wpsg')
+], $this->get_option('wpsg_mod_abo_premode'), ['help' => 'wpsg_mod_abo_premode']); ?>
 
-<div class="wpsg_mod_expiremode wpsg_mod_expiremode_<?php echo wpsg_mod_abo::EXPIRE_MAIL; ?>" style="display:<?php echo (($this->get_option('wpsg_mod_abo_expiremode') == wpsg_mod_abo::EXPIRE_MAIL || $this->get_option('wpsg_mod_abo_expiremode') === false)?'block':'none'); ?>;">
+<div id="wpsg_mod_abo_premode_greater0" style="display:none;">
 
-	<?php echo wpsg_drawForm_Select('wpsg_mod_abo_wpsgmodaboexpiration', __('Mail bei Auslauf eines Abos', 'wpsg'), [
-    	'0' => __('Nein', 'wpsg'),
-		'1' => __('Ja', 'wpsg')
-    ], $this->get_option('wpsg_mod_abo_wpsgmodaboexpiration'), array('hint' => wpsg_translate(__('Mail wird bei Auslauf eines Abos versendet. (mail_expiration.phtml) -> <a href="#1#">Konfiguration</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#wpsgmodaboexpiration'), 'help' => 'wpsg_mod_abo_wpsgmodaboexpiration',)); ?>
+    <?php echo wpsg_drawForm_Input('wpsg_mod_abo_autoexpire_informationtime', __('Zeitspanne zum Versenden der Informationsmail in Tagen', 'wpsg'), $this->get_option('wpsg_mod_abo_autoexpire_informationtime'), [
+        'help' => 'wpsg_mod_abo_autoexpire_informationtime'
+    ]); ?>
 
 </div>
+
+<script>
+
+    let wpsg_mod_abo_premodeSELECT = document.getElementById('wpsg_mod_abo_premode');
+    let wpsg_mod_abo_premode_greater0DIV = document.getElementById('wpsg_mod_abo_premode_greater0');
+
+    wpsg_mod_abo_premodeSELECT.addEventListener('change', () => {
+
+        console.log(parseInt(wpsg_mod_abo_premodeSELECT.value));
+
+        if (parseInt(wpsg_mod_abo_premodeSELECT.value) > 0 || (parseInt(wpsg_mod_abo_premodeSELECT.value) === -1 && <?php echo ((intval($this->get_option('wpsg_mod_abo_premode')) > 0)?'true':'false'); ?>)) {
+
+            wpsg_mod_abo_premode_greater0DIV.style.display = 'block';
+
+        } else {
+
+            wpsg_mod_abo_premode_greater0DIV.style.display = 'none';
+
+        }
+
+    });
+
+    wpsg_mod_abo_premodeSELECT.dispatchEvent(new Event('change'));
+
+</script>
+
+<br />
 
 <div class="wpsg_mod_expiremode wpsg_mod_expiremode_<?php echo wpsg_mod_abo::EXPIRE_AUTO; ?>" style="display:<?php echo (($this->get_option('wpsg_mod_abo_expiremode') == wpsg_mod_abo::EXPIRE_AUTO)?'block':'none'); ?>;">
@@ -54,18 +84,4 @@
     ], $this->get_option('wpsg_mod_abo_autoexpire_adminmail'), ['help' => 'wpsg_mod_abo_autoexpire_adminmail']); ?>
 
-    <?php echo wpsg_drawForm_Select('wpsg_mod_abo_autoexpire_information', __('Mail vor automatischer VerlÀngerung versenden', 'wpsg'), [
-        '0' => __('Nein', 'wpsg'),
-        '1' => __('Ja', 'wpsg')
-    ], $this->get_option('wpsg_mod_abo_autoexpire_information'), [
-    	'help' => 'wpsg_mod_abo_autoexpire_information', 
-		'hint' => wpsg_translate(__('Mail wird X-Tage vor einer automatischen VerlÀngerung versendet. (mail_autoinformation.phtml) -> <a href="#1#">Konfiguration</a>', 'wpsg'), WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=emailconf#wpsgmodabautoinfo')
-	]); ?>
-		
-	<div class="wpsg_mod_abo_autoexpire_informationactiv" style="display:none;">	
-		
-		<?php echo wpsg_drawForm_Input('wpsg_mod_abo_autoexpire_informationtime', __('Zeitspanne zum Versenden der Informationsmail in Tagen', 'wpsg'), $this->get_option('wpsg_mod_abo_autoexpire_informationtime'), array('help' => 'wpsg_mod_abo_autoexpire_informationtime')); ?>
-		
-	</div>
-	
 	<br />
 
@@ -83,19 +99,4 @@
 <br /> 
 
-<?php /* TODO: PrÌfung auf Mehrfachbestellung global */ /* Option: Mehrfachbestellung möglich  ?>
-<?php echo wpsg_drawForm_Checkbox('wpsg_mod_abo_moreorder', __('Mehrfachbestellung möglich', 'wpsg'), $this->get_option('wpsg_mod_abo_moreorder'), array ('help' => 'wpsg_mod_abo_moreorder')); ?>
-
-<div class="wpsg_mod_expiremode_moreorder_activ" style="display:none;">
-
-	<?php echo wpsg_drawForm_Input('wpsg_mod_abo_moreorder_text', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_abo_moreorder_text'), array('help' => 'wpsg_mod_abo_moreorder_text'));?>
-
-</div>
-
-<div class="wpsg_mod_expiremode_moreorder_deactiv">
-
-	<?php echo wpsg_drawForm_Input('wpsg_mod_abo_nomoreorder_text', __('Hinweistext', 'wpsg'), $this->get_option('wpsg_mod_abo_nomoreorder_text'), array('help' => 'wpsg_mod_abo_nomoreorder_text'));?>
-
-</div>
-*/?>
 <script type="text/javascript">/* <![CDATA[ */
 
@@ -109,11 +110,4 @@
 		} ); 
 
-		jQuery('#wpsg_mod_abo_autoexpire_information').bind('change', function() {
-
-			if (jQuery(this).val() === '1') jQuery('.wpsg_mod_abo_autoexpire_informationactiv').show();
-			else jQuery('.wpsg_mod_abo_autoexpire_informationactiv').hide();
-			
-		} ).change();
-    	
 	} );
 
Index: /views/mods/mod_relatedproducts/list.phtml
===================================================================
--- /views/mods/mod_relatedproducts/list.phtml	(revision 7822)
+++ /views/mods/mod_relatedproducts/list.phtml	(revision 7823)
@@ -20,5 +20,5 @@
 <script type="text/javascript">
 
-	jQuery('#relatedproducts_list a.wpsg_icon_remove').bind('click', function() {
+	jQuery('#relatedproducts_list a.wpsg_icon_remove').on('click', function() {
 
 		var rel_id = jQuery(this).parents('span').attr('id').replace(/wpsg_rp_/, '');
Index: /views/produkt/addedit_payship.phtml
===================================================================
--- /views/produkt/addedit_payship.phtml	(revision 7822)
+++ /views/produkt/addedit_payship.phtml	(revision 7823)
@@ -26,10 +26,12 @@
 	<script>
 
-		jQuery('#wpsg_paymentmethods_select').bind('change', function() {
+		jQuery('#wpsg_paymentmethods_select').on('change', function() {
 
 			if (jQuery(this).val() == '1') jQuery('.wpsg_paymentmethods_select').show();
 			else jQuery('.wpsg_paymentmethods_select').hide();
 			
-		} ).change();
+		} ).trigger('change');
+
+
 	
 	</script>
@@ -52,10 +54,10 @@
 	<script>
 	
-		jQuery('#wpsg_shippingmethods_select').bind('change', function() {
+		jQuery('#wpsg_shippingmethods_select').on('change', function() {
 	
 			if (jQuery(this).val() == '1') jQuery('.wpsg_shippingmethods_select').show();
 			else jQuery('.wpsg_shippingmethods_select').hide();
 									
-		} ).change();
+		} ).trigger('change');
 							
 	</script>