From b5b6532f3ecf5c7988c1280e6703620add6944f7 Mon Sep 17 00:00:00 2001 From: Shubham Mehrotra Date: Fri, 24 Apr 2020 15:25:25 +0530 Subject: [PATCH 1/5] #2908 --- .../Velocity/src/Repositories/Product/ProductRepository.php | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/Webkul/Velocity/src/Repositories/Product/ProductRepository.php b/packages/Webkul/Velocity/src/Repositories/Product/ProductRepository.php index c0403510c..4a97216e7 100644 --- a/packages/Webkul/Velocity/src/Repositories/Product/ProductRepository.php +++ b/packages/Webkul/Velocity/src/Repositories/Product/ProductRepository.php @@ -4,6 +4,7 @@ namespace Webkul\Velocity\Repositories\Product; use Webkul\Core\Eloquent\Repository; use Illuminate\Container\Container as App; +use Webkul\Product\Models\ProductAttributeValue; use Webkul\Product\Repositories\ProductFlatRepository; use Webkul\Attribute\Repositories\AttributeRepository; From d43907722809a5dd1581f3a059aaf637d6f050bb Mon Sep 17 00:00:00 2001 From: Shubham Mehrotra Date: Fri, 24 Apr 2020 15:25:43 +0530 Subject: [PATCH 2/5] customer sidebar menu issue resolved --- .../customers/account/partials/sidemenu.blade.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/partials/sidemenu.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/partials/sidemenu.blade.php index c5fbc52fd..60bd82f67 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/partials/sidemenu.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/partials/sidemenu.blade.php @@ -21,6 +21,20 @@ $subMenuCollection['compare'] = $menuItem['children']['compare']; $subMenuCollection['reviews'] = $menuItem['children']['reviews']; $subMenuCollection['address'] = $menuItem['children']['address']; + + unset( + $menuItem['children']['profile'], + $menuItem['children']['orders'], + $menuItem['children']['downloadables'], + $menuItem['children']['wishlist'], + $menuItem['children']['compare'], + $menuItem['children']['reviews'], + $menuItem['children']['address'] + ); + + foreach ($menuItem['children'] as $key => $remainingChildren) { + $subMenuCollection[$key] = $remainingChildren; + } } catch (\Exception $exception) { $subMenuCollection = $menuItem['children']; } From 9361e9e77f6a41f7a930e02572da705c646343c8 Mon Sep 17 00:00:00 2001 From: Shubham Mehrotra Date: Fri, 24 Apr 2020 15:26:20 +0530 Subject: [PATCH 3/5] removed layered navigation in searchproducts page --- .../src/Resources/views/shop/products/list/toolbar.blade.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/toolbar.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/toolbar.blade.php index 2ac0c6d5b..034be2047 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/products/list/toolbar.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/products/list/toolbar.blade.php @@ -101,7 +101,9 @@ - @include ('shop::products.list.layered-navigation') + @if (request()->route()->getName() != 'velocity.search.index') + @include ('shop::products.list.layered-navigation') + @endif
From 1d7228ea546c0c6a744255336890ea2c5c1e4d3f Mon Sep 17 00:00:00 2001 From: Shubham Mehrotra Date: Fri, 24 Apr 2020 16:28:00 +0530 Subject: [PATCH 4/5] #2919 --- packages/Webkul/Velocity/src/Repositories/ContentRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Velocity/src/Repositories/ContentRepository.php b/packages/Webkul/Velocity/src/Repositories/ContentRepository.php index 32bfbd0bf..90603c5ef 100644 --- a/packages/Webkul/Velocity/src/Repositories/ContentRepository.php +++ b/packages/Webkul/Velocity/src/Repositories/ContentRepository.php @@ -130,7 +130,7 @@ class ContentRepository extends Repository $query = $this->model::orderBy('position', 'ASC'); $contentCollection = $query - ->select('velocity_contents.*', 'velocity_contents_translations.*') + ->select('velocity_contents.*', 'velocity_contents_translations.title as title') ->where('velocity_contents.status', 1) ->leftJoin('velocity_contents_translations', 'velocity_contents.id', 'velocity_contents_translations.content_id') ->distinct('velocity_contents_translations.id') From deb9a4c38f7b0b3ce496612d7e02ff5b18991910 Mon Sep 17 00:00:00 2001 From: Shubham Mehrotra Date: Fri, 24 Apr 2020 16:40:39 +0530 Subject: [PATCH 5/5] content header path update --- .../Webkul/Velocity/src/Repositories/ContentRepository.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/Velocity/src/Repositories/ContentRepository.php b/packages/Webkul/Velocity/src/Repositories/ContentRepository.php index 90603c5ef..47a960a87 100644 --- a/packages/Webkul/Velocity/src/Repositories/ContentRepository.php +++ b/packages/Webkul/Velocity/src/Repositories/ContentRepository.php @@ -130,7 +130,12 @@ class ContentRepository extends Repository $query = $this->model::orderBy('position', 'ASC'); $contentCollection = $query - ->select('velocity_contents.*', 'velocity_contents_translations.title as title') + ->select( + 'velocity_contents.content_type', + 'velocity_contents_translations.title as title', + 'velocity_contents_translations.page_link as page_link', + 'velocity_contents_translations.link_target as link_target' + ) ->where('velocity_contents.status', 1) ->leftJoin('velocity_contents_translations', 'velocity_contents.id', 'velocity_contents_translations.content_id') ->distinct('velocity_contents_translations.id')