MC-17462: Empty Order creation with Braintree and multiple address checkout

Author: viktym

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/cc-form.js

@@ -12,7 +12,7 @@ define([
     'Magento_Ui/js/model/messageList',
     'mage/translate',
     'Magento_Checkout/js/model/full-screen-loader',
-    'Magento_Checkout/js/action/set-payment-information',
+    'Magento_Checkout/js/action/set-payment-information-extended',
     'Magento_Checkout/js/model/payment/additional-validators',
     'Magento_Braintree/js/view/payment/validator-handler'
 ], function (
@@ -22,7 +22,7 @@ define([
     messageList,
     $t,
     fullScreenLoader,
-    setPaymentInformationAction,
+    setPaymentInformationExtended,
     additionalValidators,
     validatorManager
 ) {
@@ -51,9 +51,10 @@ define([
             if (additionalValidators.validate()) {
                 fullScreenLoader.startLoader();
                 $.when(
-                    setPaymentInformationAction(
+                    setPaymentInformationExtended(
                         this.messageContainer,
-                        this.getData()
+                        this.getData(),
+                        true
                     )
                 ).done(this.done.bind(this))
                     .fail(this.fail.bind(this));

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/multishipping/paypal.js

@@ -8,14 +8,14 @@ define([
     'jquery',
     'underscore',
     'Magento_Braintree/js/view/payment/method-renderer/paypal',
-    'Magento_Checkout/js/action/set-payment-information',
+    'Magento_Checkout/js/action/set-payment-information-extended',
     'Magento_Checkout/js/model/payment/additional-validators',
     'Magento_Checkout/js/model/full-screen-loader'
 ], function (
     $,
     _,
     Component,
-    setPaymentInformationAction,
+    setPaymentInformationExtended,
     additionalValidators,
     fullScreenLoader
 ) {
@@ -131,9 +131,10 @@ define([
         placeOrder: function () {
             fullScreenLoader.startLoader();
             $.when(
-                setPaymentInformationAction(
+                setPaymentInformationExtended(
                     this.messageContainer,
-                    this.getData()
+                    this.getData(),
+                    true
                 )
             ).done(this.done.bind(this))
                 .fail(this.fail.bind(this));

app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js

@@ -0,0 +1,60 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @api
+ */
+define([
+    'Magento_Checkout/js/model/quote',
+    'Magento_Checkout/js/model/url-builder',
+    'mage/storage',
+    'Magento_Checkout/js/model/error-processor',
+    'Magento_Customer/js/model/customer',
+    'Magento_Checkout/js/action/get-totals',
+    'Magento_Checkout/js/model/full-screen-loader'
+], function (quote, urlBuilder, storage, errorProcessor, customer, getTotalsAction, fullScreenLoader) {
+    'use strict';
+
+    return function (messageContainer, paymentData, skipBilling) {
+        var serviceUrl,
+            payload;
+
+        skipBilling = skipBilling || false;
+        payload = {
+            cartId: quote.getQuoteId(),
+            paymentMethod: paymentData
+        };
+
+        /**
+         * Checkout for guest and registered customer.
+         */
+        if (!customer.isLoggedIn()) {
+            serviceUrl = urlBuilder.createUrl('/guest-carts/:cartId/set-payment-information', {
+                cartId: quote.getQuoteId()
+            });
+            payload.email = quote.guestEmail;
+        } else {
+            serviceUrl = urlBuilder.createUrl('/carts/mine/set-payment-information', {});
+        }
+
+        if (skipBilling === false) {
+            payload.billingAddress = quote.billingAddress();
+        }
+
+        fullScreenLoader.startLoader();
+
+        return storage.post(
+            serviceUrl, JSON.stringify(payload)
+        ).fail(
+            function (response) {
+                errorProcessor.process(response, messageContainer);
+            }
+        ).always(
+            function () {
+                fullScreenLoader.stopLoader();
+            }
+        );
+    };
+});

app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information.js

@@ -7,54 +7,13 @@
  * @api
  */
 define([
-    'Magento_Checkout/js/model/quote',
-    'Magento_Checkout/js/model/url-builder',
-    'mage/storage',
-    'Magento_Checkout/js/model/error-processor',
-    'Magento_Customer/js/model/customer',
-    'Magento_Checkout/js/action/get-totals',
-    'Magento_Checkout/js/model/full-screen-loader'
-], function (quote, urlBuilder, storage, errorProcessor, customer, getTotalsAction, fullScreenLoader) {
+    'Magento_Checkout/js/action/set-payment-information-extended'
+
+], function (setPaymentInformationExtended) {
     'use strict';
 
     return function (messageContainer, paymentData) {
-        var serviceUrl,
-            payload;
-
-        /**
-         * Checkout for guest and registered customer.
-         */
-        if (!customer.isLoggedIn()) {
-            serviceUrl = urlBuilder.createUrl('/guest-carts/:cartId/set-payment-information', {
-                cartId: quote.getQuoteId()
-            });
-            payload = {
-                cartId: quote.getQuoteId(),
-                email: quote.guestEmail,
-                paymentMethod: paymentData,
-                billingAddress: quote.billingAddress()
-            };
-        } else {
-            serviceUrl = urlBuilder.createUrl('/carts/mine/set-payment-information', {});
-            payload = {
-                cartId: quote.getQuoteId(),
-                paymentMethod: paymentData,
-                billingAddress: quote.billingAddress()
-            };
-        }
-
-        fullScreenLoader.startLoader();
 
-        return storage.post(
-            serviceUrl, JSON.stringify(payload)
-        ).fail(
-            function (response) {
-                errorProcessor.process(response, messageContainer);
-            }
-        ).always(
-            function () {
-                fullScreenLoader.stopLoader();
-            }
-        );
+        return setPaymentInformationExtended(messageContainer, paymentData, false);
     };
 });

app/code/Magento/Payment/view/frontend/web/js/view/payment/iframe.js

@@ -125,12 +125,7 @@ define([
                 this.isPlaceOrderActionAllowed(false);
 
                 $.when(
-                    setPaymentInformationAction(
-                        this.messageContainer,
-                        {
-                            method: this.getCode()
-                        }
-                    )
+                    this.setPaymentInformation()
                 ).done(
                     this.done.bind(this)
                 ).fail(
@@ -145,6 +140,18 @@ define([
             }
         },
 
+        /**
+         * {Function}
+         */
+        setPaymentInformation: function () {
+            setPaymentInformationAction(
+                this.messageContainer,
+                {
+                    method: this.getCode()
+                }
+            );
+        },
+
         /**
          * {Function}
          */