Merge pull request #554 from magento-folks/MAGETWO-40559

[Merchant Beta] MAGETWO-42103: Minicart does not clear after completing an order via …
magento · Aug 31, 2015 · d0dd2b9 · d0dd2b9
2 parents d471820 + a9713c8
commit d0dd2b9
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/app/code/Magento/Braintree/etc/frontend/sections.xml b/app/code/Magento/Braintree/etc/frontend/sections.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../Customer/etc/sections.xsd">
+    <action name="braintree/paypal/placeOrder">
+        <section name="cart"/>
+    </action>
+</config>
diff --git a/app/code/Magento/Paypal/etc/frontend/sections.xml b/app/code/Magento/Paypal/etc/frontend/sections.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../Customer/etc/sections.xsd">
+    <action name="paypal/express/placeOrder">
+        <section name="cart"/>
+    </action>
+</config>
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/action/set-payment-method.js b/app/code/Magento/Paypal/view/frontend/web/js/action/set-payment-method.js
@@ -9,9 +9,10 @@ define(
         'Magento_Checkout/js/model/url-builder',
         'mage/storage',
         'Magento_Checkout/js/model/error-processor',
-        'Magento_Customer/js/model/customer'
+        'Magento_Customer/js/model/customer',
+        'Magento_Customer/js/customer-data'
     ],
-    function ($, quote, urlBuilder, storage, errorProcessor, customer) {
+    function ($, quote, urlBuilder, storage, errorProcessor, customer, customerData) {
         'use strict';
 
         return function () {
@@ -41,6 +42,7 @@ define(
                 serviceUrl, JSON.stringify(payload)
             ).done(
                 function () {
+                    customerData.invalidate(['cart']);
                     $.mage.redirect(window.checkoutConfig.payment.paypalExpress.redirectUrl[quote.paymentMethod().method]);
                 }
             ).fail(