Merge pull request #37 from magento-commerce/develop

Merge develop into 1.0

Author: oshmyheliuk

composer.json

@@ -16,7 +16,7 @@
         "symfony/proxy-manager-bridge": "^3.3||^4.3||^5.1",
         "symfony/yaml": "^3.3||^4.0||^5.1",
         "monolog/monolog": "^1.16",
-        "magento/quality-patches": "^1.0.7"
+        "magento/quality-patches": "^1.1.0"
     },
     "require-dev": {
         "codeception/codeception": "^2.5.3",

patches.json

@@ -365,6 +365,9 @@
     },
     "Re-work consumers to terminate as soon as there is nothing left to process": {
       ">=2.2.0 <2.3.2": "MAGECLOUD-4071__terminate_consumers_if_the_queue_is_empty__2.2.0.patch"
+    },
+    "Fixes issue with PayPal Express where previously placed order price is displayed": {
+      "2.3.7-p1": "MC-42674__paypal_checkout__2.3.7-p1.patch"
     }
   }
 }

patches/MC-42674__paypal_checkout__2.3.7-p1.patch

@@ -0,0 +1,12 @@
+diff --git a/vendor/magento/module-paypal/Controller/Express/AbstractExpress/PlaceOrder.php b/vendor/magento/module-paypal/Controller/Express/AbstractExpress/PlaceOrder.php
+index 055af4162d5f3..3f4fafc110ae2 100644
+--- a/vendor/magento/module-paypal/Controller/Express/AbstractExpress/PlaceOrder.php
++++ b/vendor/magento/module-paypal/Controller/Express/AbstractExpress/PlaceOrder.php
+@@ -99,6 +99,7 @@ public function execute()
+ 
+             // prepare session to success or cancellation page
+             $this->_getCheckoutSession()->clearHelperData();
++            $this->_getSession()->unsQuoteId();
+ 
+             // "last successful quote"
+             $quoteId = $this->_getQuote()->getId();