From 846c59b345edb08e5a89d15d48fd0a0771caa8bb Mon Sep 17 00:00:00 2001 From: Akhtar Khan Date: Tue, 14 Jul 2020 10:53:03 +0530 Subject: [PATCH 01/10] Changed in Add Address Button & Label in new product in velocity theme --- config/elastic.scout_driver.php | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 config/elastic.scout_driver.php diff --git a/config/elastic.scout_driver.php b/config/elastic.scout_driver.php new file mode 100644 index 000000000..b28fe35a3 --- /dev/null +++ b/config/elastic.scout_driver.php @@ -0,0 +1,5 @@ + env('ELASTIC_SCOUT_DRIVER_REFRESH_DOCUMENTS', false) +]; From fd15252d38f8325fe20d31967535153a87477828 Mon Sep 17 00:00:00 2001 From: Akhtar Khan Date: Tue, 14 Jul 2020 11:42:20 +0530 Subject: [PATCH 02/10] Changes in Add Address Button in Customer Account Section & Label on new product in velocity theme --- config/scout.php | 2 +- .../shop/customers/account/address/index.blade.php | 11 ++++++++++- .../Resources/views/shop/products/list/card.blade.php | 6 ++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/config/scout.php b/config/scout.php index 857e3a521..b2f0f4d22 100644 --- a/config/scout.php +++ b/config/scout.php @@ -15,7 +15,7 @@ return [ | */ - 'driver' => env('SCOUT_DRIVER', 'null'), + 'driver' => env('SCOUT_DRIVER', null), /* |-------------------------------------------------------------------------- diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/index.blade.php index 6bc9375ec..a1152485d 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/index.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/index.blade.php @@ -6,7 +6,7 @@ @section('page-detail-wrapper') @if ($addresses->isEmpty()) - + {{ __('shop::app.customer.account.address.index.add') }} @endif @@ -80,3 +80,12 @@ } @endpush + +@if ($addresses->isEmpty()) + +@endif diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php index 637c9a938..39684956c 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/card.blade.php @@ -90,6 +90,12 @@ {{-- --}} + @if ($product->new) +
+ {{ __('shop::app.products.new') }} +
+ @endif +
Date: Tue, 14 Jul 2020 15:54:37 +0530 Subject: [PATCH 03/10] Fixed Filter tag in search of product in admin panel #3445 --- .../src/Resources/views/customers/account/orders/index.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php index 0baabcd78..bbab7e52b 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/index.blade.php @@ -10,6 +10,7 @@ @include('shop::customers.account.partials.sidemenu')