Skip to content

Commit 8a98552

Browse files
Reduced line lengths to pass tests
1 parent 4f148f3 commit 8a98552

File tree

1 file changed

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

1 file changed

+7
-9
lines changed

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

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

6262
$_rulePct = $rulePercent / 100;
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);
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));
67+
$discountData->setBaseOriginalAmount(
68+
$pc->round(($qty * $baseItemOriginalPrice - $item->getBaseDiscountAmount()) * $_rulePct)
69+
);
7270

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

0 commit comments

Comments
 (0)