Merge pull request #2932 from shubhwebkul/master

misc. bug fixes

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.*')
+            ->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')

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;
 

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'];
                 }

packages/Webkul/Velocity/src/Resources/views/shop/products/list/toolbar.blade.php

@@ -101,7 +101,9 @@
                     </span>
                 </div>
 
-                @include ('shop::products.list.layered-navigation')
+                @if (request()->route()->getName() != 'velocity.search.index')
+                    @include ('shop::products.list.layered-navigation')
+                @endif
             </div>
 
             <div class="col-4" @click="toggleLayeredNavigation({event: $event, actionType: 'open'})">