Index: /controller/wpsg_BasketController.class.php
===================================================================
--- /controller/wpsg_BasketController.class.php	(revision 8117)
+++ /controller/wpsg_BasketController.class.php	(revision 8118)
@@ -148,5 +148,16 @@
 			$this->setBasketData();
 			
-			$this->shop->basket->initFromSession();
+			$this->shop->checkCustomerPresetCountry();
+			
+			// Basket aus Session zusammenbauen
+			$this->shop->basket->initFromSession(true);
+			$this->shop->basket->save(false);
+			
+			// Basket muss aufgebaut sein
+			$this->shop->checkShippingAvailable();
+			$this->shop->checkPaymentAvailable();            
+			$this->shop->checkCustomerPreset();
+			
+			\wpsg\wpsg_calculation::getSessionCalculation()->update();
 			
 			$bError = true;