From 3382ffc0767bb1eee657b549b690136a05a05ce3 Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Mon, 24 Jun 2019 19:23:20 +0530
Subject: [PATCH] Customer group catalog fixed

---
 config/app.php                                |  4 ++--
 .../src/Models/CustomerGroup.php              |  2 +-
 .../src/Repositories/CategoryRepository.php   | 21 ++++++++++++++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/config/app.php b/config/app.php
index c6d52aaaf..cd7f2f31b 100755
--- a/config/app.php
+++ b/config/app.php
@@ -250,11 +250,11 @@ return [
         Webkul\BulkAddToCart\Providers\BulkAddToCartServiceProvider::class,
         Webkul\AdminAuthCheck\Providers\AdminAuthCheckServiceProvider::class,
         Webkul\StripeConnect\Providers\StripeConnectServiceProvider::class,
-        Webkul\CustomerGroupCatalog\Providers\CustomerGroupCatalogServiceProvider::class,
         Webkul\ShowPriceAfterLogin\Providers\ShowPriceAfterLoginServiceProvider::class,
         Webkul\CustomerCreditMax\Providers\CustomerCreditMaxServiceProvider::class,
         Webkul\SAASPreOrder\Providers\SAASPreOrderServiceProvider::class,
-        Webkul\SAASCustomizer\Providers\SAASCustomizerServiceProvider::class
+        Webkul\SAASCustomizer\Providers\SAASCustomizerServiceProvider::class,
+        Webkul\CustomerGroupCatalog\Providers\CustomerGroupCatalogServiceProvider::class
     ],
 
     /*
diff --git a/packages/Webkul/CustomerGroupCatalog/src/Models/CustomerGroup.php b/packages/Webkul/CustomerGroupCatalog/src/Models/CustomerGroup.php
index 08e59b146..8b40475ab 100644
--- a/packages/Webkul/CustomerGroupCatalog/src/Models/CustomerGroup.php
+++ b/packages/Webkul/CustomerGroupCatalog/src/Models/CustomerGroup.php
@@ -2,7 +2,7 @@
 namespace Webkul\CustomerGroupCatalog\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Webkul\Customer\Models\CustomerGroup as BaseCustomerGroup;
+use Webkul\SAASCustomizer\Models\Customer\CustomerGroup as BaseCustomerGroup;
 use Webkul\Product\Models\ProductProxy;
 use Webkul\Category\Models\CategoryProxy;
 
diff --git a/packages/Webkul/CustomerGroupCatalog/src/Repositories/CategoryRepository.php b/packages/Webkul/CustomerGroupCatalog/src/Repositories/CategoryRepository.php
index fb433dedd..64e5fbbca 100644
--- a/packages/Webkul/CustomerGroupCatalog/src/Repositories/CategoryRepository.php
+++ b/packages/Webkul/CustomerGroupCatalog/src/Repositories/CategoryRepository.php
@@ -50,7 +50,26 @@ class CategoryRepository extends BaseCategoryRepository
         $parentCategoryIds = [];
 
         if (! $customer) {
-            $categoryIds = app('Webkul\CustomerGroupCatalog\Repositories\CustomerGroupRepository')->findOneByField('code', 'guest')->categories()->pluck('id');
+            $categories = app('Webkul\CustomerGroupCatalog\Repositories\CustomerGroupRepository')->findOneByField('code', 'guest')->categories()->get();
+
+            $categoryIds = app('Webkul\CustomerGroupCatalog\Repositories\CustomerGroupRepository')->findOneByField('code', 'guest')->categories()->pluck('id')->toArray();
+
+            foreach ($categories as $category) {
+                $parentCategoryIds[] = $category->id;
+                $parentCategory = $this->getParentCategory($category->parent_id);
+
+                $result = array_merge($parentCategoryIds, $parentCategory);
+                $count = 0;
+                foreach($result as $cat) {
+                    if (in_array($cat, $categoryIds)) {
+                        $count++;
+                    }
+                }
+
+                if (count($result) == $count) {
+                    $showCategories[] = $category->id;
+                }
+            }
         } else {
             if ($customer->group) {
                 $categories = app('Webkul\CustomerGroupCatalog\Repositories\CustomerGroupRepository')->find($customer->group->id)->categories()->get();