Index: /changelog
===================================================================
--- /changelog	(revision 7902)
+++ /changelog	(revision 7903)
@@ -453,4 +453,5 @@
 
 #4.3.3
+- Feature: Exportprofile neue Spalten (Netto, Summe Steuer) fÌr die 4 SteuersÀtze
 - Bugfix: Gutscheine mit Betrag > Bestellwert
 - Bugfix: Gutscheinprodukt mit variablen Preis repariert
Index: /mods/wpsg_mod_export.class.php
===================================================================
--- /mods/wpsg_mod_export.class.php	(revision 7902)
+++ /mods/wpsg_mod_export.class.php	(revision 7903)
@@ -1434,4 +1434,13 @@
                         'order_useragent' => __('UserAgent', 'wpsg'),
                         'order_ip' => __('IP Adresse', 'wpsg'),
+
+                        'order_price_netto_a' => __('Summe Nettobetrag MwSt A', 'wpsg'),
+                        'order_tax_a' => __('Steuer MwSt MwSt A', 'wpsg'),
+                        'order_price_netto_b' => __('Summe Nettobetrag MwSt B', 'wpsg'),
+                        'order_tax_b' => __('Steuer MwSt MwSt B', 'wpsg'),
+                        'order_price_netto_c' => __('Summe Nettobetrag MwSt C', 'wpsg'),
+                        'order_tax_c' => __('Steuer MwSt MwSt C', 'wpsg'),
+                        'order_price_netto_d' => __('Summe Nettobetrag MwSt D', 'wpsg'),
+                        'order_tax_d' => __('Steuer MwSt MwSt D', 'wpsg'),
 
                         'order_invoice_title' => __('Rechnungsadresse Anrede', 'wpsg'),
@@ -1695,6 +1704,5 @@
         }
 
-        public function getValue($f, $profil_separator, $o_id, $p_id = false, $product_index = 1, $productkey = false, $order_product_id = false, $customer_id = false)
-        {
+        public function getValue($f, $profil_separator, $o_id, $p_id = false, $product_index = 1, $productkey = false, $order_product_id = false, $customer_id = false) {
 
             $field_value = $f['value_key'];
@@ -1703,6 +1711,5 @@
 
             // Hier werden die Ergebnisse gespeichert
-            if (array_key_exists($cache_key, $this->arCache))
-            {
+            if (array_key_exists($cache_key, $this->arCache)) {
 
                 $order = $this->arCache[$cache_key]['order'];
@@ -1710,7 +1717,5 @@
                 $kunde = $this->arCache[$cache_key]['kunde'];
 
-            }
-            else
-            {
+            } else {
 
                 $order = $this->db->fetchRow("
@@ -1736,6 +1741,5 @@
                 $order['custom_data'] = unserialize($order['custom_data']);
 
-                if ($this->shop->hasMod('wpsg_mod_rechnungen'))
-                {
+                if ($this->shop->hasMod('wpsg_mod_rechnungen')) {
 
                     $last_invoice = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_RECHNUNGEN."` WHERE `o_id` = '".wpsg_q($order['id'])."' AND `rnr` != '' ORDER BY `datum` DESC LIMIT 1 ");
@@ -1747,6 +1751,5 @@
                     $order['rdatum'] = '--';
 
-                    if (wpsg_isSizedInt($last_invoice['id']))
-                    {
+                    if (wpsg_isSizedInt($last_invoice['id'])) {
 
                         $order['rnr'] = $last_invoice['rnr'];
@@ -1755,6 +1758,5 @@
                     }
 
-                    if (wpsg_isSizedInt($last_storno['id']) && $last['id'] === $last_storno['id'])
-                    {
+                    if (wpsg_isSizedInt($last_storno['id']) && $last['id'] === $last_storno['id']) {
 
                         $order['gnr'] = $last_storno['gnr'];
@@ -1766,6 +1768,5 @@
 
                 /* Bestellvariablen */
-                if ($this->shop->hasMod('wpsg_mod_ordervars'))
-                {
+                if ($this->shop->hasMod('wpsg_mod_ordervars')) {
 
                     $order['bvars'] = @unserialize($order['bvars']);
@@ -1774,6 +1775,5 @@
 
                 /* Produktvariablen */
-                if ($this->shop->hasMod('wpsg_mod_productvars'))
-                {
+                if ($this->shop->hasMod('wpsg_mod_productvars')) {
 
                     $order['pvars'] = @unserialize($order['pvars']);
@@ -1795,6 +1795,5 @@
                 $kunde['kv'] = @unserialize($kunde['custom']);
 
-                if ($p_id == false)
-                {
+                if ($p_id == false) {
 
                     $arProdukte = $this->db->fetchAssoc("
@@ -1814,9 +1813,7 @@
                     $produkt = array();
 
-                    foreach ($arProdukte as $p)
-                    {
-
-                        foreach ($p as $col_name => $col_value)
-                        {
+                    foreach ($arProdukte as $p) {
+
+                        foreach ($p as $col_name => $col_value) {
 
                             $produkt[$col_name][] = $col_value;
@@ -1826,6 +1823,5 @@
                     }
 
-                    foreach ($produkt as $col_name => $values)
-                    {
+                    foreach ($produkt as $col_name => $values) {
 
                         if ($profil_separator == ',') $produkt[$col_name] = implode(";", $values);
@@ -1834,10 +1830,7 @@
                     }
 
-                }
-                else
-                {
-
-                    if (wpsg_isSizedInt($order_product_id))
-                    {
+                } else {
+
+                    if (wpsg_isSizedInt($order_product_id)) {
 
                         $produkt = $this->db->fetchRow("
@@ -1855,7 +1848,5 @@
 						");
 
-                    }
-                    else
-                    {
+                    } else {
 
                         $produkt = $this->db->fetchRow("
@@ -1876,6 +1867,5 @@
 
                     /* Produktattribute */
-                    if ($this->shop->hasMod('wpsg_mod_produktattribute'))
-                    {
+                    if ($this->shop->hasMod('wpsg_mod_produktattribute')) {
 
                         $produkt['mod_attribute'] = $this->db->fetchAssocField("
@@ -1900,12 +1890,9 @@
             }
 
-            if (wpsg_isSizedInt($order['land']))
-            {
+            if (wpsg_isSizedInt($order['land'])) {
 
                 $oFrontendCountry = wpsg_country::getInstance($order['land']);
 
-            }
-            else
-            {
+            } else {
 
                 $oFrontendCountry = $this->shop->getDefaultCountry();
@@ -1918,4 +1905,9 @@
             $oOrder = wpsg_order::getInstance($order['id']);
 
+            $oCalculation = new \wpsg\wpsg_calculation();
+            $oCalculation->fromDB($oOrder->getId());
+
+            $arCalculation = $oCalculation->getCalculationArray();
+
             if ($customer_id !== false) $oCustomer = wpsg_customer::getInstance($customer_id);
             else $oCustomer = $oOrder->getCustomer();
@@ -1927,10 +1919,41 @@
             }
 
-            switch ($field_value)
-            {
+            $getTaxSum = function($tax_code) use (&$arCalculation) {
+
+            	$netto = 0;
+            	$sum = 0;
+
+            	foreach ($arCalculation['tax'] as $tax_key => $tax) {
+
+            		if (substr($tax_key, 0, 1) === $tax_code) {
+
+            			$netto += $tax['netto'];
+            			$sum += $tax['sum'];
+
+		            }
+
+	            }
+
+            	return [
+            		'netto' => $netto,
+		            'sum' => $sum
+	            ];
+
+            };
+
+            switch ($field_value) {
 
                 case 'allgemein_empty': $return = ''; break;
                 case 'allgemein_statisch': $return = $f['static']; break;
                 case 'allgemein_currency': $return = get_option('wpshopgermany_currency'); break;
+
+	            case 'order_price_netto_a': $return = $getTaxSum('a')['netto']; break;
+	            case 'order_tax_a': $return = $getTaxSum('a')['sum']; break;
+	            case 'order_price_netto_b': $return = $getTaxSum('b')['netto']; break;
+	            case 'order_tax_b': $return = $getTaxSum('b')['sum']; break;
+	            case 'order_price_netto_c': $return = $getTaxSum('c')['netto']; break;
+	            case 'order_tax_c': $return = $getTaxSum('c')['sum']; break;
+	            case 'order_price_netto_d': $return = $getTaxSum('d')['netto']; break;
+	            case 'order_tax_d': $return = $getTaxSum('d')['sum']; break;
 
                 case 'order_id': $return = $order['id']; break;
Index: /views/warenkorb/checkout2.phtml
===================================================================
--- /views/warenkorb/checkout2.phtml	(revision 7902)
+++ /views/warenkorb/checkout2.phtml	(revision 7903)
@@ -7,5 +7,5 @@
 	//wpsg_debug($this->view['basket']['checkout']);
 	//die();
-	
+
 ?>
 <div class="wpsg wpsg_checkout2">