From 0a92c9cf6d20cd3c05686759b4d4e8afabc3cbfb Mon Sep 17 00:00:00 2001
From: merdan <merdan.m@gmail.com>
Date: Sun, 25 Sep 2022 21:06:53 +0500
Subject: [PATCH] admin menu filter and seller

---
 packages/Sarga/API/Http/Controllers/Vendors.php    | 11 +++++++++--
 packages/Sarga/API/Http/Resources/Catalog/Menu.php |  1 +
 packages/Sarga/API/Http/Resources/Core/Vendor.php  |  9 ++-------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/Sarga/API/Http/Controllers/Vendors.php b/packages/Sarga/API/Http/Controllers/Vendors.php
index 949359ae8..1fc682d8f 100644
--- a/packages/Sarga/API/Http/Controllers/Vendors.php
+++ b/packages/Sarga/API/Http/Controllers/Vendors.php
@@ -56,8 +56,15 @@ class Vendors extends V1Controller
     }
 
     public function menus(MenuRepository $repository){
-        $menus = $repository->where('status',1)->with(['categories','brands'])->orderBy('position','asc')->get();
-        return Menu::collection($menus);
+        $vendors = $this->vendorRepository->select('marketplace_sellers.id','url','shop_title')
+            ->where('is_approved',true)
+            ->with(['menus' => function($query){
+                $query->where('status',1)
+                    ->with(['categories','brands'])
+                    ->orderBy('position','asc')
+            }])
+        return Vendor::collection($vendors)
+
     }
 
     public function index()
diff --git a/packages/Sarga/API/Http/Resources/Catalog/Menu.php b/packages/Sarga/API/Http/Resources/Catalog/Menu.php
index 6fc930f9e..782a06cb3 100644
--- a/packages/Sarga/API/Http/Resources/Catalog/Menu.php
+++ b/packages/Sarga/API/Http/Resources/Catalog/Menu.php
@@ -17,6 +17,7 @@ class Menu extends JsonResource
         return [
             'id'          => $this->id,
             'name'        => $this->name,
+            'filter'      => $this->filter,
             'description' => $this->description,
             'categories'  => Category::collection($this->categories),
             'brands'      => Brands::collection($this->brands)
diff --git a/packages/Sarga/API/Http/Resources/Core/Vendor.php b/packages/Sarga/API/Http/Resources/Core/Vendor.php
index 3dd6b6196..792ead41b 100644
--- a/packages/Sarga/API/Http/Resources/Core/Vendor.php
+++ b/packages/Sarga/API/Http/Resources/Core/Vendor.php
@@ -4,6 +4,7 @@ namespace Sarga\API\Http\Resources\Core;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 use Sarga\API\Http\Resources\Catalog\Category;
+use Sarga\API\Http\Resources\Catalog\Menu;
 
 class Vendor extends JsonResource
 {
@@ -17,15 +18,9 @@ class Vendor extends JsonResource
     {
         return [
             'id'         => $this->id,
-            'url'        => $this->url,
             'shop_title' => $this->shop_title,
             'logo'       => $this->logo_url,
-            'banner'     => $this->banner_url,
-            'brand_id'   => $this->brand_attribute_id,
-            $this->mergeWhen(!empty($this->main_categories) && $this->main_categories->count(),[
-                'categories' => Category::collection($this->main_categories)
-            ])
-
+            'menus'      => Menu::collection($this->menus)
         ];
     }
 }
\ No newline at end of file