From 36bebaecab4f991dedd4c0546a78e43edccfd342 Mon Sep 17 00:00:00 2001
From: Anton Evers <anton.evers@kega.nl>
Date: Tue, 26 Jul 2016 10:31:27 +0200
Subject: [PATCH] Fix minicart not cleared after order completion

Fixes #4460 Fixes #4416 Fixes #1461 Fixes #4969 Fixes MAGETWO-52593

(cherry picked from commit 9093ce9c2f5a4ba8c60ef0dd0769e620b4ce6f18)
---
 app/code/Magento/Checkout/Model/Session.php              | 2 ++
 .../Checkout/view/frontend/templates/success.phtml       | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/app/code/Magento/Checkout/Model/Session.php b/app/code/Magento/Checkout/Model/Session.php
index 573c8ac149845..c42f5a906d2cb 100644
--- a/app/code/Magento/Checkout/Model/Session.php
+++ b/app/code/Magento/Checkout/Model/Session.php
@@ -416,6 +416,8 @@ public function clearQuote()
         $this->_quote = null;
         $this->setQuoteId(null);
         $this->setLastSuccessQuoteId(null);
+        $this->setLoadInactive(false);
+        $this->replaceQuote($this->getQuote()->save());
         return $this;
     }
 
diff --git a/app/code/Magento/Checkout/view/frontend/templates/success.phtml b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
index 5ef7e992c4e9c..9229538e9c8e7 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/success.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
@@ -25,4 +25,13 @@
             <a class="action primary continue" href="<?php /* @escapeNotVerified */ echo $block->getUrl() ?>"><span><?php /* @escapeNotVerified */ echo __('Continue Shopping') ?></span></a>
         </div>
     </div>
+    <script>
+        require([
+            'Magento_Customer/js/customer-data'
+        ], function (customerData) {
+            var sections = ['cart'];
+            customerData.invalidate(sections);
+            customerData.reload(sections, true);
+        });
+    </script>
 </div>