diff --git a/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleRepository.php b/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleRepository.php index 5456bbe50..92a43cd55 100644 --- a/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleRepository.php +++ b/packages/Webkul/CatalogRule/src/Repositories/CatalogRuleRepository.php @@ -3,10 +3,10 @@ namespace Webkul\CatalogRule\Repositories; use Illuminate\Container\Container; +use Webkul\Core\Eloquent\Repository; use Webkul\Attribute\Repositories\AttributeFamilyRepository; use Webkul\Attribute\Repositories\AttributeRepository; use Webkul\Category\Repositories\CategoryRepository; -use Webkul\Core\Eloquent\Repository; use Webkul\Tax\Repositories\TaxCategoryRepository; class CatalogRuleRepository extends Repository @@ -75,7 +75,6 @@ class CatalogRuleRepository extends Repository */ public function update(array $data, $id, $attribute = 'id') { - $data = array_merge($data, [ 'starts_from' => $data['starts_from'] ?: null, 'ends_till' => $data['ends_till'] ?: null, diff --git a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php index 0eb98bee3..f4acd2e87 100755 --- a/packages/Webkul/Category/src/Http/Controllers/CategoryController.php +++ b/packages/Webkul/Category/src/Http/Controllers/CategoryController.php @@ -5,10 +5,10 @@ namespace Webkul\Category\Http\Controllers; use Illuminate\Support\Facades\Event; use Webkul\Admin\DataGrids\CategoryDataGrid; use Webkul\Admin\DataGrids\CategoryProductDataGrid; +use Webkul\Core\Repositories\ChannelRepository; +use Webkul\Category\Repositories\CategoryRepository; use Webkul\Attribute\Repositories\AttributeRepository; use Webkul\Category\Http\Requests\CategoryRequest; -use Webkul\Category\Repositories\CategoryRepository; -use Webkul\Core\Models\Channel; class CategoryController extends Controller { @@ -22,11 +22,13 @@ class CategoryController extends Controller /** * Create a new controller instance. * + * @param \Webkul\Core\Repositories\ChannelRepository $channelRepository * @param \Webkul\Category\Repositories\CategoryRepository $categoryRepository * @param \Webkul\Attribute\Repositories\AttributeRepository $attributeRepository * @return void */ public function __construct( + protected ChannelRepository $channelRepository, protected CategoryRepository $categoryRepository, protected AttributeRepository $attributeRepository ) @@ -235,7 +237,7 @@ class CategoryController extends Controller static $rootIdInChannels; if (! $rootIdInChannels) { - $rootIdInChannels = Channel::pluck('root_category_id'); + $rootIdInChannels = $this->channelRepository->pluck('root_category_id'); } return $category->id === 1 || $rootIdInChannels->contains($category->id);