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 0fccaface..5fb75862b 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]) !!} diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity.css b/packages/Webkul/Velocity/publishable/assets/css/velocity.css index d4ad43ae7..610c8dffb 100644 --- a/packages/Webkul/Velocity/publishable/assets/css/velocity.css +++ b/packages/Webkul/Velocity/publishable/assets/css/velocity.css @@ -900,6 +900,7 @@ .customer-rating .rating-bar { top: 12px; + padding: 0px; height: 5px; position: relative; background-color: #F7F7F9; @@ -911,15 +912,8 @@ background-color: #111111; } -.customer-rating .btn-write-review { +.customer-rating .theme-btn.light, .customer-rating .cart-details .light.continue-shopping-btn, .cart-details .customer-rating .light.continue-shopping-btn, .customer-rating .account-content .account-layout .bottom-toolbar .pagination .page-item, .account-content .account-layout .bottom-toolbar .pagination .customer-rating .page-item { margin-top: 10px; - color: #26A37C; - font-weight: 600; - padding: 8px 11px; - background-color: white; - -webkit-box-shadow: 0 1px 0 0 #CFCFCF; - box-shadow: 0 1px 0 0 #CFCFCF; - border: 1px solid rgba(0, 0, 0, 0.12); } .review-form { @@ -1150,9 +1144,9 @@ padding: 0 10px !important; font-size: 24px !important; font-weight: 600 !important; - border: 1px solid #CCCCCC !important; color: #000000 !important; background-color: #FFFFFF; + border: 1px solid #CCCCCC !important; } .quantity button:nth-of-type(1) { @@ -1160,7 +1154,7 @@ } .quantity input { - width: 50px; + max-width: 28px; cursor: default; font-size: 16px !important; border-left: 0px !important; @@ -1168,6 +1162,10 @@ text-align: center; } +.quantity button:hover { + background-color: #f5f5f5 !important; +} + .quantity button:nth-last-of-type(1) { border-radius: 0px; border-left: 0px !important; @@ -1989,6 +1987,20 @@ #app { min-height: 65vh; + position: relative; +} + +.main-container-wrapper .sticky-header { + top: 0px; + z-index: 1100; + position: -webkit-sticky; + position: sticky; + background: white; +} + +.main-container-wrapper .sticky-header.header-shadow { + -webkit-box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); } .search-container { @@ -2686,8 +2698,19 @@ header #search-form > *:focus { box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); } -.product-policy-container .card .col-sm-10 { - line-height: 3.5rem; +.product-policy-container .card .policy { + display: table; + padding: 0 10px; +} + +.product-policy-container .card .policy .left { + margin-right: 10px; + display: inline-block; +} + +.product-policy-container .card .policy .right { + display: table-cell; + vertical-align: middle; } /* product policy section */ @@ -2897,7 +2920,11 @@ header #search-form > *:focus { } .reviews-container .card .review-info > div:not(:last-child) { - margin-bottom: 15px; + margin-bottom: 10px; +} + +.reviews-container .card .review-info .star-ratings { + margin-bottom: 5px !important; } .reviews-container .product-info { @@ -4071,6 +4098,10 @@ button[disabled] { color: #141516; } +.normal-white-text { + color: rgba(255, 255, 255, 0.83); +} + .display-table { display: table; } @@ -4262,6 +4293,30 @@ button[disabled] { vertical-align: middle; } +.product-detail .layouter, +.product-detail #product-form { + height: 100%; +} + +.product-detail #product-form .form-container { + height: 100%; + position: relative; +} + +.product-detail #product-form .form-container .left { + top: 60px; + position: -webkit-sticky; + position: sticky; +} + +.product-detail .accordian.active .accordian-header { + padding-bottom: 0px; +} + +.product-detail .full-description { + font-size: 14px; +} + .store-meta-images { margin-top: 20px; } diff --git a/packages/Webkul/Velocity/publishable/assets/js/velocity.js b/packages/Webkul/Velocity/publishable/assets/js/velocity.js index f01086a6c..77d2ce5fb 100644 --- a/packages/Webkul/Velocity/publishable/assets/js/velocity.js +++ b/packages/Webkul/Velocity/publishable/assets/js/velocity.js @@ -36532,7 +36532,7 @@ var render = function() { _c( "h2", { - staticClass: "fs14 fw6 cursor-pointer tab", + staticClass: "fs16 fw6 cursor-pointer tab", class: index == 0 ? "active" : "" }, [_vm._v(_vm._s(tab))] @@ -36582,7 +36582,7 @@ var render = function() { _vm._v(" "), !(_vm.viewAll == "false" || _vm.viewAll == "") && _vm.viewAll ? [ - _c("div", { staticClass: "mr15" }, [ + _c("div", [ _c( "a", { @@ -36593,7 +36593,7 @@ var render = function() { } }, [ - _c("h2", { staticClass: "fs14 fw6 cursor-pointer tab" }, [ + _c("h2", { staticClass: "fs16 fw6 cursor-pointer tab" }, [ _vm._v("View All") ]) ] diff --git a/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php b/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php index e99e04841..9a90da676 100644 --- a/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php +++ b/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php @@ -24,7 +24,7 @@ class VelocityMetaDataSeeder extends Seeder 'subscription_bar_content' => '
', - 'product_policy' => '
Free Shippingon Order $20 or More
ProductReplace & Return Available
ProductExchange and EMI Available
', + 'product_policy' => '
Free Shippingon Order $20 or More
ProductReplace & Return Available
ProductExchange and EMI Available
', ]); DB::table('locales')->where('code', 'en')->update([ diff --git a/packages/Webkul/Velocity/src/Helpers/AdminHelper.php b/packages/Webkul/Velocity/src/Helpers/AdminHelper.php index 89a12f799..6b586913a 100644 --- a/packages/Webkul/Velocity/src/Helpers/AdminHelper.php +++ b/packages/Webkul/Velocity/src/Helpers/AdminHelper.php @@ -22,8 +22,12 @@ class AdminHelper public function saveLocaleImg($locale) { - $locale->locale_image = $this->uploadImage('locale_image'); - $locale->save(); + $uploadedImagePath = $this->uploadImage('locale_image.image_0'); + + if ($uploadedImagePath) { + $locale->locale_image = $uploadedImagePath; + $locale->save(); + } return $locale; } @@ -32,8 +36,12 @@ class AdminHelper { $category = $this->categoryRepository->findOrFail($categoryId); - $category->category_icon_path = $this->uploadImage('category_icon_path'); - $category->save(); + $uploadedImagePath = $this->uploadImage('category_icon_path.image_0'); + + if ($uploadedImagePath) { + $category->category_icon_path = $uploadedImagePath; + $category->save(); + } return $category; } @@ -50,9 +58,11 @@ class AdminHelper Storage::delete($dir . $file); $image = $request->file($file)->store($dir); + + return $image; } - return $image; + return false; } public function storeSliderDetails($slider) diff --git a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php index e2e03a3b3..8e4f1a19a 100644 --- a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php +++ b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php @@ -54,8 +54,8 @@ class VelocityServiceProvider extends ServiceProvider ); Event::listen([ - 'bagisto.admin.catalog.category.edit_form_accordian.general.after', - 'bagisto.admin.catalog.category.create_form_accordian.general.after', + 'bagisto.admin.catalog.category.edit_form_accordian.description_images.controls.after', + 'bagisto.admin.catalog.category.create_form_accordian.description_images.controls.after', ], function($viewRenderEventManager) { $viewRenderEventManager->addTemplate( 'velocity::admin.catelog.categories.category-icon' diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/card-header.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/card-header.vue index e137f9b04..5312129b9 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/card-header.vue +++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/card-header.vue @@ -16,7 +16,7 @@ class="col-lg-2 no-padding" v-for="(tab, index) in tabs.slice(0, 3)"> -

{{ tab }}

+

{{ tab }}

@@ -40,9 +40,9 @@ diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/_variables.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/_variables.scss index d2e4780d1..d26cb6a3f 100755 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/_variables.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/_variables.scss @@ -3,6 +3,7 @@ $white-color: #FFFFFF; $black-color: #111111; $font-color: rgba(0,0,0,0.83); +$font-color-light: rgba(255, 255, 255, 0.83); $button-primary-bg: #21A179; $border-primary: #269c77; $button-danger: #F05153; 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 d80b91707..2aad02478 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss @@ -56,6 +56,7 @@ .rating-bar { top: 12px; + padding: 0px; height: 5px; position: relative; background-color: $light-background; @@ -67,14 +68,10 @@ } } - .btn-write-review { - margin-top: 10px; - color: #26A37C; - font-weight: 600; - padding: 8px 11px; - background-color: white; - box-shadow: 0 1px 0 0 #CFCFCF; - border: 1px solid rgba(0,0,0,0.12); + .theme-btn { + &.light { + margin-top: 10px; + } } } @@ -326,9 +323,9 @@ padding: 0 10px !important; font-size: 24px !important; font-weight: 600 !important; - border: 1px solid $border-common !important; color: $dark-color !important; background-color: $white-color; + border: 1px solid $border-common !important; } button:nth-of-type(1) { @@ -336,7 +333,7 @@ } input { - width: 50px; + max-width: 28px; cursor: default; font-size: 16px !important; border-left: 0px !important; @@ -344,6 +341,10 @@ text-align: center; } + button:hover { + background-color: #f5f5f5 !important; + } + button:nth-last-of-type(1) { border-radius: 0px; border-left: 0px !important; @@ -1247,7 +1248,21 @@ #app { min-height: 65vh; + position: relative; } +.main-container-wrapper { + .sticky-header { + top: 0px; + z-index: 1100; + position: sticky; + background: white; + + &.header-shadow { + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23); + } + } +} + .search-container { padding: 30px 20px; diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss index de1943b22..27b34e2b5 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss @@ -201,8 +201,19 @@ header #search-form > *:focus { background: $white-color; box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23); - .col-sm-10 { - line-height: 3.5rem; + .policy { + display: table; + padding: 0 10px; + + .left { + margin-right: 10px; + display: inline-block; + } + + .right { + display: table-cell; + vertical-align: middle; + } } } } @@ -430,7 +441,11 @@ header #search-form > *:focus { box-shadow: 0 4px 17px 0 rgba(0,0,0,0.11); > div:not(:last-child) { - margin-bottom: 15px; + margin-bottom: 10px; + } + + .star-ratings { + margin-bottom: 5px !important; } } } diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss index 3bdddd122..92c9db5ef 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss @@ -218,6 +218,34 @@ } } + .layouter, + #product-form { + height: 100%; + } + + #product-form { + .form-container { + height: 100%; + position: relative; + + .left { + top: 60px; + position: sticky; + } + } + } + + .accordian { + &.active { + .accordian-header { + padding-bottom: 0px; + } + } + } + + .full-description { + font-size: 14px; + } } .store-meta-images { diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss index f01d375fc..4c3f189e2 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss @@ -751,6 +751,9 @@ button[disabled] { .normal-text { color: $light1-black; } +.normal-white-text { + color: $font-color-light; +} .display-table { display: table; diff --git a/packages/Webkul/Velocity/src/Resources/lang/en/app.php b/packages/Webkul/Velocity/src/Resources/lang/en/app.php index baed10499..18b34d21e 100644 --- a/packages/Webkul/Velocity/src/Resources/lang/en/app.php +++ b/packages/Webkul/Velocity/src/Resources/lang/en/app.php @@ -106,6 +106,7 @@ return [ 'footer' => 'Footer', 'product-policy' => 'Product Policy', 'slider-path' => 'Slider Path', + 'category-logo' => 'Category logo', ], 'category' => [ 'title' => 'Category Menu List', diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/catelog/categories/category-icon.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/catelog/categories/category-icon.blade.php index ac4bd5e0d..f8760ddee 100644 --- a/packages/Webkul/Velocity/src/Resources/views/admin/catelog/categories/category-icon.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/admin/catelog/categories/category-icon.blade.php @@ -1,13 +1,18 @@ - +
+ - - - - \ No newline at end of file + @if (isset($category) && $category->category_icon_path) + category_icon_path }}"' + :button-label="'{{ __('admin::app.catalog.products.add-image-btn-title') }}'"> + + @else + + + @endif +
\ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/settings/locales/locale-logo.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/settings/locales/locale-logo.blade.php index a2ec1c5c2..ba006735f 100644 --- a/packages/Webkul/Velocity/src/Resources/views/admin/settings/locales/locale-logo.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/admin/settings/locales/locale-logo.blade.php @@ -1 +1,16 @@ - \ No newline at end of file +
+ @if (isset($locale) && $locale->locale_image) + locale_image }}"' + :button-label="'{{ __('admin::app.catalog.products.add-image-btn-title') }}'"> + + @else + + + @endif +
\ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/views/home/category-with-custom-option.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/category-with-custom-option.blade.php index d02fab9e2..901effb87 100644 --- a/packages/Webkul/Velocity/src/Resources/views/home/category-with-custom-option.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/home/category-with-custom-option.blade.php @@ -19,14 +19,14 @@

- + {{ $category[0]->name }}