From 0468b7fa58efd9108bd9e07c7c9522be48c69be5 Mon Sep 17 00:00:00 2001 From: "shubhammehrotra.symfony@webkul.com" Date: Thu, 16 Jan 2020 12:37:52 +0530 Subject: [PATCH 1/5] pass locale data in view_render_event --- .../Admin/src/Resources/views/settings/locales/edit.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php index 365020c48..b0fa3a44e 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/locales/edit.blade.php @@ -28,7 +28,7 @@
@csrf() - {!! view_render_event('bagisto.admin.settings.locale.edit.before') !!} + {!! view_render_event('bagisto.admin.settings.locale.edit.before', ['locale' => $locale]) !!} @@ -60,7 +60,7 @@
- {!! view_render_event('bagisto.admin.settings.locale.edit.after') !!} + {!! view_render_event('bagisto.admin.settings.locale.edit.after', ['locale' => $locale]) !!} From ba355a6f313660ca6cb4fd9bf4ff761061194a5d Mon Sep 17 00:00:00 2001 From: "shubhammehrotra.symfony@webkul.com" Date: Thu, 16 Jan 2020 16:22:00 +0530 Subject: [PATCH 2/5] passing data from slider repository instead of id --- packages/Webkul/Core/src/Repositories/SliderRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Core/src/Repositories/SliderRepository.php b/packages/Webkul/Core/src/Repositories/SliderRepository.php index dd94792a7..1fa6f6ea1 100755 --- a/packages/Webkul/Core/src/Repositories/SliderRepository.php +++ b/packages/Webkul/Core/src/Repositories/SliderRepository.php @@ -55,7 +55,7 @@ class SliderRepository extends Repository */ public function save(array $data) { - Event::fire('core.settings.slider.create.before', $id); + Event::fire('core.settings.slider.create.before', $data); $channelName = $this->channelRepository->find($data['channel_id'])->name; From 76829f8f938e40b12e95180ec7220ed65b745250 Mon Sep 17 00:00:00 2001 From: "shubhammehrotra.symfony@webkul.com" Date: Mon, 20 Jan 2020 16:14:02 +0530 Subject: [PATCH 3/5] updates --- .../Webkul/Velocity/src/Helpers/AdminHelper.php | 16 ++++++++++------ .../src/Resources/views/layouts/master.blade.php | 2 +- .../Resources/views/products/list/card.blade.php | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/packages/Webkul/Velocity/src/Helpers/AdminHelper.php b/packages/Webkul/Velocity/src/Helpers/AdminHelper.php index 6b586913a..7c9145733 100644 --- a/packages/Webkul/Velocity/src/Helpers/AdminHelper.php +++ b/packages/Webkul/Velocity/src/Helpers/AdminHelper.php @@ -22,7 +22,7 @@ class AdminHelper public function saveLocaleImg($locale) { - $uploadedImagePath = $this->uploadImage('locale_image.image_0'); + $uploadedImagePath = $this->uploadImage($locale, 'locale_image.image_0'); if ($uploadedImagePath) { $locale->locale_image = $uploadedImagePath; @@ -36,7 +36,7 @@ class AdminHelper { $category = $this->categoryRepository->findOrFail($categoryId); - $uploadedImagePath = $this->uploadImage('category_icon_path.image_0'); + $uploadedImagePath = $this->uploadImage($category, 'category_icon_path.image_1'); if ($uploadedImagePath) { $category->category_icon_path = $uploadedImagePath; @@ -46,22 +46,26 @@ class AdminHelper return $category; } - public function uploadImage($type) + public function uploadImage($record, $type) { $request = request(); $image = ''; $file = $type; - $dir = "velocity/$type"; + $dir = 'velocity/' . $type; if ($request->hasFile($file)) { - Storage::delete($dir . $file); + if ($type == 'locale_image.image_0' && $record->locale_image) { + Storage::delete($record->locale_image); + } + if ($type == 'category_icon_path.image_1' && $record->category_icon_path) { + Storage::delete($record->category_icon_path); + } $image = $request->file($file)->store($dir); return $image; } - return false; } diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/master.blade.php index a96b1a25a..73bf047ea 100644 --- a/packages/Webkul/Velocity/src/Resources/views/layouts/master.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/layouts/master.blade.php @@ -25,7 +25,7 @@ @if ($favicon = core()->getCurrentChannel()->favicon_url) @else - + @endif @yield('head') diff --git a/packages/Webkul/Velocity/src/Resources/views/products/list/card.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/list/card.blade.php index e6aca1fed..b73e397ef 100644 --- a/packages/Webkul/Velocity/src/Resources/views/products/list/card.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/products/list/card.blade.php @@ -1,7 +1,7 @@ @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage') @inject ('reviewHelper', 'Webkul\Product\Helpers\Review') @inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar') -@include('shop::UI.product-quick-view') +{{-- @include('shop::UI.product-quick-view') --}} @php if (isset($checkmode) && $checkmode && $toolbarHelper->getCurrentMode() == "list") { @@ -72,7 +72,7 @@ src="{{ $productBaseImage['medium_image_url'] }}" alt="{{ $product->name }}"> - + {{-- --}}
From 6d94387fe30a98c34e35dc50886a544b22f5ea67 Mon Sep 17 00:00:00 2001 From: "shubhammehrotra.symfony@webkul.com" Date: Mon, 20 Jan 2020 17:20:14 +0530 Subject: [PATCH 4/5] updates --- packages/Webkul/Velocity/webpack.mix.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/Webkul/Velocity/webpack.mix.js b/packages/Webkul/Velocity/webpack.mix.js index 48c897156..e8be51c40 100644 --- a/packages/Webkul/Velocity/webpack.mix.js +++ b/packages/Webkul/Velocity/webpack.mix.js @@ -2,13 +2,10 @@ const { mix } = require("laravel-mix"); require("laravel-mix-merge-manifest"); var publicPath = "../../../resources/themes/velocity/assets"; - if (mix.inProduction()) { publicPath = 'publishable/assets'; } -publicPath = 'publishable/assets'; - mix.setPublicPath(publicPath).mergeManifest(); mix.disableNotifications(); @@ -18,6 +15,12 @@ mix "js/velocity.js" ) + .copy(path.resolve('src/Resources/assets/images'), publicPath + '/images') + .copy(path.resolve('src/Resources/assets/fonts'), publicPath + '/fonts') + .sass( + __dirname + '/src/Resources/assets/sass/admin.scss', + __dirname + '/' + publicPath + '/css/velocity-admin.css' + ) .sass( __dirname + '/src/Resources/assets/sass/app.scss', __dirname + '/' + publicPath + '/css/velocity.css', { From 47b06aa3cfbb0754e95fffd0fa8ca929b3bdfc7e Mon Sep 17 00:00:00 2001 From: "shubhammehrotra.symfony@webkul.com" Date: Mon, 20 Jan 2020 19:30:55 +0530 Subject: [PATCH 5/5] updates --- .../publishable/assets/css/velocity-admin.css | 7 ------- .../publishable/assets/css/velocity.css | 4 ++++ .../publishable/assets/js/velocity.js | 9 ++++++++- .../src/Resources/assets/sass/app.scss | 1 + .../Resources/assets/sass/components/app.scss | 5 ++++- .../views/products/reviews/create.blade.php | 20 ++++++++++++------- packages/Webkul/Velocity/webpack.mix.js | 5 +++-- 7 files changed, 33 insertions(+), 18 deletions(-) diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity-admin.css b/packages/Webkul/Velocity/publishable/assets/css/velocity-admin.css index 34022ab73..31a19d3fa 100644 --- a/packages/Webkul/Velocity/publishable/assets/css/velocity-admin.css +++ b/packages/Webkul/Velocity/publishable/assets/css/velocity-admin.css @@ -24,13 +24,6 @@ font-style: normal; } -.wk-icon { - font-size: 20px; - font-weight: 400; - text-align: center; - color: #0041ff; -} - [class^="rango-"], [class*=" rango-"] { /* use !important to prevent issues with browser extensions that change fonts */ font-family: 'Webkul Rango' !important; diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity.css b/packages/Webkul/Velocity/publishable/assets/css/velocity.css index 881340915..2d35efe64 100644 --- a/packages/Webkul/Velocity/publishable/assets/css/velocity.css +++ b/packages/Webkul/Velocity/publishable/assets/css/velocity.css @@ -1463,6 +1463,9 @@ .account-content .sidebar { height: 100%; +} + +.account-content .sidebar .customer-sidebar { border-right: 1px solid #E5E5E5; } @@ -12755,6 +12758,7 @@ body { } #top #account + .account-modal { + top: 40px; right: 10px; z-index: 100; height: -webkit-max-content; diff --git a/packages/Webkul/Velocity/publishable/assets/js/velocity.js b/packages/Webkul/Velocity/publishable/assets/js/velocity.js index f3e879663..d74aa5762 100644 --- a/packages/Webkul/Velocity/publishable/assets/js/velocity.js +++ b/packages/Webkul/Velocity/publishable/assets/js/velocity.js @@ -1069,7 +1069,8 @@ module.exports = Cancel; /***/ (function(module, exports, __webpack_require__) { __webpack_require__(12); -module.exports = __webpack_require__(69); +__webpack_require__(69); +module.exports = __webpack_require__(70); /***/ }), @@ -36779,5 +36780,11 @@ if (false) { // removed by extract-text-webpack-plugin +/***/ }), +/* 70 */ +/***/ (function(module, exports) { + +// removed by extract-text-webpack-plugin + /***/ }) /******/ ]); \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss index e4cf9a222..b94c06065 100755 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss @@ -202,6 +202,7 @@ body { + .account-modal { @extend .modal-dialog; + top: 40px; right: 10px; z-index: 100; height: max-content; diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss index aa07515e2..f40678f89 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss @@ -666,7 +666,10 @@ .account-content { .sidebar { height: 100%; - border-right: 1px solid $border-general; + + .customer-sidebar { + border-right: 1px solid $border-general; + } .customer-sidebar { .account-details { diff --git a/packages/Webkul/Velocity/src/Resources/views/products/reviews/create.blade.php b/packages/Webkul/Velocity/src/Resources/views/products/reviews/create.blade.php index e9e46e230..dfc03f776 100644 --- a/packages/Webkul/Velocity/src/Resources/views/products/reviews/create.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/products/reviews/create.blade.php @@ -14,13 +14,15 @@
-

{{ __('shop::app.reviews.write-review') }}

+

+ {{ __('shop::app.reviews.write-review') }} +

+ @submit.prevent="onSubmit" + action="{{ route('shop.reviews.store', $product->product_id ) }}"> @csrf @@ -29,7 +31,7 @@ {{ __('admin::app.customers.reviews.rating') }} - + @{{ errors.first('rating') }}
@@ -45,7 +47,9 @@ v-validate="'required'" value="{{ old('title') }}" /> - @{{ errors.first('title') }} + + @{{ errors.first('title') }} +
@if (core()->getConfigData('catalog.products.review.guest_review') && ! auth()->guard('customer')->user()) @@ -54,7 +58,9 @@ {{ __('shop::app.reviews.name') }} - @{{ errors.first('name') }} + + @{{ errors.first('name') }} +
@endif @@ -69,7 +75,7 @@ v-validate="'required'" value="{{ old('comment') }}"> - + @{{ errors.first('comment') }} diff --git a/packages/Webkul/Velocity/webpack.mix.js b/packages/Webkul/Velocity/webpack.mix.js index e8be51c40..d707857ff 100644 --- a/packages/Webkul/Velocity/webpack.mix.js +++ b/packages/Webkul/Velocity/webpack.mix.js @@ -2,10 +2,13 @@ const { mix } = require("laravel-mix"); require("laravel-mix-merge-manifest"); var publicPath = "../../../resources/themes/velocity/assets"; + if (mix.inProduction()) { publicPath = 'publishable/assets'; } +publicPath = 'publishable/assets'; + mix.setPublicPath(publicPath).mergeManifest(); mix.disableNotifications(); @@ -15,8 +18,6 @@ mix "js/velocity.js" ) - .copy(path.resolve('src/Resources/assets/images'), publicPath + '/images') - .copy(path.resolve('src/Resources/assets/fonts'), publicPath + '/fonts') .sass( __dirname + '/src/Resources/assets/sass/admin.scss', __dirname + '/' + publicPath + '/css/velocity-admin.css'