Index: /controller/wpsg_OrderController.class.php
===================================================================
--- /controller/wpsg_OrderController.class.php	(revision 7215)
+++ /controller/wpsg_OrderController.class.php	(revision 7216)
@@ -194,8 +194,14 @@
                 $oCustomer = wpsg_customer::getInstance($customer_id);
 				$oDefaultCountry = $this->shop->getDefaultCountry();                
-                
+                								
                 $order_id = $this->db->ImportQuery(WPSG_TBL_ORDER, Array(
-                    'payment_key' => wpsg_q($_REQUEST['add_payment']),
-                    'shipping_key' => wpsg_q($_REQUEST['add_shipping']),
+                    'payment_key' => wpsg_q($_REQUEST['add_payment']),                    
+                    'payment_bruttonetto' => wpsg_q($this->shop->getBackendTaxview()),
+					'payment_tax_key' => wpsg_q($this->shop->arPayment[$_REQUEST['add_payment']]['mwst_key']),
+					'payment_set' => wpsg_q($this->shop->arPayment[$_REQUEST['add_payment']]['price']),
+					'shipping_key' => wpsg_q($_REQUEST['add_shipping']),
+					'shipping_bruttonetto' => wpsg_q($this->shop->getBackendTaxview()),
+					'shipping_tax_key' => wpsg_q($this->shop->arShipping[$_REQUEST['add_shipping']]['mwst_key']),
+					'shipping_set' => wpsg_q($this->shop->arShipping[$_REQUEST['add_shipping']]['price']),
                     'price_frontend' => $this->shop->getFrontendTaxview(),
                     'cdate' => 'NOW()',
Index: /lib/wpsg_calculation.class.php
===================================================================
--- /lib/wpsg_calculation.class.php	(revision 7215)
+++ /lib/wpsg_calculation.class.php	(revision 7216)
@@ -812,5 +812,5 @@
         private function calculateTaxPart($bruttonetto, $val, $tax_key) {
 	        	
-        	if (!wpsg_isSizedInt($val)) return [0, 0];
+        	if (!is_numeric($val)) $val = 0;
         	
         	if ($tax_key == '0') {
Index: /mods/wpsg_mod_freeshipping.class.php
===================================================================
--- /mods/wpsg_mod_freeshipping.class.php	(revision 7215)
+++ /mods/wpsg_mod_freeshipping.class.php	(revision 7216)
@@ -61,4 +61,5 @@
 			
 			$arShipping[$this->id] = array(
+				'active' => $this->shop->get_option('wpsg_mod_freeshipping_aktiv'),
 				'id' => $this->id,
 				'name' => $this->shop->get_option('wpsg_mod_freeshipping_bezeichnung'),
Index: /mods/wpsg_mod_userpayment.class.php
===================================================================
--- /mods/wpsg_mod_userpayment.class.php	(revision 7215)
+++ /mods/wpsg_mod_userpayment.class.php	(revision 7216)
@@ -188,4 +188,5 @@
 				$arPayment[$this->id.'_'.$zv['id']] = array(
 					'id' => $this->id.'_'.$zv['id'],
+					'active' => $zv['aktiv'],
 					'name' => __($zv['name'], 'wpsg'),
 					'hint' => __($hint, 'wpsg'),
Index: /mods/wpsg_mod_versandarten.class.php
===================================================================
--- /mods/wpsg_mod_versandarten.class.php	(revision 7215)
+++ /mods/wpsg_mod_versandarten.class.php	(revision 7216)
@@ -281,4 +281,5 @@
 				
 				$arShipping[$this->id.'_'.$va['id']] = array(
+					'active' => $va['aktiv'],
 					'id' => $this->id.'_'.$va['id'],
 					'va_id' => $va['id'],
Index: /mods/wpsg_mod_willcollect.class.php
===================================================================
--- /mods/wpsg_mod_willcollect.class.php	(revision 7215)
+++ /mods/wpsg_mod_willcollect.class.php	(revision 7216)
@@ -235,4 +235,5 @@
 			$arShipping[$this->id] = array(
 				'id' => $this->id,
+				'active' => $this->shop->get_option('wpsg_mod_willcollect_aktiv'),
 				'name' => __($this->shop->get_option('wpsg_mod_willcollect_bezeichnung'), 'wpsg'),
 				'preis' => $this->shop->get_option('wpsg_mod_willcollect_gebuehr'),
Index: /views/order/index.phtml
===================================================================
--- /views/order/index.phtml	(revision 7215)
+++ /views/order/index.phtml	(revision 7216)
@@ -119,9 +119,9 @@
                             
                             <br />
-                            
-                            <?php $arShippingSelect = []; foreach ($this->arShipping as $shipping_id => $shipping) $arShippingSelect[$shipping_id] = $shipping['name']; ?>
+							
+                            <?php $arShippingSelect = []; foreach ($this->arShipping as $shipping_id => $shipping) if (!isset($shipping['active']) || $shipping['active'] === '1') $arShippingSelect[$shipping_id] = $shipping['name'].' ('.wpsg_ff($shipping['price']).')'; ?>
                             <?php echo wpsg_drawForm_Select('add_shipping', __('Versandart', 'wpsg'), $arShippingSelect, @$_REQUEST['add_shipping']); ?>
 
-                            <?php $arPaymentSelect = []; foreach ($this->arPayment as $payment_id => $payment) $arPaymentSelect[$payment_id] = $payment['name']; ?>
+                            <?php $arPaymentSelect = []; foreach ($this->arPayment as $payment_id => $payment) if (!isset($payment['active']) || $payment['active'] === '1')  $arPaymentSelect[$payment_id] = $payment['name'].' ('.wpsg_ff($payment['price']).')'; ?>
                             <?php echo wpsg_drawForm_Select('add_payment', __('Zahlungsart', 'wpsg'), $arPaymentSelect, @$_REQUEST['add_payment']); ?>
                             
Index: /views/order/product_table.phtml
===================================================================
--- /views/order/product_table.phtml	(revision 7215)
+++ /views/order/product_table.phtml	(revision 7216)
@@ -292,3 +292,5 @@
 	</tbody>
 </table>
+
+<?php wpsg_debug($arCalculation);  ?>