@@ -204,15 +204,16 @@ public function mapItem(
204
204
$ sequence = 'sequence- ' . $ this ->getNextIncrement ();
205
205
$ item ->setTaxCalculationItemId ($ sequence );
206
206
}
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 ())
209
210
->setQuantity ($ item ->getQty ())
210
211
->setTaxClassKey (
211
212
$ this ->taxClassKeyDataObjectFactory ->create ()
212
213
->setType (TaxClassKeyInterface::TYPE_ID )
213
214
->setValue ($ item ->getProduct ()->getTaxClassId ())
214
215
)
215
- ->setTaxIncluded ($ priceIncludesTax )
216
+ ->setIsTaxIncluded ($ priceIncludesTax )
216
217
->setType (self ::ITEM_TYPE_PRODUCT );
217
218
218
219
if ($ useBaseCurrency ) {
@@ -264,6 +265,7 @@ public function mapItemExtraTaxables(
264
265
} else {
265
266
$ unitPrice = $ extraTaxable [self ::KEY_ASSOCIATED_TAXABLE_UNIT_PRICE ];
266
267
}
268
+ /** @var \Magento\Tax\Api\Data\QuoteDetailsItemInterface $itemDataObject */
267
269
$ itemDataObject = $ itemDataObjectFactory ->create ();
268
270
$ itemDataObject ->setCode ($ extraTaxable [self ::KEY_ASSOCIATED_TAXABLE_CODE ])
269
271
->setType ($ extraTaxable [self ::KEY_ASSOCIATED_TAXABLE_TYPE ])
@@ -274,7 +276,7 @@ public function mapItemExtraTaxables(
274
276
->setValue ($ extraTaxable [self ::KEY_ASSOCIATED_TAXABLE_TAX_CLASS_ID ])
275
277
)
276
278
->setUnitPrice ($ unitPrice )
277
- ->setTaxIncluded ($ extraTaxableIncludesTax )
279
+ ->setIsTaxIncluded ($ extraTaxableIncludesTax )
278
280
->setAssociatedItemCode ($ item ->getTaxCalculationItemId ());
279
281
$ itemDataObjects [] = $ itemDataObject ;
280
282
}
@@ -372,6 +374,7 @@ public function getShippingDataObject(QuoteAddress $address, $useBaseCurrency)
372
374
$ address ->setBaseShippingTaxCalculationAmount ($ address ->getBaseShippingAmount ());
373
375
}
374
376
if ($ address ->getShippingTaxCalculationAmount () !== null ) {
377
+ /** @var \Magento\Tax\Api\Data\QuoteDetailsItemInterface $itemDataObject */
375
378
$ itemDataObject = $ this ->quoteDetailsItemDataObjectFactory ->create ()
376
379
->setType (self ::ITEM_TYPE_SHIPPING )
377
380
->setCode (self ::ITEM_CODE_SHIPPING )
@@ -393,7 +396,9 @@ public function getShippingDataObject(QuoteAddress $address, $useBaseCurrency)
393
396
->setType (TaxClassKeyInterface::TYPE_ID )
394
397
->setValue ($ this ->_config ->getShippingTaxClass ($ address ->getQuote ()->getStore ()))
395
398
);
396
- $ itemDataObject ->setTaxIncluded ($ this ->_config ->shippingPriceIncludesTax ($ address ->getQuote ()->getStore ()));
399
+ $ itemDataObject ->setIsTaxIncluded (
400
+ $ this ->_config ->shippingPriceIncludesTax ($ address ->getQuote ()->getStore ())
401
+ );
397
402
return $ itemDataObject ;
398
403
}
399
404
0 commit comments