diff --git a/packages/Webkul/Discount/src/Helpers/Discount.php b/packages/Webkul/Discount/src/Helpers/Discount.php index b14cb15a3..e1e27ebf9 100644 --- a/packages/Webkul/Discount/src/Helpers/Discount.php +++ b/packages/Webkul/Discount/src/Helpers/Discount.php @@ -240,6 +240,7 @@ class Discount $cart = \Cart::getCart(); $report = array(); $result = 0; + //check conditions if ($rule->conditions != null) { $conditions = json_decode(json_decode($rule->conditions)); @@ -305,6 +306,48 @@ class Discount return $report; } + public function removeNonCoupon() + { + $cart = \Cart::getCart(); + + $nonCouponAbleRule = $this->cartRuleCart->findWhere([ + 'cart_id' => $cart->id + ]); + + if (count($couponAbleRule) && ! $couponAbleRule->first()->cart_rule->use_coupon) { + $result = $nonCouponAbleRule->delete(); + + if ($result) { + return true; + } else { + return false; + } + } else { + return false; + } + } + + public function removeCoupon() + { + $cart = \Cart::getCart(); + + $couponAbleRule = $this->cartRuleCart->findWhere([ + 'cart_id' => $cart->id + ]); + + if (count($couponAbleRule) && $couponAbleRule->first()->cart_rule->use_coupon) { + $result = $couponAbleRule->delete(); + + if ($result) { + return true; + } else { + return false; + } + } else { + return false; + } + } + protected function testIfAllConditionAreTrue($conditions, $cart) { $shipping_address = $cart->getShippingAddressAttribute(); diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index c005a22ee..a7a3fc6be 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -276,6 +276,14 @@ class CartController extends Controller return $nonCouponAbleRules; } + /** + * To save the discount values inside the tables of orders and cart + */ + public function saveDiscount() + { + return ['hellow']; + } + /** * To remove the currently active * couponable rule diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index c97358e3a..59f63da37 100755 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -41,6 +41,8 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function Route::post('checkout/check/coupons', 'Webkul\Shop\Http\Controllers\CartController@applyCoupon')->name('shop.checkout.check.coupons'); + Route::post('checkout/save/discounts', 'Webkul\Shop\Http\Controllers\CartController@saveDiscount')->name('shop.checkout.save.discount'); + Route::post('checkout/fetch/noncoupon', 'Webkul\Shop\Http\Controllers\CartController@getNonCouponAbleRule')->name('shop.checkout.fetch.non-coupon'); Route::post('checkout/remove/coupon', 'Webkul\Shop\Http\Controllers\CartController@removeCoupon')->name('shop.checkout.remove.coupon'); diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php index ecb29a67a..26445833f 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -58,7 +58,7 @@
{{ __('shop::app.checkout.success.order-id-info', ['order_id' => $order->id]) }}
@@ -19,7 +18,5 @@ {{ __('shop::app.checkout.cart.continue-shopping') }}