diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index d344df504..84f7d2601 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -561,13 +561,13 @@ abstract class Discount break; } } else if ($test_condition == '{}') { - if (! str_contains($actual_value, $test_value)) { + if (str_contains($actual_value, $test_value)) { $result = false; break; } } else if ($test_condition == '!{}') { - if (str_contains($actual_value, $test_value)) { + if (! str_contains($actual_value, $test_value)) { $result = false; break; @@ -689,7 +689,7 @@ abstract class Discount break; } } else if ($test_condition == '!{}') { - if (str_contains($actual_value, $test_value)) { + if (! str_contains($actual_value, $test_value)) { $result = true; break; diff --git a/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php b/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php index 8144f9046..831ae2902 100644 --- a/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php +++ b/packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php @@ -37,7 +37,7 @@ class NonCouponAbleRule extends Discount // if the validation fails then the cart rule gets deleted from cart rule cart $alreadyAppliedCartRuleCart->first()->delete(); - $this->resetShipping(); + $this->resetShipping($cart); // all discount is cleared fro mthe cart and cart items table $this->clearDiscount();