diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity.css b/packages/Webkul/Velocity/publishable/assets/css/velocity.css index 2d35efe64..a7ea9fe33 100644 --- a/packages/Webkul/Velocity/publishable/assets/css/velocity.css +++ b/packages/Webkul/Velocity/publishable/assets/css/velocity.css @@ -812,18 +812,65 @@ } .nav-container { - position: absolute; + position: fixed; + width: 300px !important; height: 100vh; background-color: white; - display: inline-block; - border: 1px solid red; margin-left: -16px; z-index: 2; } .nav-container .wrapper { - width: 250px !important; - margin-left: 13px; + margin-top: 15px; +} + +.nav-container .wrapper .category-title { + display: table; + width: 100%; + padding-left: 10px; + margin: 13px 0px 13px 0px; + display: none; +} + +.nav-container .wrapper .category-title > i { + display: table-cell; + vertical-align: middle; + font-size: 26px; +} + +.nav-container .wrapper .category-title span { + display: table-cell; + vertical-align: top; + font-size: 20px; +} + +.nav-container .wrapper .category-title span i { + float: left !important; + margin: 2px 2px 0px 0px !important; +} + +.nav-container .wrapper .greeting { + display: table; + width: 100%; + padding-left: 10px; + margin: 13px 0px 13px 0px; +} + +.nav-container .wrapper .greeting > i { + display: table-cell; + vertical-align: middle; + font-size: 26px; +} + +.nav-container .wrapper .greeting span { + display: table-cell; + vertical-align: top; + font-size: 20px; +} + +.nav-container .wrapper .greeting span i { + float: right !important; + margin: 2px 20px 0px 0px !important; } .nav-container .wrapper .offers { @@ -831,20 +878,49 @@ line-height: 20px; font-weight: 530; border-top: 1px solid rgba(0, 0, 0, 0.24); + border-bottom: 1px solid rgba(0, 0, 0, 0.24); } .nav-container .wrapper .offers li { font-size: 16px; - margin: 13px 13px 0px 13px; + margin: 16px 0px 16px 15px; } .nav-container .wrapper .layered-category { - border-top: 1px solid rgba(0, 0, 0, 0.24); + font-weight: 501; + letter-spacing: 0.2px; + margin: 16px 0px 0px 0px; +} + +.nav-container .wrapper .layered-category .category-icon { + width: 36px; + height: 20px; + padding-left: 12px; + display: inline-block; +} + +.nav-container .wrapper .layered-category .category-icon img { + width: 100%; + height: 100%; + vertical-align: text-top; } .nav-container .wrapper .layered-category li { + margin: 18px 0px 18px 5px; + font-size: 17px; +} + +.nav-container .wrapper .layered-category li a span { + color: black; font-size: 14px; - margin: 13px 13px 0px 13px; + margin: 16px 0px 16px 15px !important; + font-weight: 400px; +} + +.nav-container .wrapper .layered-category li i { + float: right; + font-size: 16px; + margin: 3px 20px 0px 0px; } .review-page-container { @@ -1995,7 +2071,7 @@ .main-container-wrapper .sticky-header { top: 0px; - z-index: 1100; + z-index: 100; position: -webkit-sticky; position: sticky; background: white; @@ -2449,14 +2525,11 @@ background-color: white; } -.filter-attributes-item .checkbox input[type=checkbox] { - width: 14px; - height: 14px; - -webkit-transform: scale(0.9); - transform: scale(0.9); +.filter-attributes-item input[type=checkbox] + span { + margin-left: 10px !important; } -.filter-attributes-item .filter-attributes-content { +.filter-attributes-content { display: none; margin-left: 7px; } @@ -4319,6 +4392,51 @@ button[disabled] { position: sticky; } +.product-detail #product-form .form-container .right .swatch-container { + margin-top: 10px; + display: inline-block; +} + +.product-detail #product-form .form-container .right .swatch-container .swatch { + display: inline-block; + margin-right: 5px; + min-width: 40px; + height: 40px; +} + +.product-detail #product-form .form-container .right .swatch-container .swatch span { + min-width: 38px; + height: 38px; + float: left; + border: 1px solid #C7C7C7; + border-radius: 3px; + line-height: 36px; + text-align: center; + cursor: pointer; + padding: 0 10px; +} + +.product-detail #product-form .form-container .right .swatch-container .swatch img { + width: 38px; + height: 38px; + border: 1px solid #C7C7C7; + border-radius: 3px; + cursor: pointer; + background: #f2f2f2; +} + +.product-detail #product-form .form-container .right .swatch-container .swatch input:checked + span, .product-detail #product-form .form-container .right .swatch-container .swatch input:checked + img { + border: 1px solid #242424; +} + +.product-detail #product-form .form-container .right .swatch-container .swatch input { + display: none; +} + +.product-detail #product-form .form-container .right .swatch-container .no-options { + color: #fb3949; +} + .product-detail .accordian.active .accordian-header { padding-bottom: 0px; } @@ -12595,6 +12713,12 @@ button.close { font-family: "Source Sans Pro", sans-serif; } +input[type=checkbox] { + width: 24px; + height: 15px; + margin-right: 10px; +} + .form-control:focus { -webkit-box-shadow: 0px 0px 8px 1px rgba(105, 221, 157, 0.25); box-shadow: 0px 0px 8px 1px rgba(105, 221, 157, 0.25); diff --git a/packages/Webkul/Velocity/publishable/assets/js/velocity.js b/packages/Webkul/Velocity/publishable/assets/js/velocity.js index d74aa5762..5b7de091f 100644 --- a/packages/Webkul/Velocity/publishable/assets/js/velocity.js +++ b/packages/Webkul/Velocity/publishable/assets/js/velocity.js @@ -1209,7 +1209,7 @@ $(document).ready(function () { } }); - var app = new __WEBPACK_IMPORTED_MODULE_0_vue___default.a({ + new __WEBPACK_IMPORTED_MODULE_0_vue___default.a({ el: "#app", VueToast: __WEBPACK_IMPORTED_MODULE_2_vue_toast_notification___default.a, diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/app.js b/packages/Webkul/Velocity/src/Resources/assets/js/app.js index c02f3bf23..c1928d147 100755 --- a/packages/Webkul/Velocity/src/Resources/assets/js/app.js +++ b/packages/Webkul/Velocity/src/Resources/assets/js/app.js @@ -120,7 +120,7 @@ $(document).ready(function () { } }); - const app = new Vue({ + new Vue({ el: "#app", VueToast, diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/UI.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/UI.scss index bb439ca78..041d267fa 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/UI.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/UI.scss @@ -157,42 +157,6 @@ } } - // can work with layered navigation class - // .sub-category { - // border: 1px solid blue; - // border-top: 1px solid rgba(0,0,0,0.24); - // border-bottom: 1px solid rgba(0,0,0,0.24); - // font-weight: 520; - // display: none; - // letter-spacing: 0.2px; - - // .category-icon { - // width: 25px; - // height: 20px; - // padding-right: 5px; - // display: inline-block; - - // img { - // width: 100%; - // height: 100%; - // vertical-align: text-top; - // } - // } - - // li { - // font-size: 14px; - // margin : 16px 0px 16px 15px; - // font-weight: 400px; - // i { - // float: right; - // font-size: 16px; - // margin: 3px 20px 0px 0px; - - - // } - // } - // } - .greeting { display: table; width: 100%; diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/cart/coupon.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/cart/coupon.blade.php index 6c4cd0ab3..35ecdb280 100644 --- a/packages/Webkul/Velocity/src/Resources/views/checkout/cart/coupon.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/checkout/cart/coupon.blade.php @@ -48,40 +48,34 @@ methods: { applyCoupon: function() { - var self = this; - - if (! self.coupon_code.length) + if (! this.coupon_code.length) return; - self.error_message = null; + this.error_message = null; + this.disable_button = true; - self.disable_button = true; + let code = this.coupon_code; + axios.post( + '{{ route('shop.checkout.cart.coupon.apply') }}', {code} + ).then(response => { + if (response.data.success) { + this.$emit('onApplyCoupon'); + this.applied_coupon = this.coupon_code; + this.coupon_code = ''; + this.$root.addFlashMessages(); - axios.post('{{ route('shop.checkout.cart.coupon.apply') }}', {code: self.coupon_code}) - .then(function(response) { - if (response.data.success) { - self.$emit('onApplyCoupon'); + this.redirectIfCartPage(); + } else { + this.error_message = response.data.message; + } - self.applied_coupon = self.coupon_code; + this.disable_button = false; + }).catch(error => { + debugger + this.error_message = error.response.data.message; - self.coupon_code = ''; - - window.flashMessages = [{'type': 'alert-success', 'message': response.data.message}]; - - self.$root.addFlashMessages(); - - self.redirectIfCartPage(); - } else { - self.error_message = response.data.message; - } - - self.disable_button = false; - }) - .catch(function(error) { - self.error_message = error.response.data.message; - - self.disable_button = false; - }); + this.disable_button = false; + }); }, removeCoupon: function () { diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/total/summary.blade.php index 682ddb7af..0a43803e5 100644 --- a/packages/Webkul/Velocity/src/Resources/views/checkout/total/summary.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/checkout/total/summary.blade.php @@ -42,62 +42,6 @@ -
is('checkout/cart')) v-if="parseInt(discount)" @endif> - @if (! request()->is('checkout/cart')) - @if (! $cart->coupon_code) -
-
-
- -
- - -
- -
- * @{{ error_message }} -
- - -
-
-
- @else -
- {{ __('shop::app.checkout.total.coupon-applied') }} - - - {{ $cart->coupon_code }} - - - - -
- @endif - @endif -
-
- let messageType = 'alert-success'; - let messageLabel = 'dsfghjkl'; + (() => { + var showAlert = (messageType, messageLabel, message) => { + debugger + if (messageType && message !== '') { + let html = `
+ × + ${messageLabel} ! ${message}. +
`; - @if ($message = session('success')) - messageType = 'alert-success'; - messageLabel = 'Success'; - @elseif ($message = session('warning')) - messageType = 'alert-warning'; - messageLabel = 'Warning'; - @elseif ($message = session('error')) - messageType = 'alert-danger'; - messageLabel = 'Error'; - @elseif ($message = session('info')) - messageType = 'alert-info'; - messageLabel = 'Info'; - @endif + document.body.innerHTML += html; - if (messageType && '{{ $message }}' !== '') { - let html = `
- × - ${messageLabel} ! {{ $message }}. -
`; + window.setTimeout(() => { + $(".alert").fadeTo(500, 0).slideUp(500, () => { + $(this).remove(); + }); + }, 5000); + } + } - document.body.innerHTML += html; + let messageType = 'alert-success'; + let messageLabel = 'dsfghjkl'; - window.setTimeout(() => { - $(".alert").fadeTo(500, 0).slideUp(500, () => { - $(this).remove(); - }); - }, 5000); - } - - window.serverErrors = []; - @if(isset($errors)) - @if (count($errors)) - window.serverErrors = @json($errors->getMessages()); + @if ($message = session('success')) + messageType = 'alert-success'; + messageLabel = 'Success'; + @elseif ($message = session('warning')) + messageType = 'alert-warning'; + messageLabel = 'Warning'; + @elseif ($message = session('error')) + messageType = 'alert-danger'; + messageLabel = 'Error'; + @elseif ($message = session('info')) + messageType = 'alert-info'; + messageLabel = 'Info'; @endif - @endif + + if (messageType && '{{ $message }}' !== '') { + showAlert(messageType, messageLabel, '{{ $message }}'); + } + + window.serverErrors = []; + @if(isset($errors)) + @if (count($errors)) + window.serverErrors = @json($errors->getMessages()); + @endif + @endif + })() diff --git a/packages/Webkul/Velocity/src/Resources/views/products/view.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/view.blade.php index 1bccd74ed..4ff3286d4 100644 --- a/packages/Webkul/Velocity/src/Resources/views/products/view.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/products/view.blade.php @@ -134,16 +134,17 @@
- @isset($velocityMetaData['product_view_images']) + @if( + isset($velocityMetaData['product_view_images']) + && $velocityMetaData['product_view_images'] + ) @foreach (json_decode($velocityMetaData['product_view_images'], true) as $image) @if ($image && $image !== '') @endif @endforeach - @endisset - + @endif
-
{!! view_render_event('bagisto.shop.products.view.after', ['product' => $product]) !!}