Merge pull request #9 from saphaljha/2.2-develop-PR-port-19788

[Backport] [Forwardport] Fixed - Shipping issue on PayPal Express magento#14712
saphaljha · Dec 22, 2018 · 450a11c · 450a11c
2 parents 2bf3b78 + 1c88345
commit 450a11c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
@@ -9,6 +9,9 @@
 use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Model\Quote\Address\FreeShippingInterface;
 
+/**
+ * Collect totals for shipping.
+ */
 class Shipping extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
 {
     /**
@@ -111,7 +114,7 @@ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Qu
     {
         $amount = $total->getShippingAmount();
         $shippingDescription = $total->getShippingDescription();
-        $title = ($amount != 0 && $shippingDescription)
+        $title = ($shippingDescription)
             ? __('Shipping & Handling (%1)', $shippingDescription)
             : __('Shipping & Handling');
 
@@ -227,7 +230,7 @@ private function getAssignmentWeightData(AddressInterface $address, array $items
      * @param bool $addressFreeShipping
      * @param float $itemWeight
      * @param float $itemQty
-     * @param $freeShipping
+     * @param bool $freeShipping
      * @return float
      */
     private function getItemRowWeight(