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

Component Added For Both Themes

This commit is contained in:
devansh bawari 2020-11-10 12:08:46 +05:30
parent 9eb317402e
commit 5f75fa7fb2
9 changed files with 54 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Shop/src/Resources/assets/js/app.js vendored
View File

@ -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) {

3
packages/Webkul/Shop/src/Resources/assets/js/components/checkout/proceed-to-checkout.vue
View File

@ -1,11 +1,12 @@
<template>
<a :href="href" class="btn btn-lg btn-primary" v-text="text" @click="checkMinimumOrder($event)"></a>
<a :href="href" :class="addClass" v-text="text" @click="checkMinimumOrder($event)"></a>
</template>
<script>
export default {
props: [
'href',
'addClass',
'text',
'cartDetails',
'minimumOrderAmount',

12
packages/Webkul/Shop/src/Resources/views/checkout/cart/index.blade.php
View File

@ -7,10 +7,6 @@
@section('content-wrapper')
@inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
@php
$minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
@endphp
<section class="cart">
@if ($cart)
<div class="title">
@ -134,13 +130,17 @@
@endif
@if (! cart()->hasError())
@php
$minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
@endphp
<proceed-to-checkout
href="{{ route('shop.checkout.onepage.index') }}"
add-class="btn btn-lg btn-primary"
text="{{ __('shop::app.checkout.cart.proceed-to-checkout') }}"
cart-details="{{ $cart }}"
minimum-order-amount="{{ $minimumOrderAmount }}"
minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) }}"
>
minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) }}">
</proceed-to-checkout>
@endif
</div>

2
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=3881062524b183f96b0c",
"/js/velocity.js": "/js/velocity.js?id=c959a9f62042a9bcb63e",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=2405c8967f518a3ce499"
}

29
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/proceed-to-checkout.vue Normal file
View File

@ -0,0 +1,29 @@
<template>
<a :href="href" :class="addClass" v-text="text" @click="checkMinimumOrder($event)"></a>
</template>
<script>
export default {
props: [
'href',
'addClass',
'text',
'cartDetails',
'minimumOrderAmount',
'minimumOrderMessage'
],
methods: {
checkMinimumOrder: function (e) {
if (! (this.getCartDetails().base_sub_total > this.minimumOrderAmount)) {
e.preventDefault();
window.showAlert(`alert-warning`, 'Warning', this.minimumOrderMessage);
}
},
getCartDetails: function () {
return JSON.parse(this.cartDetails);
}
}
}
</script>

1
packages/Webkul/Velocity/src/Resources/assets/js/app.js vendored
View File

@ -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"));

31
packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php
View File

@ -8,15 +8,7 @@
@stop
@section('content-wrapper')
@php
$minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
@endphp
<cart-component
cart-details="{{ $cart }}"
minimum-order-amount="{{ $minimumOrderAmount }}"
minimum-order-message="{{ __('shop::app.checkout.cart.minimum-order-message', ['amount' => $minimumOrderAmount]) }}"
></cart-component>
<cart-component></cart-component>
@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);
}
}
})

16
packages/Webkul/Velocity/src/Resources/views/shop/checkout/total/summary.blade.php
View File

@ -45,11 +45,17 @@
</div>
<div class="row">
<a
@php
$minimumOrderAmount = (int) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0;
@endphp
<proceed-to-checkout
href="{{ route('shop.checkout.onepage.index') }}"
class="theme-btn text-uppercase col-12 remove-decoration fw6 text-center"
id="proceed-to-checkout">
{{ __('velocity::app.checkout.proceed') }}
</a>
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]) }}">
</proceed-to-checkout>
</div>
</div>