merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More refactoring of discount assign to cart item

This commit is contained in:
Prashant Singh 2019-09-06 12:37:46 +05:30
parent 9c23179d6e
commit 5e47c5b2af
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/Webkul/Discount/src/Actions/Cart/FixedAmount.php
View File

@ -51,12 +51,6 @@ class FixedAmount extends Action
$discQuantity = $itemQuantity <= $discQuantity ? $itemQuantity : $discQuantity;
if ($rule->disc_amount >= $itemPrice) {
$discount = round($itemPrice * $discQuantity, 4);
} else {
$discount = $rule->disc_amount;
}
$totalDiscount = $totalDiscount + $discount;
$report = array();
@ -64,11 +58,11 @@ class FixedAmount extends Action
$report['item_id'] = $item->id;
$report['product_id'] = $item->child ? $item->child->product_id : $item->product_id;
if ($discount <= $itemPrice) {
$report['discount'] = $discount;
} else {
$report['discount'] = $itemPrice;
}
$discount = round($itemPrice * $discQuantity, 4);
$discount = $discount <= $itemPrice ? $discount : $itemPrice;
$report['discount'] = $discount;
$report['formatted_discount'] = core()->currency($discount);

4
packages/Webkul/Discount/src/Actions/Cart/PercentOfProduct.php
View File

@ -58,13 +58,13 @@ class PercentOfProduct extends Action
$discQuantity = $itemQuantity <= $discQuantity ? $itemQuantity : $discQuantity;
$discount = round(($itemPrice * $rule->disc_amount) / 100, 4);
$report = array();
$report['item_id'] = $item->id;
$report['product_id'] = $item->child ? $item->child->product_id : $item->product_id;
$discount = round(($itemPrice * $rule->disc_amount) / 100, 4);
$discount = $discount <= $itemPrice ? $discount : $itemPrice;
$report['discount'] = $discount;