Skip to content

Commit c0ccad0

Browse files
author
Yu Tang
committed
MAGETWO-33579: Refactor Tax module to use factories instead of builders
- Changed setTaxIncluded to setIsTaxIncluded
1 parent e5e7b5d commit c0ccad0

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,15 +204,16 @@ public function mapItem(
204204
$sequence = 'sequence-' . $this->getNextIncrement();
205205
$item->setTaxCalculationItemId($sequence);
206206
}
207-
$itemDataObject = $itemDataObjectFactory->create()
208-
->setCode($item->getTaxCalculationItemId())
207+
/** @var \Magento\Tax\Api\Data\QuoteDetailsItemInterface $itemDataObject */
208+
$itemDataObject = $itemDataObjectFactory->create();
209+
$itemDataObject->setCode($item->getTaxCalculationItemId())
209210
->setQuantity($item->getQty())
210211
->setTaxClassKey(
211212
$this->taxClassKeyDataObjectFactory->create()
212213
->setType(TaxClassKeyInterface::TYPE_ID)
213214
->setValue($item->getProduct()->getTaxClassId())
214215
)
215-
->setTaxIncluded($priceIncludesTax)
216+
->setIsTaxIncluded($priceIncludesTax)
216217
->setType(self::ITEM_TYPE_PRODUCT);
217218

218219
if ($useBaseCurrency) {
@@ -264,6 +265,7 @@ public function mapItemExtraTaxables(
264265
} else {
265266
$unitPrice = $extraTaxable[self::KEY_ASSOCIATED_TAXABLE_UNIT_PRICE];
266267
}
268+
/** @var \Magento\Tax\Api\Data\QuoteDetailsItemInterface $itemDataObject */
267269
$itemDataObject = $itemDataObjectFactory->create();
268270
$itemDataObject->setCode($extraTaxable[self::KEY_ASSOCIATED_TAXABLE_CODE])
269271
->setType($extraTaxable[self::KEY_ASSOCIATED_TAXABLE_TYPE])
@@ -274,7 +276,7 @@ public function mapItemExtraTaxables(
274276
->setValue($extraTaxable[self::KEY_ASSOCIATED_TAXABLE_TAX_CLASS_ID])
275277
)
276278
->setUnitPrice($unitPrice)
277-
->setTaxIncluded($extraTaxableIncludesTax)
279+
->setIsTaxIncluded($extraTaxableIncludesTax)
278280
->setAssociatedItemCode($item->getTaxCalculationItemId());
279281
$itemDataObjects[] = $itemDataObject;
280282
}
@@ -372,6 +374,7 @@ public function getShippingDataObject(QuoteAddress $address, $useBaseCurrency)
372374
$address->setBaseShippingTaxCalculationAmount($address->getBaseShippingAmount());
373375
}
374376
if ($address->getShippingTaxCalculationAmount() !== null) {
377+
/** @var \Magento\Tax\Api\Data\QuoteDetailsItemInterface $itemDataObject */
375378
$itemDataObject = $this->quoteDetailsItemDataObjectFactory->create()
376379
->setType(self::ITEM_TYPE_SHIPPING)
377380
->setCode(self::ITEM_CODE_SHIPPING)
@@ -393,7 +396,9 @@ public function getShippingDataObject(QuoteAddress $address, $useBaseCurrency)
393396
->setType(TaxClassKeyInterface::TYPE_ID)
394397
->setValue($this->_config->getShippingTaxClass($address->getQuote()->getStore()))
395398
);
396-
$itemDataObject->setTaxIncluded($this->_config->shippingPriceIncludesTax($address->getQuote()->getStore()));
399+
$itemDataObject->setIsTaxIncluded(
400+
$this->_config->shippingPriceIncludesTax($address->getQuote()->getStore())
401+
);
397402
return $itemDataObject;
398403
}
399404

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public function mapQuoteExtraTaxables(
218218
->setValue($extraTaxable[self::KEY_ASSOCIATED_TAXABLE_TAX_CLASS_ID])
219219
)
220220
->setUnitPrice($unitPrice)
221-
->setTaxIncluded($extraTaxable[self::KEY_ASSOCIATED_TAXABLE_PRICE_INCLUDES_TAX])
221+
->setIsTaxIncluded($extraTaxable[self::KEY_ASSOCIATED_TAXABLE_PRICE_INCLUDES_TAX])
222222
->setAssociatedItemCode($extraTaxable[self::KEY_ASSOCIATED_TAXABLE_ASSOCIATION_ITEM_CODE]);
223223
}
224224

0 commit comments

Comments
 (0)