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

Fixed bug #1003

This commit is contained in:
Prashant Singh 2019-06-11 12:26:54 +05:30
parent 64c249983d
commit a7592b233d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ namespace Webkul\Discount\Helpers;
use Webkul\Discount\Repositories\CartRuleRepository as CartRule;
use Webkul\Discount\Repositories\CartRuleCartRepository as CartRuleCart;
use Carbon\Carbon;
use Arr;
class Discount
{
@ -113,9 +113,9 @@ class Discount
}
if ($canBeApplied->count()) {
$this->save($canBeApplied[0]['rule']);
$this->save(array_first($canBeApplied)['rule']);
return $canBeApplied[0];
return array_first($canBeApplied);
} else {
return false;
}
@ -214,12 +214,12 @@ class Discount
}
}
} else {
if ($canBeApplied[0]['rule']->use_coupon) {
if (array_first($canBeApplied)['rule']->use_coupon) {
$useCouponable = true;
}
}
} else if (count($canBeApplied)) {
if ($canBeApplied[0]['rule']->use_coupon) {
if (array_first($canBeApplied)['rule']->use_coupon) {
$useCouponable = true;
}
}

2
packages/Webkul/Discount/src/Http/Controllers/CartRuleController.php
View File

@ -368,7 +368,7 @@ class CartRuleController extends Controller
if (isset($coupons)) {
$coupons['cart_rule_id'] = $ruleUpdated->id;
$coupons['usage_per_customer'] = $data['per_customer']; //0 is for unlimited usage
// $coupons['usage_per_customer'] = $data['per_customer']; //0 is for unlimited usage
$couponUpdated = $ruleUpdated->coupons->update($coupons);
}