From 7c54b469bc16c1138b134c747a24afb962adda2f Mon Sep 17 00:00:00 2001 From: merdan Date: Thu, 20 Jan 2022 11:54:44 +0500 Subject: [PATCH] main screen categories and products --- packages/Sarga/API/Http/Controllers/Vendors.php | 1 + packages/Sarga/API/Http/Resources/Core/Vendor.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/Sarga/API/Http/Controllers/Vendors.php b/packages/Sarga/API/Http/Controllers/Vendors.php index f23a1c5a5..a2339464d 100644 --- a/packages/Sarga/API/Http/Controllers/Vendors.php +++ b/packages/Sarga/API/Http/Controllers/Vendors.php @@ -43,6 +43,7 @@ class Vendors extends Controller ->with(['children'=> function($q){ $q->orderBy('position','asc'); }]) + ->orderBy('position','asc') ->get(); } diff --git a/packages/Sarga/API/Http/Resources/Core/Vendor.php b/packages/Sarga/API/Http/Resources/Core/Vendor.php index 31327a3dc..39bb54311 100644 --- a/packages/Sarga/API/Http/Resources/Core/Vendor.php +++ b/packages/Sarga/API/Http/Resources/Core/Vendor.php @@ -22,7 +22,10 @@ class Vendor extends JsonResource 'logo' => $this->logo_url, 'banner' => $this->banner_url, 'brand_id' => $this->brand_attribute_id, - 'categories' => Category::collection($this->main_categories), + $this->mergeWhen(!empty($this->main_categories),[ + 'categories' => Category::collection($this->main_categories) + ]) + ]; } } \ No newline at end of file