Merge pull request #14 from sw-4863-fix-changing-countries-in-orders …

…to master

* commit 'a6d6e94622e199b653808fea3d6905bfa4dd8105':
  SW-4863 - Load countryModel before storing billingAddress

engine/Shopware/Controllers/Backend/Order.php

@@ -1357,8 +1357,8 @@ private function getAssociatedData($data, $order, $billing, $shipping)
         //created documents models would be overwritten.
         unset($data['documents']);
 
-        $data['billing'] = $data['billing'][0];
-        $data['shipping'] = $data['shipping'][0];
+        $data['billing'] = $this->prepareAddressData($data['billing'][0]);
+        $data['shipping'] = $this->prepareAddressData($data['shipping'][0]);
         $data['attribute'] = $data['attribute'][0];
         $data['billing']['attribute'] = $data['billingAttribute'][0];
         $data['shipping']['attribute'] = $data['shippingAttribute'][0];
@@ -1367,7 +1367,24 @@ private function getAssociatedData($data, $order, $billing, $shipping)
         return $data;
     }
 
+    /**
+     * Prepare address data - loads countryModel from a given countryId
+     *
+     * @param $data Array
+     * @return Array
+     */
+    protected function prepareAddressData(array $data)
+    {
+        if (isset($data['countryId']) && !empty($data['countryId'])) {
+            $countryModel = $this->getCountryRepository()->find($data['countryId']);
+            if ($countryModel) {
+                $data['country'] = $countryModel;
+            }
+            unset($data['countryId']);
+        }
 
+        return $data;
+    }
 
     /**
      * Creates the status mail order for the passed order id and new status object.