Skip to content

magento/magento2#38455: Fixed #39687

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 8 commits into
base: 2.4-develop
Choose a base branch
from
+7 −6
Open

magento/magento2#38455: Fixed #39687

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4052b53
magento/magento2#38455: Fixed
YuriyYavorskiy Feb 28, 2025
dc09d5d
Merge branch '2.4-develop' into fix-for-issue-38455
engcom-Hotel Apr 11, 2025
50df27f
Merge branch '2.4-develop' into fix-for-issue-38455
YuriyYavorskiy Apr 16, 2025
4b313cd
Merge branch '2.4-develop' into fix-for-issue-38455
engcom-Hotel Apr 17, 2025
ae26c34
Merge branch '2.4-develop' into fix-for-issue-38455
engcom-Hotel Apr 23, 2025
4f148f3
Reduced line lengths to pass tests
YuriyYavorskiy Apr 24, 2025
8a98552
Reduced line lengths to pass tests
YuriyYavorskiy Apr 24, 2025
a90bbfc
Merge remote-tracking branch 'origin/fix-for-issue-38455' into fix-fo…
YuriyYavorskiy Apr 24, 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
13 changes: 7 additions & 6 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,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2015 Adobe
* All Rights Reserved.
*/
namespace Magento\SalesRule\Model\Rule\Action\Discount;

Expand Down Expand Up @@ -60,11 +60,12 @@ protected function _calculate($rule, $item, $qty, $rulePercent)
$baseItemOriginalPrice = $this->validator->getItemBaseOriginalPrice($item);

$_rulePct = $rulePercent / 100;
$discountData->setAmount(($qty * $itemPrice - $item->getDiscountAmount()) * $_rulePct);
$discountData->setBaseAmount(($qty * $baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct);
$discountData->setOriginalAmount(($qty * $itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct);
$pc = $this->priceCurrency;
$discountData->setAmount($pc->round(($qty * $itemPrice - $item->getDiscountAmount()) * $_rulePct));
$discountData->setBaseAmount($pc->round(($qty * $baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct));
$discountData->setOriginalAmount($pc->round(($qty * $itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct));
$discountData->setBaseOriginalAmount(
($qty * $baseItemOriginalPrice - $item->getBaseDiscountAmount()) * $_rulePct
$pc->round(($qty * $baseItemOriginalPrice - $item->getBaseDiscountAmount()) * $_rulePct)
);

if (!$rule->getDiscountQty() || $rule->getDiscountQty() >= $qty) {
Expand Down