Skip to content

Commit d3b9ddd

Browse files
ENGCOM-3997: Fixed - Shipping issue on PayPal Express #14712 #19655
- Merge Pull Request #19655 from ssp58bleuciel/magento2:fixed-issue-14712 - Merged commits: 1. 8a059e6 2. 8bdcca9 3. c3d5010
2 parents d8ec98c + c3d5010 commit d3b9ddd

File tree

1 file changed

+5
-2
lines changed
  • app/code/Magento/Quote/Model/Quote/Address/Total

1 file changed

+5
-2
lines changed

app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
use Magento\Quote\Api\Data\AddressInterface;
1010
use Magento\Quote\Model\Quote\Address\FreeShippingInterface;
1111

12+
/**
13+
* Collect totals for shipping.
14+
*/
1215
class Shipping extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
1316
{
1417
/**
@@ -111,7 +114,7 @@ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Qu
111114
{
112115
$amount = $total->getShippingAmount();
113116
$shippingDescription = $total->getShippingDescription();
114-
$title = ($amount != 0 && $shippingDescription)
117+
$title = ($shippingDescription)
115118
? __('Shipping & Handling (%1)', $shippingDescription)
116119
: __('Shipping & Handling');
117120

@@ -227,7 +230,7 @@ private function getAssignmentWeightData(AddressInterface $address, array $items
227230
* @param bool $addressFreeShipping
228231
* @param float $itemWeight
229232
* @param float $itemQty
230-
* @param $freeShipping
233+
* @param bool $freeShipping
231234
* @return float
232235
*/
233236
private function getItemRowWeight(

0 commit comments

Comments
 (0)