Skip to content

Commit cd18da1

Browse files
committed
Fixed Static, Integration and Unit Test Cases
1 parent 15367f7 commit cd18da1

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,17 @@ protected function _calculate($rule, $item, $qty, $rulePercent)
6060
$baseItemOriginalPrice = $this->validator->getItemBaseOriginalPrice($item);
6161

6262
$_rulePct = $rulePercent / 100;
63-
$pc = $this->priceCurrency;
64-
$discountData->setAmount($pc->round(($qty * $itemPrice - $item->getDiscountAmount()) * $_rulePct));
65-
$discountData->setBaseAmount($pc->round(($qty * $baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct));
66-
$discountData->setOriginalAmount($pc->round(($qty * $itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct));
63+
$discountData->setAmount(
64+
number_format((($qty * $itemPrice - $item->getDiscountAmount()) * $_rulePct), 2, '.', '')
65+
);
66+
$discountData->setBaseAmount(
67+
number_format((($qty * $baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct), 2, '.', '')
68+
);
69+
$discountData->setOriginalAmount(
70+
number_format((($qty * $itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct), 2, '.', '')
71+
);
6772
$discountData->setBaseOriginalAmount(
68-
$pc->round(($qty * $baseItemOriginalPrice - $item->getBaseDiscountAmount()) * $_rulePct)
73+
number_format((($qty * $baseItemOriginalPrice - $item->getBaseDiscountAmount()) * $_rulePct), 2, '.', '')
6974
);
7075

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

app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/ToPercentTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2014 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -221,8 +221,8 @@ public static function calculateDataProvider()
221221
'expectedRuleDiscountQty' => 100,
222222
'expectedDiscountData' => [
223223
'amount' => 98,
224-
'baseAmount' => 59.49999999999999,
225-
'originalAmount' => 118.99999999999999,
224+
'baseAmount' => 59.50,
225+
'originalAmount' => 119,
226226
'baseOriginalAmount' => 80.5,
227227
],
228228
]

dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ public static function discountByPercentDataProvider()
535535
],
536536
[
537537
'percentDiscount' => 50,
538-
'expectedDiscounts' => ['simple1' => 5.72, 'simple2' => 15.27, 'totalDiscount' => -20.99]
538+
'expectedDiscounts' => ['simple1' => 5.72, 'simple2' => 15.28, 'totalDiscount' => -21]
539539
],
540540
[
541541
'percentDiscount' => 100,

0 commit comments

Comments
 (0)