Index: /controller/wpsg_BasketController.class.php
===================================================================
--- /controller/wpsg_BasketController.class.php	(revision 8101)
+++ /controller/wpsg_BasketController.class.php	(revision 8102)
@@ -950,4 +950,16 @@
 				} else if (isset($_REQUEST['wpsg_checkout2'])) {
 					
+					$this->shop->checkCustomerPresetCountry();
+				
+					// Bestellung abschließen
+					$this->shop->basket->initFromSession(true);
+					
+					// Basket muss aufgebaut sein
+					$this->shop->checkShippingAvailable();
+					$this->shop->checkPaymentAvailable();            
+					$this->shop->checkCustomerPreset();
+					 
+					\wpsg\wpsg_calculation::getSessionCalculation()->update();
+					
 					$bOK = $this->shop->basket->checkCheckout(2);