Merge pull request #40 from netresearch/CI-238

CI-238: fix address ids

Author: schmengler

src/Checkout/CustomerCheckout.php

@@ -62,7 +62,7 @@ public function __construct(
         $shippingMethodCode = null,
         $paymentMethodCode = null
     ) {
-    
+
         $this->addressRepository = $addressRepository;
         $this->quoteRepository = $quoteRepository;
         $this->quoteManagement = $quoteManagement;
@@ -170,7 +170,7 @@ private function saveBilling()
     {
         $billingAddress = $this->cart->getQuote()->getBillingAddress();
         $billingAddress->importCustomerAddressData(
-            $this->addressRepository->getById($this->getCustomerShippingAddressId())
+            $this->addressRepository->getById($this->getCustomerBillingAddressId())
         );
         $billingAddress->save();
     }
@@ -179,7 +179,7 @@ private function saveShipping()
     {
         $shippingAddress = $this->cart->getQuote()->getShippingAddress();
         $shippingAddress->importCustomerAddressData(
-            $this->addressRepository->getById($this->getCustomerBillingAddressId())
+            $this->addressRepository->getById($this->getCustomerShippingAddressId())
         );
         $shippingAddress->setCollectShippingRates(true);
         $shippingAddress->collectShippingRates();