From 5f75fa7fb23fee8d1a5f5cbcc5fe35b94f701089 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Tue, 10 Nov 2020 12:08:46 +0530 Subject: [PATCH] Component Added For Both Themes --- .../Shop/src/Resources/assets/js/app.js | 4 +-- .../checkout/proceed-to-checkout.vue | 3 +- .../views/checkout/cart/index.blade.php | 12 +++---- .../publishable/assets/js/velocity.js | 2 +- .../publishable/assets/mix-manifest.json | 2 +- .../js/UI/components/proceed-to-checkout.vue | 29 +++++++++++++++++ .../Velocity/src/Resources/assets/js/app.js | 1 + .../views/shop/checkout/cart/index.blade.php | 31 +------------------ .../shop/checkout/total/summary.blade.php | 16 +++++++--- 9 files changed, 54 insertions(+), 46 deletions(-) create mode 100644 packages/Webkul/Velocity/src/Resources/assets/js/UI/components/proceed-to-checkout.vue diff --git a/packages/Webkul/Shop/src/Resources/assets/js/app.js b/packages/Webkul/Shop/src/Resources/assets/js/app.js index 50e1cde59..d76e047e9 100755 --- a/packages/Webkul/Shop/src/Resources/assets/js/app.js +++ b/packages/Webkul/Shop/src/Resources/assets/js/app.js @@ -29,8 +29,8 @@ Vue.prototype.$http = axios window.eventBus = new Vue(); -Vue.component("image-slider", ImageSlider); -Vue.component("vue-slider", VueSlider); +Vue.component('image-slider', ImageSlider); +Vue.component('vue-slider', VueSlider); Vue.component('proceed-to-checkout', require('./components/checkout/proceed-to-checkout').default); Vue.filter('currency', function (value, argument) { diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/checkout/proceed-to-checkout.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/checkout/proceed-to-checkout.vue index 9bff0da64..ae0926104 100644 --- a/packages/Webkul/Shop/src/Resources/assets/js/components/checkout/proceed-to-checkout.vue +++ b/packages/Webkul/Shop/src/Resources/assets/js/components/checkout/proceed-to-checkout.vue @@ -1,11 +1,12 @@ \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/app.js b/packages/Webkul/Velocity/src/Resources/assets/js/app.js index c9653524d..bf69391a0 100755 --- a/packages/Webkul/Velocity/src/Resources/assets/js/app.js +++ b/packages/Webkul/Velocity/src/Resources/assets/js/app.js @@ -40,6 +40,7 @@ Vue.component('modal-component', require('./UI/components/modal')); Vue.component("add-to-cart", require("./UI/components/add-to-cart")); Vue.component('star-ratings', require('./UI/components/star-rating')); Vue.component('quantity-btn', require('./UI/components/quantity-btn')); +Vue.component('proceed-to-checkout', require('./UI/components/proceed-to-checkout')); Vue.component('sidebar-component', require('./UI/components/sidebar')); Vue.component("product-card", require("./UI/components/product-card")); Vue.component("wishlist-component", require("./UI/components/wishlist")); diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php index b2b146f08..3b8e86e22 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php @@ -8,15 +8,7 @@ @stop @section('content-wrapper') - @php - $minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; - @endphp - - + @endsection @push('css') @@ -296,23 +288,6 @@ Vue.component('cart-component', { template: '#cart-template', - props: [ - 'cartDetails', - 'minimumOrderAmount', - 'minimumOrderMessage' - ], - - mounted: function () { - let cartDetails = this.getCartDetails(); - - $('#proceed-to-checkout').on('click', (e) => { - if (! (cartDetails.base_sub_total > this.minimumOrderAmount)) { - e.preventDefault(); - window.showAlert(`alert-warning`, 'Warning', this.minimumOrderMessage); - } - }); - }, - data: function () { return { isMobileDevice: this.isMobile(), @@ -323,10 +298,6 @@ removeLink(message) { if (! confirm(message)) event.preventDefault(); - }, - - getCartDetails: function () { - return JSON.parse(this.cartDetails); } } }) diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/total/summary.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/total/summary.blade.php index 0782b5799..cb44a0ebf 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/total/summary.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/total/summary.blade.php @@ -45,11 +45,17 @@
- getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; + @endphp + + - {{ __('velocity::app.checkout.proceed') }} - + add-class="theme-btn text-uppercase col-12 remove-decoration fw6 text-center" + text="{{ __('velocity::app.checkout.proceed') }}" + cart-details="{{ $cart }}" + minimum-order-amount="{{ $minimumOrderAmount }}" + minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) }}"> +
\ No newline at end of file