Skip to content

[Backport] Fix negative subtotal when full discount applied with tax calculation #10790 #22227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 15, 2019
Merged

[Backport] Fix negative subtotal when full discount applied with tax calculation #10790 #22227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f68cff7
try to fix calculation #10790
ilnytskyi Mar 30, 2018
8501089
Check negative difference after rounding #10790
ilnytskyi Mar 30, 2018
7bbc018
Check negative totals after full discount #10790
ilnytskyi Apr 1, 2018
b30b1bb
Added integration test #10790
ilnytskyi Jun 6, 2018
a7f65ac
Array style fix #10790
ilnytskyi Jun 6, 2018
0d1a0b0
Store data in a separate file #10790
ilnytskyi Jun 6, 2018
ea79937
Array tab #10790
ilnytskyi Jun 6, 2018
ec8bbce
#10790
ilnytskyi Jun 6, 2018
17f7b77
#10790
ilnytskyi Jun 7, 2018
d5be0aa
#10790
ilnytskyi Jun 7, 2018
98a1561
#10790
ilnytskyi Jun 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions app/code/Magento/SalesRule/Model/Utility.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ public function deltaRoundingFix(
) {
$discountAmount = $discountData->getAmount();
$baseDiscountAmount = $discountData->getBaseAmount();
$rowTotalInclTax = $item->getRowTotalInclTax();
$baseRowTotalInclTax = $item->getBaseRowTotalInclTax();

//TODO Seems \Magento\Quote\Model\Quote\Item\AbstractItem::getDiscountPercent() returns float value
//that can not be used as array index
Expand All @@ -205,6 +207,23 @@ public function deltaRoundingFix(
- $this->priceCurrency->round($baseDiscountAmount);
}

/**
* When we have 100% discount check if totals will not be negative
*/

if ($percentKey == 100) {
$discountDelta = $rowTotalInclTax - $discountAmount;
$baseDiscountDelta = $baseRowTotalInclTax - $baseDiscountAmount;

if ($discountDelta < 0) {
$discountAmount += $discountDelta;
}

if ($baseDiscountDelta < 0) {
$baseDiscountAmount += $baseDiscountDelta;
}
}

$discountData->setAmount($this->priceCurrency->round($discountAmount));
$discountData->setBaseAmount($this->priceCurrency->round($baseDiscountAmount));

Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ protected function calculateWithTaxNotInPrice(QuoteDetailsItemInterface $item, $
$rowTaxBeforeDiscount = array_sum($rowTaxesBeforeDiscount);
$rowTotalInclTax = $rowTotal + $rowTaxBeforeDiscount;
$priceInclTax = $rowTotalInclTax / $quantity;

if ($round) {
$priceInclTax = $this->calculationTool->round($priceInclTax);
}
Expand Down
35 changes: 35 additions & 0 deletions dev/tests/integration/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

require_once __DIR__ . '/SetupUtil.php';
require_once __DIR__ . '/../../../../_files/tax_calculation_data_aggregated.php';
require_once __DIR__ . '/../../../../_files/full_discount_with_tax.php';

/**
* Class TaxTest
Expand Down Expand Up @@ -124,6 +125,40 @@ public function testCollect()
);
}

/**
* Test taxes collection with full discount for quote.
*
* Test tax calculation and price when the discount may be bigger than total
* This method will test the collector through $quote->collectTotals() method
*
* @see \Magento\SalesRule\Model\Utility::deltaRoundingFix
* @magentoDataFixture Magento/Tax/_files/full_discount_with_tax.php
* @magentoDbIsolation enabled
* @magentoAppIsolation enabled
*/
public function testFullDiscountWithDeltaRoundingFix()
{
global $fullDiscountIncTax;
$configData = $fullDiscountIncTax['config_data'];
$quoteData = $fullDiscountIncTax['quote_data'];
$expectedResults = $fullDiscountIncTax['expected_result'];

/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
$objectManager = Bootstrap::getObjectManager();

//Setup tax configurations
$this->setupUtil = new SetupUtil($objectManager);
$this->setupUtil->setupTax($configData);

$quote = $this->setupUtil->setupQuote($quoteData);

$quote->collectTotals();

$quoteAddress = $quote->getShippingAddress();

$this->verifyResult($quoteAddress, $expectedResults);
}

/**
* Verify fields in quote item
*
Expand Down
120 changes: 120 additions & 0 deletions dev/tests/integration/testsuite/Magento/Tax/_files/full_discount_with_tax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

use Magento\Tax\Model\Config;
use Magento\Tax\Model\Sales\Total\Quote\SetupUtil;

$fullDiscountIncTax = [
'config_data' => [
'config_overrides' => [
Config::CONFIG_XML_PATH_APPLY_AFTER_DISCOUNT => 0,
Config::CONFIG_XML_PATH_DISCOUNT_TAX => 1,
Config::XML_PATH_ALGORITHM => 'ROW_BASE_CALCULATION',
Config::CONFIG_XML_PATH_SHIPPING_TAX_CLASS => SetupUtil::SHIPPING_TAX_CLASS,
],
'tax_rate_overrides' => [
SetupUtil::TAX_RATE_TX => 18,
SetupUtil::TAX_RATE_SHIPPING => 0,
],
'tax_rule_overrides' => [
[
'code' => 'Product Tax Rule',
'product_tax_class_ids' => [
SetupUtil::PRODUCT_TAX_CLASS_1
],
],
[
'code' => 'Shipping Tax Rule',
'product_tax_class_ids' => [
SetupUtil::SHIPPING_TAX_CLASS
],
'tax_rate_ids' => [
SetupUtil::TAX_RATE_SHIPPING,
],
],
],
],
'quote_data' => [
'billing_address' => [
'region_id' => SetupUtil::REGION_TX,
],
'shipping_address' => [
'region_id' => SetupUtil::REGION_TX,
],
'items' => [
[
'sku' => 'simple1',
'price' => 2542.37,
'qty' => 2,
]
],
'shipping_method' => 'free',
'shopping_cart_rules' => [
[
'discount_amount' => 100
],
],
],
'expected_result' => [
'address_data' => [
'subtotal' => 5084.74,
'base_subtotal' => 5084.74,
'subtotal_incl_tax' => 5999.99,
'base_subtotal_incl_tax' => 5999.99,
'tax_amount' => 915.25,
'base_tax_amount' => 915.25,
'shipping_amount' => 0,
'base_shipping_amount' => 0,
'shipping_incl_tax' => 0,
'base_shipping_incl_tax' => 0,
'shipping_tax_amount' => 0,
'base_shipping_tax_amount' => 0,
'discount_amount' => -5999.99,
'base_discount_amount' => -5999.99,
'discount_tax_compensation_amount' => 0,
'base_discount_tax_compensation_amount' => 0,
'shipping_discount_tax_compensation_amount' => 0,
'base_shipping_discount_tax_compensation_amount' => 0,
'grand_total' => 0,
'base_grand_total' => 0,
'applied_taxes' => [
SetupUtil::TAX_RATE_TX => [
'percent' => 18,
'amount' => 915.25,
'base_amount' => 915.25,
'rates' => [
[
'code' => SetupUtil::TAX_RATE_TX,
'title' => SetupUtil::TAX_RATE_TX,
'percent' => 18,
],
],
]
],
],
'items_data' => [
'simple1' => [
'row_total' => 5084.74,
'base_row_total' => 5084.74,
'tax_percent' => 18,
'price' => 2542.37,
'base_price' => 2542.37,
'price_incl_tax' => 3000,
'base_price_incl_tax' => 3000,
'row_total_incl_tax' => 5999.99,
'base_row_total_incl_tax' => 5999.99,
'tax_amount' => 915.25,
'base_tax_amount' => 915.25,
'discount_amount' => 5999.99,
'base_discount_amount' => 5999.99,
'discount_percent' => 100,
'discount_tax_compensation_amount' => 0,
'base_discount_tax_compensation_amount' => 0,
],
],
]
];