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

Merge pull request #1133 from prashant-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2019-06-28 14:50:48 +05:30 committed by GitHub
parent 338fd38fdd 5174c02bb0
commit f9f1f9d82e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Webkul/Discount/src/Helpers/Discount.php
View File

@ -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;

2
packages/Webkul/Discount/src/Helpers/NonCouponAbleRule.php
View File

@ -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();