Skip to content

Commit 4f148f3

Browse files
Reduced line lengths to pass tests
1 parent 4052b53 commit 4f148f3

File tree

1 file changed

+9
-6
lines changed
  • app/code/Magento/SalesRule/Model/Rule/Action/Discount

1 file changed

+9
-6
lines changed

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

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

6262
$_rulePct = $rulePercent / 100;
63-
$discountData->setAmount($this->priceCurrency->round(($qty * $itemPrice - $item->getDiscountAmount()) * $_rulePct));
64-
$discountData->setBaseAmount($this->priceCurrency->round(($qty * $baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct));
65-
$discountData->setOriginalAmount($this->priceCurrency->round(($qty * $itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct));
66-
$discountData->setBaseOriginalAmount(
67-
$this->priceCurrency->round(($qty * $baseItemOriginalPrice - $item->getBaseDiscountAmount()) * $_rulePct)
68-
);
63+
$amountRound = $this->priceCurrency->round(($qty * $itemPrice - $item->getDiscountAmount()) * $_rulePct);
64+
$baseAmountRound = $this->priceCurrency->round(($qty * $baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct);
65+
$originalAmountRound = $this->priceCurrency->round(($qty * $itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct);
66+
$baseOriginalAmountRound = $this->priceCurrency->round(($qty * $baseItemOriginalPrice - $item->getBaseDiscountAmount()) * $_rulePct);
67+
68+
$discountData->setAmount($amountRound);
69+
$discountData->setBaseAmount($baseAmountRound);
70+
$discountData->setOriginalAmount($originalAmountRound);
71+
$discountData->setBaseOriginalAmount($baseOriginalAmountRound);
6972

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

0 commit comments

Comments
 (0)