diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index 98087c8be..bd147d87f 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -1092,59 +1092,6 @@ class Cart { return $finalData; } - /** - * Save discount data for cart - */ - public function saveDiscount() - { - $rule = $impact['rule']; - - $cart = $this->getCart(); - - //update the cart items - foreach($cart->items as $item) { - if ($rule->use_coupon) { - if ($rule->action_type != config('pricerules.cart.validation.0')) { - $item->update([ - 'coupon_code' => $rule->coupon->code, - 'discount_amount' => core()->convertPrice($impact['amount'], $cart->channel_currency_code), - 'base_discount_amount' => $impact['amount'] - ]); - } else { - $item->update([ - 'coupon_code' => $rule->coupon->code, - 'discount_percent' => $rule->disc_amount - ]); - } - } else { - if ($rule->action_type != config('pricerules.cart.validation.0')) { - $item->update([ - 'discount_amount' => core()->convertPrice($impact['amount'], $cart->channel_currency_code), - 'base_discount_amount' => $impact['amount'] - ]); - } else { - $item->update([ - 'discount_percent' => $rule->disc_amount - ]); - } - } - } - - // update the cart - if ($rule->use_coupon) { - $cart->update([ - 'coupon_code' => $rule->coupons->code, - 'discount_amount' => core()->convertPrice($impact['amount'], $cart->channel_currency_code), - 'base_discount_amount' => $impact['amount'] - ]); - } else { - $cart->update([ - 'discount_amount' => core()->convertPrice($impact['amount'], $cart->channel_currency_code), - 'base_discount_amount' => $impact['amount'] - ]); - } - } - /** * Prepares data for order item * diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index 77ad39612..e163b30c2 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -280,14 +280,6 @@ 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 72a89ec52..ac485a2c9 100755 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -41,8 +41,6 @@ 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 a2d7294fb..d9b240710 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -342,7 +342,7 @@ }) var summaryTemplateRenderFns = []; - + Vue.component('summary-section', { inject: ['$validator'], @@ -504,6 +504,20 @@ this.templateRender() : '') ]); + }, + + methods: { + onSubmit: function() { + var this_this = this; + + axios.post('{{ route('shop.checkout.check.coupons') }}', { + code: this_this.code + }).then(function(response) { + console.log(response.data); + }).catch(function(error) { + console.log(error.data); + }); + } } });