Fix for KCO UpdateOrder not prefilling address

Geta · Dec 19, 2020 · f876a45 · f876a45
1 parent e62a609
commit f876a45
Showing 1 changed file with 25 additions and 19 deletions.
diff --git a/src/Klarna.Checkout/KlarnaCheckoutService.cs b/src/Klarna.Checkout/KlarnaCheckoutService.cs
@@ -119,25 +119,7 @@ public virtual async Task<CheckoutOrder> CreateOrder(ICart cart)
             var checkout = CreateCheckoutOrder(market);
             var orderData = GetCheckoutOrderData(cart, market, PaymentMethodDto);
             var checkoutConfiguration = GetCheckoutConfiguration(market);
-
-            if (checkoutConfiguration.PrefillAddress)
-            {
-                // KCO_4: In case of signed in user the email address and default address details will be prepopulated by data from Merchant system.
-                var customerContact = CustomerContext.Current.GetContactById(cart.CustomerId);
-                if (customerContact?.PreferredBillingAddress != null)
-                {
-                    orderData.BillingCheckoutAddress = customerContact.PreferredBillingAddress.ToAddress();
-                }
-
-                if (orderData.CheckoutOptions.AllowSeparateShippingAddress)
-                {
-                    var shipment = cart.GetFirstShipment();
-                    if (shipment.ShippingAddress != null)
-                    {
-                        orderData.ShippingCheckoutAddress = shipment.ShippingAddress.ToCheckoutAddress();
-                    }
-                }
-            }
+
             try
             {
                 if (ServiceLocator.Current.TryGetExistingInstance(out ICheckoutOrderDataBuilder checkoutOrderDataBuilder))
@@ -277,6 +259,30 @@ protected virtual CheckoutOrder GetCheckoutOrderData(
             {
                 orderData.CheckoutOptions = GetOptions(cart.MarketId);
             }
+
+            if (checkoutConfiguration.PrefillAddress)
+            {
+                // KCO_4: In case of signed in user the email address and default address details will be prepopulated by data from Merchant system.
+                var customerContact = CustomerContext.Current.GetContactById(cart.CustomerId);
+                if (customerContact?.PreferredBillingAddress != null)
+                {
+                    orderData.BillingCheckoutAddress = customerContact.PreferredBillingAddress.ToAddress();
+                }
+
+                if (orderData.CheckoutOptions.AllowSeparateShippingAddress)
+                {
+                    if (customerContact?.PreferredShippingAddress != null)
+                    {
+                        orderData.ShippingCheckoutAddress = customerContact.PreferredShippingAddress.ToAddress();
+                    }
+
+                    if (shipment?.ShippingAddress != null)
+                    {
+                        orderData.ShippingCheckoutAddress = shipment.ShippingAddress.ToCheckoutAddress();
+                    }
+                }
+            }
+
             return orderData;
         }