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

Merge pull request #1374 from prashant-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2019-08-31 18:02:26 +05:30 committed by GitHub
parent c131b47d6a d31d9d9916
commit 6158e8cd16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,7 @@ class FixedAmount extends Action
}
}
} else {
$discount = round(($itemPrice - $rule->disc_amount), 4);
$discount = $rule->disc_amount;
}
if ($itemProductId == $productID) {
@ -91,7 +91,7 @@ class FixedAmount extends Action
}
}
} else {
$discount = round(($itemPrice - $rule->disc_amount), 4);
$discount = $rule->disc_amount;
}
$totalDiscount = $totalDiscount + $discount;

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

@ -668,7 +668,7 @@ abstract class Discount
if (! $result) {
$this->clearDiscount();
$alreadyAppliedRule->delete();
$alreadyAppliedRule->first()->delete();
} else {
$this->reassess($alreadyAppliedCartRule);
}