|
1 | 1 | <?php |
2 | 2 | /** |
3 | | - * Copyright 2015 Adobe |
| 3 | + * Copyright 2014 Adobe |
4 | 4 | * All Rights Reserved. |
5 | 5 | */ |
6 | 6 | namespace Magento\SalesRule\Model\Rule\Action\Discount; |
@@ -60,18 +60,16 @@ protected function _calculate($rule, $item, $qty, $rulePercent) |
60 | 60 | $baseItemOriginalPrice = $this->validator->getItemBaseOriginalPrice($item); |
61 | 61 |
|
62 | 62 | $_rulePct = $rulePercent / 100; |
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 | | - ); |
72 | | - $discountData->setBaseOriginalAmount( |
73 | | - number_format((($qty * $baseItemOriginalPrice - $item->getBaseDiscountAmount()) * $_rulePct), 2, '.', '') |
74 | | - ); |
| 63 | + |
| 64 | + $amount = ($qty * $itemPrice - $item->getDiscountAmount()) * $_rulePct; |
| 65 | + $baseAmount = ($qty * $baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct; |
| 66 | + $originalAmount = ($qty * $itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct; |
| 67 | + $baseOriginalAmount = ($qty * $baseItemOriginalPrice - $item->getBaseDiscountAmount()) * $_rulePct; |
| 68 | + |
| 69 | + $discountData->setAmount(round(floatval((string) $amount), 2)); |
| 70 | + $discountData->setBaseAmount(round(floatval((string) $baseAmount), 2)); |
| 71 | + $discountData->setOriginalAmount(round(floatval((string) $originalAmount), 2)); |
| 72 | + $discountData->setBaseOriginalAmount(round(floatval((string) $baseOriginalAmount), 2)); |
75 | 73 |
|
76 | 74 | if (!$rule->getDiscountQty() || $rule->getDiscountQty() >= $qty) { |
77 | 75 | $discountPercent = min(100, $item->getDiscountPercent() + $rulePercent); |
|
0 commit comments