From 11ee4c7072acae4ae8a93e6ac666a42a8643c05d Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 24 May 2019 03:48:59 +0300 Subject: [PATCH 1/2] Fix basket line reward apply --- src/Core/Baskets/Factories/BasketLineFactory.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/Core/Baskets/Factories/BasketLineFactory.php b/src/Core/Baskets/Factories/BasketLineFactory.php index b3cc70073..fbd33af42 100644 --- a/src/Core/Baskets/Factories/BasketLineFactory.php +++ b/src/Core/Baskets/Factories/BasketLineFactory.php @@ -109,9 +109,16 @@ public function get() foreach ($this->discounts->get() as $discount) { foreach ($discount->rewards as $reward) { - $method = 'apply'.ucfirst($reward->type); - if (method_exists($this, $method)) { - $line = $this->{$method}($line, $reward); + switch ($reward['type']) { + case 'percentage_amount': + $line = $this->applyPercentage($line, $reward); + break; + case 'fixed_amount': + $line = $this->applyFixedAmount($line, $reward); + break; + case 'to_fixed_price': + $line = $this->applyToFixedAmount($line, $reward); + break; } } } From 4771ba0d0a1d3307b5cae090ef55dbfc44b80124 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 24 May 2019 03:51:10 +0300 Subject: [PATCH 2/2] Fix discount uses increment --- src/Http/Controllers/Baskets/BasketController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Http/Controllers/Baskets/BasketController.php b/src/Http/Controllers/Baskets/BasketController.php index 27e87b7c9..42fb540c5 100644 --- a/src/Http/Controllers/Baskets/BasketController.php +++ b/src/Http/Controllers/Baskets/BasketController.php @@ -79,7 +79,7 @@ public function addDiscount($basketId, AddDiscountRequest $request, DiscountServ $factory = $this->factory->init($basket); $factory->lines->discount($discount->set->discount); - $discount->uses ? $discount->increment('uses') : 1; + $discount->set->discount->increment('uses'); if (! $basket->discount($request->coupon)) { $basket->discounts()->attach($discount->set->discount->id, ['coupon' => $request->coupon]);