From 30dd6c109c65e1cda2cbb868ca77e32cbab6c3ff Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 27 Sep 2022 14:57:02 +0500 Subject: [PATCH] admin menu filter and seller --- .../Sarga/Admin/src/Http/Controllers/Menus.php | 14 +++++++++----- .../Resources/views/catalog/menus/edit.blade.php | 2 +- .../Resources/views/admin/sellers/edit.blade.php | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/Sarga/Admin/src/Http/Controllers/Menus.php b/packages/Sarga/Admin/src/Http/Controllers/Menus.php index 3a47db2d2..ba4a52f1a 100644 --- a/packages/Sarga/Admin/src/Http/Controllers/Menus.php +++ b/packages/Sarga/Admin/src/Http/Controllers/Menus.php @@ -6,7 +6,9 @@ use Sarga\Admin\Http\Requests\MenuRequest; use Sarga\Shop\Repositories\CategoryRepository; use Sarga\Shop\Repositories\MenuRepository; use Sarga\Brand\Repositories\BrandRepository; +use Sarga\Shop\Repositories\VendorRepository; use Webkul\Admin\Http\Controllers\Controller; +use Webkul\Marketplace\Repositories\SellerRepository; class Menus extends Controller { @@ -18,7 +20,8 @@ class Menus extends Controller protected $_config; public function __construct( - protected MenuRepository $mRepository + protected MenuRepository $mRepository, + protected SellerRepository $sellerRepository ) { $this->_config = request('_config'); @@ -34,13 +37,13 @@ class Menus extends Controller public function create(CategoryRepository $repository){ $categories = $repository->getCategoryTree(null, ['id']); - - return view($this->_config['view'], compact('categories')); + $sellers = app(VendorRepository::class)->all(); + return view($this->_config['view'], compact('categories','sellers')); } public function store(MenuRequest $request){ - $category = $this->mRepository->create($request->all()); + $this->mRepository->create($request->all()); session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Menu'])); @@ -50,7 +53,8 @@ class Menus extends Controller public function edit(CategoryRepository $repository,$id){ $menu = $this->mRepository->findOrFail($id); $categories = $repository->getCategoryTree(null, ['id']); - return view($this->_config['view'], compact('menu','categories')); + $sellers = app(VendorRepository::class)->all(); + return view($this->_config['view'], compact('menu','categories','sellers')); } public function update(MenuRequest $request,$id){ diff --git a/packages/Sarga/Admin/src/Resources/views/catalog/menus/edit.blade.php b/packages/Sarga/Admin/src/Resources/views/catalog/menus/edit.blade.php index 98cc5b06d..e9207d089 100644 --- a/packages/Sarga/Admin/src/Resources/views/catalog/menus/edit.blade.php +++ b/packages/Sarga/Admin/src/Resources/views/catalog/menus/edit.blade.php @@ -104,7 +104,7 @@ @include('sarga_admin::catalog.menus.menu-brand-links')
- sellers->pluck('id')->toArray()) ?> + sellers->pluck('id')->toArray());?>
diff --git a/packages/Webkul/Marketplace/src/Resources/views/admin/sellers/edit.blade.php b/packages/Webkul/Marketplace/src/Resources/views/admin/sellers/edit.blade.php index a22027d2d..be2d4c5f5 100644 --- a/packages/Webkul/Marketplace/src/Resources/views/admin/sellers/edit.blade.php +++ b/packages/Webkul/Marketplace/src/Resources/views/admin/sellers/edit.blade.php @@ -91,13 +91,13 @@
-
-