Merge branch 'dev'

Model/Api.php

@@ -271,6 +271,13 @@ public function getPayment($paymentId)
      */
     public function createPayment($webProfile, $quote, $taxFailure = false)
     {
+        /**
+         * Skip if grand total is zero
+         */
+        if ($quote->getBaseGrandTotal() == "0.0000") {
+            return false;
+        }
+
         $payer = $this->buildPayer($quote);
 
         $itemList = $this->buildItemList($quote, $taxFailure);
@@ -746,7 +753,9 @@ protected function buildItemList($quote, $taxFailure)
     protected function buildAmount($quote)
     {
         $details = new Details();
-        $details->setShipping($quote->getShippingAddress()->getBaseShippingAmount())
+        $shippingCost = $quote->getShippingAddress()->getFreeShipping() ? 0 : $quote->getShippingAddress()->getBaseShippingAmount();
+
+        $details->setShipping($shippingCost)
             ->setTax(
                 $quote->getShippingAddress()->getBaseTaxAmount()
                 + $quote->getShippingAddress()->getBaseHiddenTaxAmount()

RELEASE_NOTES.txt

@@ -1,3 +1,12 @@
+==== 1.1.7 ====
+Fixed minicart not empty after order success
+Fixed shipping calculation with free shipping
+Skip payment creation call if total is zero
+Removed unused file sections.xml
+
+==== 1.1.6 ====
+Hide PayPal Express in checkout if PPP is active
+
 ==== 1.1.5 ====
 US address validation error handling.
 

composer.json

@@ -19,7 +19,7 @@
     }
   ],
   "type": "magento2-module",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "license": [
     "OSL-3.0"
   ],

marketplace.json

@@ -18,7 +18,7 @@
     }
   ],
   "type": "magento2-module",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "license": [
     "OSL-3.0"
   ],

view/frontend/templates/paypalplus/success.phtml

@@ -82,3 +82,15 @@
 <?php elseif ($block->isPPP()): ?>
     <div class="ppp-success"><?php /* @noEscape */ echo __('<i>processed by PayPal</i>');?></div>
 <?php endif; ?>
+<?php if ($block->isPPP()): ?>
+    <script>
+        require([
+            'Magento_Customer/js/customer-data',
+            'jquery'
+        ], function (customerData, $) {
+            $(function(){
+                customerData.invalidate(['cart', 'customer', 'last-ordered-items']);
+            });
+        });
+    </script>
+<?php endif; ?>

view/frontend/web/js/view/payment/method-renderer/payment.js

@@ -110,6 +110,9 @@ define(
                         language: self.language,
                         preselection: "paypal",
                         thirdPartyPaymentMethods: self.getThirdPartyPaymentMethods(),
+                        onLoad: function() {
+                            self.lastCall = 'enableContinue';
+                        },
                         onThirdPartyPaymentMethodSelected: function (data) {
                             self.lastCall = 'onThirdPartyPaymentMethodSelected';
                             self.selectedMethod = self.paymentCodeMappings[data.thirdPartyPaymentMethod];