diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity.css b/packages/Webkul/Velocity/publishable/assets/css/velocity.css index 1ee1cafd2..8dd5222cd 100644 --- a/packages/Webkul/Velocity/publishable/assets/css/velocity.css +++ b/packages/Webkul/Velocity/publishable/assets/css/velocity.css @@ -1186,6 +1186,10 @@ width: 200px !important; } +.customer-options .customer-session { + padding: 10px 20px 0 20px; +} + .customer-options .customer-session label { font-size: 18px; color: #9e9e9e; @@ -1663,6 +1667,13 @@ color: #4D7EA8; } +.account-content .account-layout .account-table-content .filter-row-two .filter-tag .cross-icon::before { + top: 1px; + content: "\E91F"; + margin-left: 4px; + position: relative; +} + .account-content .account-layout .account-items-list.wishlist-container { width: 100%; margin: 0 auto; @@ -4383,7 +4394,7 @@ button[disabled] { vertical-align: middle; } -.rango-default, .account-content .sidebar .customer-sidebar .navigation li i.icon, .account-content .account-layout .account-table-content #datagrid-filters ~ table.table tbody tr .action .eye-icon, .account-content .account-layout .bottom-toolbar .pagination .page-item.next .angle-right-icon, +.rango-default, .account-content .sidebar .customer-sidebar .navigation li i.icon, .account-content .account-layout .account-table-content #datagrid-filters ~ table.table tbody tr .action .eye-icon, .account-content .account-layout .account-table-content .filter-row-two .filter-tag .cross-icon, .account-content .account-layout .bottom-toolbar .pagination .page-item.next .angle-right-icon, .account-content .account-layout .bottom-toolbar .pagination .page-item.next .angle-left-icon, .account-content .account-layout .bottom-toolbar .pagination .page-item.previous .angle-right-icon, .account-content .account-layout .bottom-toolbar .pagination .page-item.previous .angle-left-icon { speak: none; @@ -13641,6 +13652,22 @@ body { justify-content: unset; } +#top #account + .account-modal .modal-content { + padding: 0; +} + +#top #account + .account-modal .modal-content ul li:hover { + background-color: #ECECEC; +} + +#top #account + .account-modal .modal-content ul li a { + padding: 10px 20px; +} + +#top #account + .account-modal .modal-content ul li:last-child { + margin-bottom: 5px; +} + #top > div:last-child { height: 32px; } diff --git a/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php b/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php index 15ce3fb30..255fd5b6a 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
Product Replace & Return Available
Product Exchange and EMI Available
', ]); DB::table('locales')->where('code', 'en')->update([ diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php index d75f87bf0..35e48db82 100644 --- a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php +++ b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php @@ -68,14 +68,17 @@ class ConfigurationController extends Controller } } - foreach ($params['product_view_images'] as $index => $productViewImage) { - if ($productViewImage !== "") { - $params['product_view_images'][$index] = $this->uploadImage($productViewImage, $index); + if (isset($params['product_view_images'])) { + foreach ($params['product_view_images'] as $index => $productViewImage) { + if ($productViewImage !== "") { + $params['product_view_images'][$index] = $this->uploadImage($productViewImage, $index); + } } + + $params['product_view_images'] = json_encode($params['product_view_images']); } $params['advertisement'] = json_encode($params['advertisement']); - $params['product_view_images'] = json_encode($params['product_view_images']); $params['home_page_content'] = str_replace('=>', '=>', $params['home_page_content']); unset($params['images']); diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss index a3bc6ee8b..f70c572e8 100755 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss @@ -220,6 +220,26 @@ body { .modal-footer { justify-content: unset; } + + .modal-content { + padding: 0; + + ul { + li { + &:hover { + background-color: $border-light; + } + + a { + padding: 10px 20px; + } + + &:last-child { + margin-bottom: 5px; + } + } + } + } } } 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 eaa948584..f92a6d0de 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss @@ -442,6 +442,8 @@ .customer-session { + padding: 10px 20px 0 20px; + label { font-size: 18px; color: $light-grey-clr; @@ -967,6 +969,21 @@ } } } + + .filter-row-two { + .filter-tag { + .cross-icon { + @extend .rango-default; + + &::before { + top: 1px; + content: "\e91f"; + margin-left: 4px; + position: relative; + } + } + } + } } .account-items-list { diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php index b3504d3c5..a6a465f0d 100644 --- a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php @@ -130,22 +130,22 @@ -
+ {{--
-
+
--}} -
+ {{--
-
+
--}} diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php index 03da4f39f..892dedbb1 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/UI/particals.blade.php @@ -130,7 +130,7 @@ name="term" type="search" class="form-control" - :value="searchedQuery.term" + :value="searchedQuery.term ? searchedQuery.term.split('+').join(' ') : ''" placeholder="{{ __('velocity::app.header.search-text') }}" /> - - {!! view_render_event('bagisto.shop.customers.account.address.create.after') !!}