Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 7814)
+++ /controller/wpsg_ShopController.class.php	(revision 7815)
@@ -4698,6 +4698,7 @@
 							$sub = $this->arShipping[$subShipping];
 
-							$arShippingNew[$subKey]['name'] = implode(' + ', wpsg_trim(array_merge(array($sub['name']), (array)explode(',', $arShippingNew[$subKey]['name']))));
-							$arShippingNew[$subKey]['hint'] = implode('<br /><br />', wpsg_trim(array_merge(array($sub['hint']), (array)explode(',', $arShippingNew[$subKey]['hint']))));
+                            $arShippingNew[$subKey]['tax_key'] = '';
+							$arShippingNew[$subKey]['name'] = implode(' + ', wpsg_trim(array_merge(array($sub['name']), (array)explode(',', wpsg_getStr($arShippingNew[$subKey]['name'])))));
+							$arShippingNew[$subKey]['hint'] = implode('<br /><br />', wpsg_trim(array_merge(array($sub['hint']), (array)explode(',', wpsg_getStr($arShippingNew[$subKey]['hint'])))));
 							
 							// w-50
Index: /lib/functions.inc.php
===================================================================
--- /lib/functions.inc.php	(revision 7814)
+++ /lib/functions.inc.php	(revision 7815)
@@ -214,15 +214,11 @@
 	 * Um Warnungen zu verhindern wenn man einen Wert auf eine Variable addiert die möglicherweise nicht definiert ist
 	 */
-	function wpsg_addSet(&$arrayElement, $addSet)
-	{
-		
-		if (isset($arrayElement))
-		{
-
+	function wpsg_addSet(&$arrayElement, $addSet) {
+			    
+		if (isset($arrayElement) && is_numeric($arrayElement)) {
+ 
 			$arrayElement += (double)$addSet;
 			
-		}
-		else
-		{
+		} else {
 			
 			$arrayElement = $addSet;
Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 7814)
+++ /lib/wpsg_basket.class.php	(revision 7815)
@@ -1599,7 +1599,7 @@
 							wpsg_addSet($arReturn['sum']['preis_shipping_netto'], $basket_calc['sum']['preis_shipping_netto']);
 							
-							wpsg_addSet($arReturn['shipping']['mwst'], $basket_calc['shipping']['mwst']);
-							wpsg_addSet($arReturn['shipping']['preis_shipping_netto'], $basket_calc['shipping']['preis_shipping_netto']);
-							wpsg_addSet($arReturn['shipping']['preis_shipping_brutto'], $basket_calc['shipping']['preis_shipping_brutto']);
+							wpsg_addSet($arReturn['shipping']['mwst'], wpsg_getStr($basket_calc['shipping']['mwst']));
+							wpsg_addSet($arReturn['shipping']['preis_shipping_netto'], wpsg_getStr($basket_calc['shipping']['preis_shipping_netto']));
+							wpsg_addSet($arReturn['shipping']['preis_shipping_brutto'], wpsg_getStr($basket_calc['shipping']['preis_shipping_brutto']));
 							
 							foreach ($basket_calc['mwst'] as $tax_key => $mwst)
Index: /lib/wpsg_calculation.class.php
===================================================================
--- /lib/wpsg_calculation.class.php	(revision 7814)
+++ /lib/wpsg_calculation.class.php	(revision 7815)
@@ -412,5 +412,11 @@
 					'product' => [],
 					'voucher' => [],
-					'coupon' => []
+					'coupon' => [],
+                    'payment' => [
+                        0 => [
+                            'name' => __('Kostenlos', 'wpsg'),
+                            'id' => '0'
+                        ]
+                    ]
             	];
             	
@@ -847,5 +853,5 @@
 				             	
 			}
-            
+                        
 			$db_data['be_bruttonetto'] = wpsg_q($this->shop->getBackendTaxview());
             $db_data['fe_bruttonetto'] = wpsg_q($this->shop->getFrontendTaxview());
@@ -1167,5 +1173,5 @@
         
 		public function fromSession() {
-			
+		 
 			$ses = (isset($_SESSION['wpsg'])?$_SESSION['wpsg']:[]);
 			 
@@ -1205,14 +1211,16 @@
 			
 			$this->shop->callMods('calculation_fromSession',[&$this, true, false]);
-			 
+			
 			// Payment
 			if (isset($_SESSION['wpsg']['checkout']['payment']) && array_key_exists($_SESSION['wpsg']['checkout']['payment'], $this->shop->arPayment)) {
 				
 				$payment = $this->shop->arPayment[$_SESSION['wpsg']['checkout']['payment']];
-
-				$price = 0;
-				if (isset($payment['price'])) $price = $payment['price'];
-
-                if (wpsg_isSizedArray($payment) && isset($payment['price'])) $this->addPayment($price, $this->shop->getBackendTaxview(), @$payment['tax_key'], $_SESSION['wpsg']['checkout']['payment']);
+				$price = wpsg_tf(wpsg_getStr($payment['price']));
+ 
+                if (wpsg_isSizedArray($payment)) {
+                 
+                    $this->addPayment($price, $this->shop->getBackendTaxview(), @$payment['tax_key'], $_SESSION['wpsg']['checkout']['payment']);
+                    
+                }
 				
 			}
Index: /model/wpsg_order.class.php
===================================================================
--- /model/wpsg_order.class.php	(revision 7814)
+++ /model/wpsg_order.class.php	(revision 7815)
@@ -389,5 +389,7 @@
 			
 			$order_payment_key = $this->__get('payment_key');
-			if (!wpsg_isSizedString($order_payment_key) && wpsg_isSizedString($this->__get('type_payment'))) $order_payment_key = $this->__get('type_payment');
+			$type_payment = $this->__get('type_payment');
+			
+			if (!wpsg_isSizedString($order_payment_key) && wpsg_isSizedString($type_payment)) $order_payment_key = $this->__get('type_payment');
 			
 			return $order_payment_key; 
Index: /mods/wpsg_mod_minquantity.class.php
===================================================================
--- /mods/wpsg_mod_minquantity.class.php	(revision 7814)
+++ /mods/wpsg_mod_minquantity.class.php	(revision 7815)
@@ -86,9 +86,8 @@
 		} // public function settings_save()
 		
-		public function produkt_edit_allgemein(&$produkt_data)
-		{
-
-			$this->shop->view['wpsg_mod_minquantity']['value'] = $produkt_data['wpsg_mod_minquantity_value'];
-			$this->shop->view['wpsg_mod_minquantity']['valuemax'] = $produkt_data['wpsg_mod_minquantity_valuemax'];
+		public function produkt_edit_allgemein(&$produkt_data) {
+
+			$this->shop->view['wpsg_mod_minquantity']['value'] = wpsg_getStr($produkt_data['wpsg_mod_minquantity_value']);
+			$this->shop->view['wpsg_mod_minquantity']['valuemax'] = wpsg_getStr($produkt_data['wpsg_mod_minquantity_valuemax']);
 			
 			//$this->shop->render(WPSG_PATH_VIEW.'/mods/mod_minquantity/produkt_edit_allgemein.phtml');
Index: /views/warenkorb/overview.phtml
===================================================================
--- /views/warenkorb/overview.phtml	(revision 7814)
+++ /views/warenkorb/overview.phtml	(revision 7815)
@@ -410,5 +410,5 @@
 							echo wpsg_ff($this->view['basket']['sum']['preis_payment'], $this->get_option('wpsg_currency'));
 							
-							if (strpos($this->view['basket']['arCalculation']['payment'][0]['set'], '%') !== false) {
+							if (strpos(wpsg_getStr($this->view['basket']['arCalculation']['payment'][0]['set']), '%') !== false) {
 								
 								echo '<span class="procent_payship">('.wpsg_ff(wpsg_tf($this->view['basket']['arCalculation']['payment'][0]['set']), '%').')</span>';