Index: /controller/wpsg_AdminController.class.php
===================================================================
--- /controller/wpsg_AdminController.class.php	(revision 6284)
+++ /controller/wpsg_AdminController.class.php	(revision 6285)
@@ -1364,5 +1364,5 @@
 			{
 
-				$temp = date("d.m.Y H:i:s", strtotime($basket->arCheckout['datum']));
+				//$temp = date("d.m.Y H:i:s", strtotime($basket->arCheckout['datum']));
 				//$temp = date("d.m.Y H:i:s", strtotime('2016-12-14'));
 				$this->shop->basket->initFromDB($_REQUEST['edit_id'], true);
@@ -1379,5 +1379,5 @@
 
 			$this->shop->render(WPSG_PATH_VIEW.'/order/view_orderdata.phtml');
-
+			
 			exit;
 		
Index: /controller/wpsg_OrderController.class.php
===================================================================
--- /controller/wpsg_OrderController.class.php	(revision 6284)
+++ /controller/wpsg_OrderController.class.php	(revision 6285)
@@ -83,4 +83,15 @@
 					$this->shop->view['data']['shipping_land'] = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->shop->view['data']['shipping_land'])."'");
 					
+					$temp = $this->db->fetchRow("
+						SELECT
+							A.*
+						FROM
+							`".WPSG_TBL_ADRESS."` AS A
+						WHERE
+							A.`id` = '".wpsg_q($this->shop->view['data']['shipping_adress_id'])."'
+					");
+					
+					$this->shop->view['data']['shipping_land'] = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($temp['land'])."'");
+					
 					$this->shop->view['kunde'] = $this->db->fetchRow("
 						SELECT
@@ -93,5 +104,16 @@
 					
 					$this->shop->view['kunde']['land'] = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($this->shop->view['kunde']['land'])."'");
- 					
+
+					$temp = $this->db->fetchRow("
+						SELECT
+							A.*
+						FROM
+							`".WPSG_TBL_ADRESS."` AS A
+						WHERE
+							A.`id` = '".wpsg_q($this->shop->view['data']['adress_id'])."'
+					");
+
+					$this->shop->view['kunde']['land'] = $this->db->fetchRow("SELECT * FROM `".WPSG_TBL_LAND."` WHERE `id` = '".wpsg_q($temp['land'])."'");
+					
 				}
 				
Index: /views/order/view.phtml
===================================================================
--- /views/order/view.phtml	(revision 6284)
+++ /views/order/view.phtml	(revision 6285)
@@ -97,4 +97,5 @@
 			success: function(data) {
 				jQuery('#wpsg_produkte_table').replaceWith(data);
+				location.href = location.href;
 			}
 		} );