Index: /mods/wpsg_mod_su.class.php
===================================================================
--- /mods/wpsg_mod_su.class.php	(revision 7499)
+++ /mods/wpsg_mod_su.class.php	(revision 7500)
@@ -148,9 +148,10 @@
 		} // public function addPayment(&$arPayment)
 		 
-		public function order_done(&$order_id, &$done_view) 
-		{ 
+		public function order_done(&$order_id, &$done_view) { 
+			
+			$oOrder = wpsg_order::getInstance($order_id);			
 
 			// Bestellungen mit 0 geben nix aus
-			if ($done_view['basket']['sum']['preis_gesamt_brutto'] <= 0) return;
+			if ($oOrder->getToPay() <= 0) return;
 			
 			if ($this->shop->view['basket']['checkout']['payment'] == $this->id)
@@ -193,4 +194,6 @@
 				$order = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_ORDER."` WHERE `id` = '".wpsg_q(sanitize_key($_REQUEST['user_variable_2']))."'");
 				if ($order['id'] <= 0) die();
+				
+				$oOrder = wpsg_order::getInstance($order['id']);
 				
 				$arHash = array(
@@ -213,5 +216,5 @@
 					'recipient_country_id' => sanitize_key($_REQUEST['recipient_country_id']),
 					'international_transaction' => sanitize_key($_REQUEST['international_transaction']),
-					'amount' => number_format(wpsg_tf($order['price_gesamt']), 2, '.', ''),
+					'amount' => number_format(wpsg_tf($oOrder->getToPay()), 2, '.', ''),
 					'currency_id' => sanitize_key($_REQUEST['currency_id']),
 					'reason_1' => sanitize_key($_REQUEST['reason_1']),
@@ -306,4 +309,6 @@
 			$subject2 = $this->shop->replaceUniversalPlatzhalter(__($this->shop->get_option('wpsg_mod_su_subject2'), 'wpsg'), $order_id);
 			
+			$oOrder = wpsg_order::getInstance($order_id);
+			
 			$arHash = array(
 				$this->shop->get_option('wpsg_mod_su_userid'), // user_id
@@ -313,5 +318,5 @@
 				"", // sender_bank_code
 				"", // sender_country_id
-				number_format(wpsg_tf($order['price_gesamt']), 2, '.', ''), // amount
+				number_format(wpsg_tf($oOrder->getToPay()), 2, '.', ''), // amount
 				$this->shop->get_option("wpsg_mod_su_currency"), // currency_id
 				$subject1, // reason_1
@@ -345,5 +350,5 @@
 				"user_id=".urlencode($this->shop->get_option('wpsg_mod_su_userid'))."&".
 				"project_id=".urlencode($this->shop->get_option('wpsg_mod_su_projectid'))."&".
-				"amount=".urlencode(number_format(wpsg_tf($order['price_gesamt']), 2, '.', ''))."&".
+				"amount=".urlencode(number_format(wpsg_tf($oOrder->getToPay()), 2, '.', ''))."&".
 				"reason_1=".urlencode($subject1)."&".
 				"reason_2=".urlencode($subject2)."&".
Index: /views/mods/mod_gutschein/overview_row_end_coupon.phtml
===================================================================
--- /views/mods/mod_gutschein/overview_row_end_coupon.phtml	(revision 7499)
+++ /views/mods/mod_gutschein/overview_row_end_coupon.phtml	(revision 7500)
@@ -47,5 +47,5 @@
 	</div>
 	<div class="sum">
-		<?php echo wpsg_ff($arCalculation['topay_'.$display_brutto_netto], $this->get_option('wpsg_currency')); ?>
+		<?php echo wpsg_ff($arCalculation['sum']['topay_'.$display_brutto_netto], $this->get_option('wpsg_currency')); ?>
 	</div>
 </div>
Index: /views/produkt/index.phtml
===================================================================
--- /views/produkt/index.phtml	(revision 7499)
+++ /views/produkt/index.phtml	(revision 7500)
@@ -142,40 +142,38 @@
                         <th class="manage-column column-title wpsg_pic_col"></th>
                         <th class="wpsg_order" data-order="name"><?php echo __("Name", 'wpsg'); ?></th>
-                        <?php if ($this->get_option('wpsg_ProductArticleNumber') == '1') { ?>
-	                        <th class="wpsg_order" data-order="anr"><?php echo __("Artikelnummer", 'wpsg'); ?></th>
-    					<?php } ?>    
+                        <th class="wpsg_order" data-order="anr"><?php echo __("Artikelnummer", 'wpsg'); ?></th>
     					                
                         <?php /* if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_positionnumber') == '1') { ?>
 							<th class="wpsg_order" data-order="pos-nr"><?php echo __("Positionsnummer", "wpsg"); ?></th>
 						<?php } */ ?>
+	
+						<?php if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_gtin') == '1') { ?>
+						<th class="wpsg_order" data-order="gtin-nr"><?php echo __("GTIN", "wpsg"); ?></th>						
+						<?php } ?>
+	
+						<?php if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_ean') == '1') { ?>
+						<th class="wpsg_order" data-order="ean-nr"><?php echo __("EAN", "wpsg"); ?></th>
+						<?php } ?>
+	
+						<?php if ($this->hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_productindex') == '1') { ?>
+						<th class="wpsg_order" data-order="deliverytime"><?php echo __("Lieferzeit", 'wpsg'); ?></th>
+						<?php } ?>
+							
+						<?php if ($this->hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProductindexBackend') == '1') { ?>
+						<th class="wpsg_order" data-order="weight"><?php echo __("Gewicht", 'wpsg'); ?></th>                        
+						<?php } ?>
+	
+						<?php if ($this->hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showProductindexBackend_fmenge') == '1') { ?>
+                        <th class="wpsg_order" data-order="fuellmenge"><?php echo __("FÃŒllmenge", 'wpsg'); ?></th>
+						<?php } ?>
+	
+						<?php if ($this->hasMod('wpsg_mod_productgroups') && $this->get_option('wpsg_mod_productgroups_productindex') == '1') { ?>
+                        <th class="wpsg_order" data-order="pgruppe"><?php echo __("Produktgruppe", 'wpsg'); ?></th><th class="wpsg_order" data-order="stock"><?php echo __("Lagerbestand", 'wpsg'); ?></th>
+						<?php } ?>
+	
+						<?php if ($this->hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?>
+						<th class="wpsg_order" data-order="stock"><?php echo __("Lagerbestand", 'wpsg'); ?></th>
+						<?php } ?>
 						
-						<?php if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_gtin') == '1') { ?>
-							<th class="wpsg_order" data-order="gtin-nr"><?php echo __("GTIN", "wpsg"); ?></th>
-						<?php } ?>
-						
-						<?php if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_ean') == '1') { ?>
-							<th class="wpsg_order" data-order="ean-nr"><?php echo __("EAN", "wpsg"); ?></th>
-						<?php } ?>					
-						
-						<?php if ($this->hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_productindex') == '1') { ?>
-                        <th class="wpsg_order" data-order="deliverytime"><?php echo __("Lieferzeit", 'wpsg'); ?></th>
-                        <?php  } ?>
-                        
-                        <?php if ($this->hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProductindexBackend') == '1') { ?>
-                        <th class="wpsg_order" data-order="weight"><?php echo __("Gewicht", 'wpsg'); ?></th>
-                        <?php  } ?>
-                        
-                        <?php if ($this->hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showProductindexBackend_fmenge') == '1') { ?>
-                        <th class="wpsg_order" data-order="fuellmenge"><?php echo __("FÃŒllmenge", 'wpsg'); ?></th>
-                        <?php  } ?>
-						
-                        <?php if ($this->hasMod('wpsg_mod_productgroups') && $this->get_option('wpsg_mod_productgroups_productindex') == '1') { ?>
-                        <th class="wpsg_order" data-order="pgruppe"><?php echo __("Produktgruppe", 'wpsg'); ?></th>
-                        <?php } ?>
-
-                        <?php if ($this->hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?>
-                        <th class="wpsg_order" data-order="stock"><?php echo __("Lagerbestand", 'wpsg'); ?></th>
-                        <?php } ?>
-
                         <th class="wpsg_order" data-order="mwst"><?php echo __("MwSt.", 'wpsg'); ?></th>
 
@@ -221,7 +219,5 @@
                             </div>
                         </td>
-                        <?php if ($this->get_option('wpsg_ProductArticleNumber') == '1') { ?>
-                        	<td><?php echo wpsg_hspc($d['anr']); ?></td>
-                        <?php } ?>
+                        <td><?php echo wpsg_hspc($d['anr']); ?></td>
                         <?php /* if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_positionnumber') == '1') { ?>
                         	<td>
@@ -229,12 +225,11 @@
                         	</td>                     	
                         <?php } */ ?>
-                        <?php if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_gtin') == '1') { ?>
-                        	<td><?php echo wpsg_hspc($d['gtin']); ?></td>
-                        <?php } ?>
-                        <?php if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_ean') == '1') { ?>
-                        	<td><?php echo wpsg_hspc($d['ean']); ?></td>
-                        <?php } ?>
-                        
-                        <?php  if ($this->hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_productindex') == '1') { ?>
+						<?php if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_gtin') == '1') { ?>
+							<td><?php echo wpsg_hspc($d['gtin']); ?></td>
+						<?php } ?>
+						<?php if ($this->hasMod('wpsg_mod_produktartikel') && $this->get_option('wpsg_mod_produktartikel_ean') == '1') { ?>
+							<td><?php echo wpsg_hspc($d['ean']); ?></td>
+						<?php } ?>
+						<?php if ($this->hasMod('wpsg_mod_deliverytime') && $this->get_option('wpsg_mod_deliverytime_productindex') == '1') { ?>
                         <td>
                         	<?php if ($this->callMod('wpsg_mod_deliverytime', 'isStoreProduct', array($oProduct->getProductKey()))) { ?>
@@ -265,6 +260,5 @@
                         </td>
                         <?php } ?>
-                        
-                        <?php if ($this->hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProductindexBackend') == '1') { ?>
+						<?php if ($this->hasMod('wpsg_mod_weight') && $this->get_option('wpsg_mod_weight_showProductindexBackend') == '1') { ?>
                         <td>
                              <?php if (($oProduct->weight) > '0') { ?>
@@ -275,6 +269,5 @@
                         </td>
                         <?php } ?>
-                        
-                        <?php if ($this->hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showProductindexBackend_fmenge') == '1') { ?>
+						<?php if ($this->hasMod('wpsg_mod_fuellmenge') && $this->get_option('wpsg_mod_fuellmenge_showProductindexBackend_fmenge') == '1') { ?>
                         <td>
                         	<?php if (($oProduct->fmenge) > '0') { ?>										
@@ -285,6 +278,5 @@
                         </td>
                         <?php } ?>
-                        
-                        <?php if ($this->hasMod('wpsg_mod_productgroups') && $this->get_option('wpsg_mod_productgroups_productindex') == '1') { ?>
+						<?php if ($this->hasMod('wpsg_mod_productgroups') && $this->get_option('wpsg_mod_productgroups_productindex') == '1') { ?>
                         <td>
                             <?php if ($d['pgruppe'] <= 0) { ?>
@@ -295,5 +287,5 @@
                         </td>
                         <?php } ?>
-                        <?php if ($this->hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?>
+						<?php if ($this->hasMod('wpsg_mod_stock') && $this->get_option('wpsg_mod_stock_showBackendStock') == '1') { ?>
                         <td>
                             <div style="line-height:inherit; margin-bottom:0.2em;">
Index: /views/warenkorb/basket.phtml
===================================================================
--- /views/warenkorb/basket.phtml	(revision 7499)
+++ /views/warenkorb/basket.phtml	(revision 7500)
@@ -7,5 +7,5 @@
 	//wpsg_debug($this->view['basket']);
 	//wpsg_debug($this->view['basket']['arCalculation']);
-	//wpsg_debug($_SESSION);
+	wpsg_debug($_SESSION['wpsg']);
 	//wpsg_debug($this->arShipping);