Skip to content

Commit f2faf15

Browse files
MAGETWO-97423: Price column in sales_order_item table shows the price including tax when Custom Price is applied on admin order
1 parent ea96d96 commit f2faf15

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ public function mapItems(
348348
$useBaseCurrency
349349
) {
350350
$items = $shippingAssignment->getItems();
351-
if (!count($items)) {
351+
if (empty($items)) {
352352
return [];
353353
}
354354

@@ -478,7 +478,7 @@ protected function prepareQuoteDetails(ShippingAssignmentInterface $shippingAssi
478478
{
479479
$items = $shippingAssignment->getItems();
480480
$address = $shippingAssignment->getShipping()->getAddress();
481-
if (!count($items)) {
481+
if (empty($items)) {
482482
return $this->quoteDetailsDataObjectFactory->create();
483483
}
484484

dev/tests/integration/testsuite/Magento/Tax/_files/tax_calculation_data_aggregated.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
declare(strict_types=1);
77

88
/**
9-
* Global array that holds test scenarios data
9+
* Global array that holds test scenarios data.
1010
*
1111
* @var array
1212
*/
1313
$taxCalculationData = [];
14-
14+
//phpcs:disable Magento2.Security.IncludeFile
1515
require_once __DIR__ . '/scenarios/excluding_tax_apply_tax_after_discount.php';
1616
require_once __DIR__ . '/scenarios/excluding_tax_apply_tax_after_discount_discount_tax.php';
1717
require_once __DIR__ . '/scenarios/excluding_tax_apply_tax_before_discount.php';

0 commit comments

Comments
 (0)