From bed01ea9c9f4eeb699b44f83e5eb4861a368ca6d Mon Sep 17 00:00:00 2001 From: rahulshukla-home Date: Tue, 11 Aug 2020 18:22:14 +0530 Subject: [PATCH] Issue #3638 fixed --- .../Webkul/CartRule/src/Helpers/CartRule.php | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/packages/Webkul/CartRule/src/Helpers/CartRule.php b/packages/Webkul/CartRule/src/Helpers/CartRule.php index 4901e2dbc..8d45ad8e9 100644 --- a/packages/Webkul/CartRule/src/Helpers/CartRule.php +++ b/packages/Webkul/CartRule/src/Helpers/CartRule.php @@ -275,19 +275,23 @@ class CartRule break; case 'cart_fixed': - if ($this->itemTotals[$rule->id]['total_items'] <= 1) { - $discountAmount = core()->convertPrice($rule->discount_amount); + // if ($this->itemTotals[$rule->id]['total_items'] <= 1) { + // $discountAmount = core()->convertPrice($rule->discount_amount); - $baseDiscountAmount = min($item->base_price * $quantity, $rule->discount_amount); - } else { - $discountRate = $item->base_price * $quantity / $this->itemTotals[$rule->id]['base_total_price']; + // $baseDiscountAmount = min($item->base_price * $quantity, $rule->discount_amount); + // } else { + // $discountRate = $item->base_price * $quantity / $this->itemTotals[$rule->id]['base_total_price']; - $maxDiscount = $rule->discount_amount * $discountRate; + // $maxDiscount = $rule->discount_amount * $discountRate; - $discountAmount = core()->convertPrice($maxDiscount); + // $discountAmount = core()->convertPrice($maxDiscount); - $baseDiscountAmount = min($item->base_price * $quantity, $maxDiscount); - } + // $baseDiscountAmount = min($item->base_price * $quantity, $maxDiscount); + // } + + $discountAmount = core()->convertPrice($rule->discount_amount); + + $baseDiscountAmount = min($item->base_price * $quantity, $rule->discount_amount); $discountAmount = min($item->price * $quantity, $discountAmount);