Skip to content

Commit bd14944

Browse files
committed
BUG#AC-2583: Wrong parameter are passed to setFreeShipping method-issue fixed
1 parent 44f6a52 commit bd14944

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function collect(
7373
$address->setFreeMethodWeight($data['freeMethodWeight']);
7474

7575
$isFreeShipping = $this->freeShipping->isFreeShipping($quote, $shippingAssignment->getItems());
76-
$address->setFreeShipping($isFreeShipping);
76+
$address->setFreeShipping((int)$isFreeShipping);
7777
// recalculate weights
7878
$data = $this->getAssignmentWeightData($address, $shippingAssignment->getItems());
7979
$address->setItemQty($data['addressQty']);

app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/ShippingTest.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,16 @@ public function testCollect(): void
209209
$this->shippingAssignment->expects($this->atLeastOnce())
210210
->method('getItems')
211211
->willReturn([$this->cartItem]);
212-
$this->freeShipping->method('isFreeShipping')
212+
$isFreeShipping = true;
213+
$this->freeShipping
214+
->expects($this->once())
215+
->method('isFreeShipping')
213216
->with($this->quote, [$this->cartItem])
214-
->willReturn(true);
215-
$this->address->method('setFreeShipping')
216-
->with(true);
217+
->willReturn($isFreeShipping);
218+
$this->address
219+
->expects($this->once())
220+
->method('setFreeShipping')
221+
->with((int)$isFreeShipping);
217222
$this->total->expects($this->atLeastOnce())
218223
->method('setTotalAmount');
219224
$this->total->expects($this->atLeastOnce())

0 commit comments

Comments
 (0)