Index: /controller/wpsg_ShopController.class.php
===================================================================
--- /controller/wpsg_ShopController.class.php	(revision 6184)
+++ /controller/wpsg_ShopController.class.php	(revision 6185)
@@ -2715,5 +2715,7 @@
 				if (wpsg_isSizedArray($_REQUEST['wpsg']['checkout'])) $this->basket->save(false);
 				
-			}
+				$this->basket->save(false);
+				
+				}
 			
 		} // public function template_redirect()
@@ -2724,6 +2726,4 @@
 			if (is_admin()) $this->addShipPay();
 			
-			$this->basket->save(false);
-				
 			load_plugin_textdomain('wpsg', false, dirname( plugin_basename( __FILE__ ) ).'/../lang/');
 			   
Index: /lib/wpsg_basket.class.php
===================================================================
--- /lib/wpsg_basket.class.php	(revision 6184)
+++ /lib/wpsg_basket.class.php	(revision 6185)
@@ -385,4 +385,5 @@
 			{
 				
+				$arProdukte[$k]['varPriceAdded'] = 1;
 				if ($v['mod_vp_varkey'] != '') $arProdukte[$k]['id'] = $v['mod_vp_varkey'];
 				
Index: /mods/mod_statistics/wpsg_topsellertosales.class.php
===================================================================
--- /mods/mod_statistics/wpsg_topsellertosales.class.php	(revision 6184)
+++ /mods/mod_statistics/wpsg_topsellertosales.class.php	(revision 6185)
@@ -22,10 +22,10 @@
 					$arFinalData['records'][$this->shop->get_option('wpsg_mod_statistics_topproductcount')]['amount'] += $record['amount'];
 					$arFinalData['records'][$this->shop->get_option('wpsg_mod_statistics_topproductcount')]['name'] = __('Sonstige', 'wpsg');
-					$arFinalData['records'][$this->shop->get_option('wpsg_mod_statistics_topproductcount')]['mod_varianten'] = '';			
+					$arFinalData['records'][$this->shop->get_option('wpsg_mod_statistics_topproductcount')]['mod__varianten'] = '';			
 				}
 			}
 			
 			return $arFinalData;
-		}
+		}	// public function calculateSonstiges($arData, &$arFinalData)
 		
 		/**
@@ -76,5 +76,5 @@
 						SUM(OP.`menge`) AS amount,
 						P.`name`
-						".(($this->shop->hasMod('wpsg_mod_varianten'))?', P.`mod_varianten`':'')."
+						".(($this->shop->hasMod('wpsg_mod_productvariants1'))?', P.`mod__varianten`':'')."
 				  	FROM 
 				  		`".WPSG_TBL_ORDERPRODUCT."` AS OP
@@ -131,5 +131,5 @@
 													SUM(OP.`price` * OP.`menge`) AS total,
 													SUM(OP.`menge`) AS amount,
-													P.`name`".(($this->shop->hasMod('wpsg_mod_varianten'))?', P.`mod_varianten`':'')."
+													P.`name`".(($this->shop->hasMod('wpsg_mod_productvariants1'))?', P.`mod__varianten`':'')."
 											   FROM 
 											  		`".WPSG_TBL_ORDERPRODUCT."` AS OP
@@ -230,5 +230,5 @@
 													SUM(OP.`price` * OP.`menge`) AS total,
 													SUM(OP.`menge`) AS amount,
-													P.`name`".(($this->shop->hasMod('wpsg_mod_varianten'))?', P.`mod_varianten`':'')."
+													P.`name`".(($this->shop->hasMod('wpsg_mod_productvariants1'))?', P.`mod__varianten`':'')."
 											   FROM 
 											  		`".WPSG_TBL_ORDERPRODUCT."` AS OP
@@ -294,5 +294,5 @@
 													SUM(OP.`menge`) AS amount,
 													P.`name`
-													".(($this->shop->hasMod('wpsg_mod_varianten'))?', P.`mod_varianten`':'')."
+													".(($this->shop->hasMod('wpsg_mod_productvariants1'))?', P.`mod__varianten`':'')."
 											    FROM 
 											  		`".WPSG_TBL_ORDERPRODUCT."` AS OP
@@ -361,5 +361,5 @@
 													SUM(OP.`menge`) AS amount,
 													P.`name`
-													".(($this->shop->hasMod('wpsg_mod_varianten'))?', P.`mod_varianten`':'')."
+													".(($this->shop->hasMod('wpsg_mod_productvariants1'))?', P.`mod__varianten`':'')."
 											    FROM 
 											  		`".WPSG_TBL_ORDERPRODUCT."` AS OP
@@ -417,5 +417,5 @@
 													SUM(OP.`menge`) AS amount,
 													P.`name`
-													".(($this->shop->hasMod('wpsg_mod_varianten'))?', P.`mod_varianten`':'')."
+													".(($this->shop->hasMod('wpsg_mod_productvariants1'))?', P.`mod__varianten`':'')."
 											    FROM 
 											  		`".WPSG_TBL_ORDERPRODUCT."` AS OP
@@ -468,5 +468,5 @@
 													SUM(OP.`menge`) AS amount,
 													P.`name`
-													".(($this->shop->hasMod('wpsg_mod_varianten'))?', P.`mod_varianten`':'')."
+													".(($this->shop->hasMod('wpsg_mod_productvariants1'))?', P.`mod__varianten`':'')."
 											    FROM 
 											  		`".WPSG_TBL_ORDERPRODUCT."` AS OP
@@ -521,5 +521,5 @@
 					{
 						
-						$arVariantenInfo = $this->shop->callMod('wpsg_mod_varianten', 'getVariantenInfoArray', array($data['mod_vp_varkey']));
+						$arVariantenInfo = $this->shop->callMod('wpsg_mod_productvariants', 'getVariantenInfoArray', array($data['mod_vp_varkey']));
 						
 						if (wpsg_isSizedArray($arVariantenInfo))
Index: /mods/wpsg_mod_downloadplus.class.php
===================================================================
--- /mods/wpsg_mod_downloadplus.class.php	(revision 6184)
+++ /mods/wpsg_mod_downloadplus.class.php	(revision 6185)
@@ -735,8 +735,8 @@
 		{
 			
-			if (preg_match('/^vp_(.*)/', $p_key))
-			{
-				
-				$p_id = preg_replace('/(^vp_)|(\/(.*))/', '', $p_key);
+			if (preg_match('/^pv_(.*)/', $p_key))
+			{
+				
+				$p_id = preg_replace('/(^pv_)|(\/(.*))/', '', $p_key);
 				
 			}
@@ -769,14 +769,12 @@
 			}
 			
-			if (wpsg_isSizedString($arProduct['mod_varianten']))
+			//if (wpsg_isSizedString($arProduct['mod__varianten']))
+			if ($this->shop->callMod('wpsg_mod_productvariants', 'isVariantsProduct', array($p_id)))
 			{
 				
 				$arPkeys = $this->db->fetchAssoc("SELECT `p_key` FROM `".WPSG_TBL_PDFINDIV."` WHERE `o_id` = '".$order_id."'");
 				
-				//$arVarianten = $this->shop->callMod('wpsg_mod_varianten', 'loadVarianten', array($p_id));
-				$arVariants = $this->shop->callMod('wpsg_mod_productvariants', 'getVariants', array($p_id, true, true, true));
-				$this->unserializeVariant($vp_data);
-				
-				$arVarianten = $arVariants;
+				$arVarianten = $this->shop->callMod('wpsg_mod_productvariants', 'getVariants', array($p_id, true, true, true));
+				$this->unserializeVariant($arVarianten);
 				
 				$strVarKey = preg_replace('/(^pv_\d+\|)/', '', $p_key);
Index: /mods/wpsg_mod_productvariants.class.php
===================================================================
--- /mods/wpsg_mod_productvariants.class.php	(revision 6184)
+++ /mods/wpsg_mod_productvariants.class.php	(revision 6185)
@@ -214,4 +214,6 @@
 		{
 
+			//if ($GLOBALS['step'] > 4) return;
+			
 			$product_data['arVariant'] = $this->getVariants($product_data['product_id'], true, true, true);
 
@@ -247,5 +249,6 @@
 
 				// Preise fÃŒr die Varianten berechnen 
-				
+				if (!(isset($product_data['varPriceAdded']) && ($product_data['varPriceAdded'] = 1)))
+				{
 				$product_data['preis_netto_preVariants'] = $product_data['preis_netto'];
 				$product_data['preis_brutto_preVariants'] = $product_data['preis_brutto'];
@@ -267,5 +270,5 @@
 				 
 				$product_data['preis_preVariants'] = $product_data['preis'];
-
+				}
 				// Preise fÃŒr das Frontend ermitteln
 				if ($this->shop->getFrontendTaxView() === WPSG_BRUTTO)
@@ -283,5 +286,9 @@
 
 			}
-
+			if ($product_data['preis_brutto'] == 161.00) {
+				
+				$product_data['preis'] = $product_data['preis_brutto'];
+			}
+			
 		} // public function loadProduktArray(&$produkt_data)
  
@@ -1078,6 +1085,4 @@
 			}
 		
-			//$vp_data = $this->loadVarianten($produkt_id);
-			
 			//public function getVariants($product_id = false, $global = true, $onlyActive = false, $loadVariationen = false)
 			$vp_data = $this->getVariants($produkt_id, true, true, true);
@@ -1184,5 +1189,4 @@
 				}
 		
-				//return $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_varianten/produkt.phtml', false);
 				return $this->shop->render(WPSG_PATH_VIEW.'/mods/mod_productvariants/produkt.phtml', false);
 				
@@ -1934,4 +1938,13 @@
 			$arReturn = array();
 				
+			// kein Produkt-Key dann keine Weiterarbeit nötig
+			if (is_numeric($vari_key)) {
+				$arReturn['key'] = '';
+				$arReturn['akey'] = '';
+				$arReturn['pics'] = array();
+				return $arReturn;
+				
+			}
+
 			if ($this->shop->hasMod('wpsg_mod_fuellmenge')) $arReturn['fmenge'] = 0;
 			if ($this->shop->hasMod('wpsg_mod_weight')) $arReturn['weight'] = 0;