merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Customer group catalog fixed

This commit is contained in:
Prashant Singh 2019-06-24 19:23:20 +05:30
parent 35c8402749
commit 3382ffc076
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/app.php
View File

@ -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
],
/*

2
packages/Webkul/CustomerGroupCatalog/src/Models/CustomerGroup.php
View File

@ -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;

21
packages/Webkul/CustomerGroupCatalog/src/Repositories/CategoryRepository.php
View File

@ -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();