Skip to content

magento/magento2#39036: Issue with multiple percentage discounts #39683

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

Open
wants to merge 7 commits into
base: 2.4-develop
Choose a base branch
from
Open

magento/magento2#39036: Issue with multiple percentage discounts #39683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d99ae12
magento/magento2#39036: Issue with multiple percentage discounts
quterorta Feb 28, 2025
beca877
magento/magento2#39036: Issue with multiple percentage discounts
quterorta Feb 28, 2025
3e42779
Merge branch '2.4-develop' into fix-for-issue-39036
engcom-Hotel Mar 28, 2025
b9b5c07
39036:Fixed Unit & Static Test Cases
engcom-Dash Apr 2, 2025
f8051d3
Fixed Copyright issue
engcom-Dash Apr 2, 2025
bc240f1
Merge branch '2.4-develop' into fix-for-issue-39036
engcom-Hotel Apr 4, 2025
65e521a
Merge branch '2.4-develop' into fix-for-issue-39036
engcom-Dash Apr 8, 2025
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
11 changes: 8 additions & 3 deletions app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByPercent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2014 Adobe
* All Rights Reserved.
*/

namespace Magento\SalesRule\Model\Rule\Action\Discount;

class ByPercent extends AbstractDiscount
Expand Down Expand Up @@ -68,7 +69,11 @@ protected function _calculate($rule, $item, $qty, $rulePercent)
);

if (!$rule->getDiscountQty() || $rule->getDiscountQty() >= $qty) {
$discountPercent = min(100, $item->getDiscountPercent() + $rulePercent);
$previousDiscountPercent = $item->getDiscountPercent() ?: 0.0;
$totalDiscountPercent = ($rulePercent + $previousDiscountPercent) - (
($rulePercent * $previousDiscountPercent)/100
);
$discountPercent = min(100, $totalDiscountPercent);
$item->setDiscountPercent($discountPercent);
}

Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/ByPercentTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2014 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

Expand Down Expand Up @@ -218,7 +218,7 @@ public static function calculateDataProvider()
'originalPrice' => 60,
'baseOriginalPrice' => 55,
],
'expectedRuleDiscountQty' => 85,
'expectedRuleDiscountQty' => 68.5,
'expectedDiscountData' => [
'amount' => 42,
'baseAmount' => 25.5,
Expand All @@ -236,7 +236,7 @@ public static function calculateDataProvider()
'originalPrice' => 60,
'baseOriginalPrice' => 55,
],
'expectedRuleDiscountQty' => 85,
'expectedRuleDiscountQty' => 68.5,
'expectedDiscountData' => [
'amount' => 72,
'baseAmount' => 52.5,
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/ToPercentTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2014 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

Expand Down Expand Up @@ -218,7 +218,7 @@ public static function calculateDataProvider()
'originalPrice' => 60,
'baseOriginalPrice' => 55,
],
'expectedRuleDiscountQty' => 100,
'expectedRuleDiscountQty' => 86.5,
'expectedDiscountData' => [
'amount' => 98,
'baseAmount' => 59.49999999999999,
Expand Down