Skip to content

Commit e151e0f

Browse files
committed
MAGETWO-54640: Free Shipping Method not Shown during Backend Order Creation
1 parent d50b470 commit e151e0f

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,7 @@ protected function processProductItems(
535535
$total->setSubtotalInclTax($subtotalInclTax);
536536
$total->setBaseSubtotalTotalInclTax($baseSubtotalInclTax);
537537
$total->setBaseSubtotalInclTax($baseSubtotalInclTax);
538+
$shippingAssignment->getShipping()->getAddress()->setBaseSubtotalTotalInclTax($baseSubtotalInclTax);;
538539

539540
return $this;
540541
}

dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/SubtotalTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ public function testCollectUnitBased($expected)
125125

126126
$this->assertEquals($expected['subtotal'], $total->getSubtotal());
127127
$this->assertEquals($expected['subtotal'] + $expected['tax_amount'], $total->getSubtotalInclTax());
128+
$this->assertEquals($expected['subtotal'] + $expected['tax_amount'], $address->getBaseSubtotalTotalInclTax());
128129
$this->assertEquals($expected['discount_amount'], $total->getDiscountAmount());
129130
$items = $address->getAllItems();
130131
/** @var \Magento\Quote\Model\Quote\Address\Item $item */

0 commit comments

Comments
 (0)