Merge remote-tracking branch 'origin/MAGETWO-97488' into 2.3-develop-pr14

Author: serhii-balko

app/code/Magento/Checkout/etc/frontend/sections.xml

@@ -46,7 +46,6 @@
     </action>
     <action name="rest/*/V1/guest-carts/*/payment-information">
         <section name="cart"/>
-        <section name="checkout-data"/>
     </action>
     <action name="rest/*/V1/guest-carts/*/selected-payment-method">
         <section name="cart"/>

app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js

@@ -9,9 +9,10 @@ define(
     [
         'mage/storage',
         'Magento_Checkout/js/model/error-processor',
-        'Magento_Checkout/js/model/full-screen-loader'
+        'Magento_Checkout/js/model/full-screen-loader',
+        'Magento_Customer/js/customer-data'
     ],
-    function (storage, errorProcessor, fullScreenLoader) {
+    function (storage, errorProcessor, fullScreenLoader, customerData) {
         'use strict';
 
         return function (serviceUrl, payload, messageContainer) {
@@ -23,6 +24,23 @@ define(
                 function (response) {
                     errorProcessor.process(response, messageContainer);
                 }
+            ).success(
+                function (response) {
+                    var clearData = {
+                        'selectedShippingAddress': null,
+                        'shippingAddressFromData': null,
+                        'newCustomerShippingAddress': null,
+                        'selectedShippingRate': null,
+                        'selectedPaymentMethod': null,
+                        'selectedBillingAddress': null,
+                        'billingAddressFromData': null,
+                        'newCustomerBillingAddress': null
+                    };
+
+                    if (response.responseType !== 'error') {
+                        customerData.set('checkout-data', clearData);
+                    }
+                }
             ).always(
                 function () {
                     fullScreenLoader.stopLoader();