Skip to content

Commit e7e2426

Browse files
author
Olexandr Lysenko
committed
MAGETWO-25084: [GITHUB] About ByPercent.php under different currencies #581
1 parent 6e6e2af commit e7e2426

File tree

2 files changed

+4
-2
lines changed
  • app/code/Magento/SalesRule/Model/Rule/Action/Discount
  • dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount

2 files changed

+4
-2
lines changed

app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByPercent.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ protected function _calculate($rule, $item, $qty, $rulePercent)
5757
$discountData->setAmount(($qty * $itemPrice - $item->getDiscountAmount()) * $_rulePct);
5858
$discountData->setBaseAmount(($qty * $baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct);
5959
$discountData->setOriginalAmount(($qty * $itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct);
60-
$discountData->setBaseOriginalAmount(($qty * $baseItemOriginalPrice - $item->getDiscountAmount()) * $_rulePct);
60+
$discountData->setBaseOriginalAmount(
61+
($qty * $baseItemOriginalPrice - $item->getBaseDiscountAmount()) * $_rulePct
62+
);
6163

6264
if (!$rule->getDiscountQty() || $rule->getDiscountQty() > $qty) {
6365
$discountPercent = min(100, $item->getDiscountPercent() + $rulePercent);

dev/tests/unit/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/ByPercentTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public function calculateDataProvider()
209209
'amount' => 42,
210210
'baseAmount' => 25.5,
211211
'originalAmount' => 51,
212-
'baseOriginalAmount' => 46.5,
212+
'baseOriginalAmount' => 34.5,
213213
],
214214
]
215215
];

0 commit comments

Comments
 (0)