Merge branch '44444-save-twice' of github.corp.magento.com:magento-folks/magento2ce into bugs

Author: Ievgen Shakhsuvarov

app/code/Magento/Checkout/Api/Data/ShippingInformationInterface.php

@@ -12,6 +12,8 @@ interface ShippingInformationInterface extends \Magento\Framework\Api\CustomAttr
      */
     const SHIPPING_ADDRESS = 'shipping_address';
 
+    const BILLING_ADDRESS = 'billing_address';
+
     const SHIPPING_METHOD_CODE = 'shipping_method_code';
 
     const SHIPPING_CARRIER_CODE = 'shipping_carrier_code';
@@ -33,6 +35,21 @@ public function getShippingAddress();
      */
     public function setShippingAddress(\Magento\Quote\Api\Data\AddressInterface $address);
 
+    /**
+     * Returns billing address
+     *
+     * @return \Magento\Quote\Api\Data\AddressInterface|null
+     */
+    public function getBillingAddress();
+
+    /**
+     * Set billing address if additional synchronization needed
+     *
+     * @param \Magento\Quote\Api\Data\AddressInterface $address
+     * @return $this
+     */
+    public function setBillingAddress(\Magento\Quote\Api\Data\AddressInterface $address);
+
     /**
      * Returns shipping method code
      *

app/code/Magento/Checkout/Model/ShippingInformation.php

@@ -29,6 +29,22 @@ public function setShippingAddress(\Magento\Quote\Api\Data\AddressInterface $add
         return $this->setData(self::SHIPPING_ADDRESS, $address);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getBillingAddress()
+    {
+        return $this->getData(self::BILLING_ADDRESS);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setBillingAddress(\Magento\Quote\Api\Data\AddressInterface $address)
+    {
+        return $this->setData(self::BILLING_ADDRESS, $address);
+    }
+
     /**
      * {@inheritdoc}
      */

app/code/Magento/Checkout/Model/ShippingInformationManagement.php

@@ -128,6 +128,10 @@ public function saveAddressInformation(
             $addressData = $this->addressRepository->getById($customerAddressId);
             $address = $quote->getShippingAddress()->importCustomerAddressData($addressData);
         }
+        $billingAddress = $addressInformation->getBillingAddress();
+        if ($billingAddress) {
+            $quote->setBillingAddress($billingAddress);
+        }
 
         $address->setSaveInAddressBook($saveInAddressBook);
         $address->setSameAsBilling($sameAsBilling);

app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js

@@ -172,6 +172,10 @@ define([
             }
         },
         applyBillingAddress: function () {
+            if (quote.billingAddress()) {
+                selectBillingAddress(quote.billingAddress());
+                return;
+            }
             var shippingAddress = quote.shippingAddress();
             if (shippingAddress
                 && shippingAddress.canUseForBilling()

app/code/Magento/Checkout/view/frontend/web/js/model/shipping-save-processor/default.js

@@ -27,9 +27,11 @@ define(
         'use strict';
         return {
             saveShippingInformation: function() {
+                var billingAddress = quote.billingAddress() || quote.shippingAddress();
                 var payload = {
                     addressInformation: {
                         shipping_address: quote.shippingAddress(),
+                        billing_address: billingAddress,
                         shipping_method_code: quote.shippingMethod().method_code,
                         shipping_carrier_code: quote.shippingMethod().carrier_code
                     }