From 5c38b5a5dcaca7b57cf8f49822525024f1e6c8a9 Mon Sep 17 00:00:00 2001
From: tmStore <tmstore@iMac-tmStore.local>
Date: Tue, 5 Sep 2023 14:55:44 +0500
Subject: [PATCH 1/2] vendor api

---
 packages/Sarga/API/Http/Controllers/SellerProduct.php | 3 +--
 packages/Sarga/API/Http/Controllers/Vendors.php       | 5 +++--
 packages/Sarga/API/Http/Resources/Catalog/Product.php | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/Sarga/API/Http/Controllers/SellerProduct.php b/packages/Sarga/API/Http/Controllers/SellerProduct.php
index 0dfef91..6a21afd 100644
--- a/packages/Sarga/API/Http/Controllers/SellerProduct.php
+++ b/packages/Sarga/API/Http/Controllers/SellerProduct.php
@@ -277,8 +277,7 @@ class SellerProduct extends SellerProductController
             //$images = json_decode($request['images']['files'][0]);
             //\Log::info($images);
             //\Log::info($request->all());
-            \Log::info($request['images']);
-            \Log::info($request['surats']);
+
             //	    dd($request->get('images'));
             //	    dd($request['images']);
             $data = array(
diff --git a/packages/Sarga/API/Http/Controllers/Vendors.php b/packages/Sarga/API/Http/Controllers/Vendors.php
index ead660e..f855a1c 100644
--- a/packages/Sarga/API/Http/Controllers/Vendors.php
+++ b/packages/Sarga/API/Http/Controllers/Vendors.php
@@ -65,11 +65,12 @@ class Vendors extends V1Controller
 
     public function index()
     {
-        $vendors = $this->vendorRepository->select('marketplace_sellers.id','url','logo','banner','shop_title','brand_attribute_id','ship_time','ship_price','slogan')
+        $vendors = $this->vendorRepository->select('marketplace_sellers.id','url','logo','banner','shop_title', 'ship_time','ship_price','slogan')
             ->where('is_approved',true)
             ->with(['categories:seller_id,categories'])
 //            ->leftJoin('seller_categories','marketplace_sellers.id','=','seller_categories.seller_id')
-            ->get();
+            ->paginate(15);
+
         $reviewed_vendors = $vendors->map(function ($item, $key){
             $item->review_average = $this->reviewRepository->getAverageRating($item);
             return $item;
diff --git a/packages/Sarga/API/Http/Resources/Catalog/Product.php b/packages/Sarga/API/Http/Resources/Catalog/Product.php
index e9c3137..5fb63c2 100644
--- a/packages/Sarga/API/Http/Resources/Catalog/Product.php
+++ b/packages/Sarga/API/Http/Resources/Catalog/Product.php
@@ -50,12 +50,13 @@ class Product extends JsonResource
             'in_stock'               => $product->haveSufficientQuantity(1),
             'is_wishlisted'          => $this->isWishlisted($product) ,
             'is_item_in_cart'        => \Cart::hasProduct($product),
-            //'shop_title'             => $this->shop_title,
-            //'logo'               => $this->logo ? Storage::url($this->logo) : null,
+            'shop_title'             => $this->shop_title,
+            'logo'               => $this->logo ? Storage::url($this->logo) : null,
             'new'                    => $this->new,
             'featured'               => $this->featured,
             'qty'               => $this->qty,
             'status'               => $this->status,
+            'product_number'               => $this->product_number,
             // 'brand'                  => $product->brand->name ?? '',
 
 

From e015dacd494807b7a97e2bf48a4c5c64ebc4e01d Mon Sep 17 00:00:00 2001
From: Shohrat <shokki.a96@gmail.com>
Date: Tue, 5 Sep 2023 15:10:21 +0500
Subject: [PATCH 2/2] vendor api

---
 packages/Sarga/API/Http/Controllers/Vendors.php   | 10 +++++-----
 packages/Sarga/API/Http/Resources/Core/Vendor.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/Sarga/API/Http/Controllers/Vendors.php b/packages/Sarga/API/Http/Controllers/Vendors.php
index f855a1c..36f46fe 100644
--- a/packages/Sarga/API/Http/Controllers/Vendors.php
+++ b/packages/Sarga/API/Http/Controllers/Vendors.php
@@ -71,12 +71,12 @@ class Vendors extends V1Controller
 //            ->leftJoin('seller_categories','marketplace_sellers.id','=','seller_categories.seller_id')
             ->paginate(15);
 
-        $reviewed_vendors = $vendors->map(function ($item, $key){
-            $item->review_average = $this->reviewRepository->getAverageRating($item);
-            return $item;
-        });
+        // $reviewed_vendors = $vendors->map(function ($item, $key){
+        //     $item->review_average = $this->reviewRepository->getAverageRating($item);
+        //     return $item;
+        // });
 
-        return Vendor::collection($reviewed_vendors);
+        return Vendor::collection($vendors);
     }
 
     public function products(ProductRepository $productRepository,$seller_id){
diff --git a/packages/Sarga/API/Http/Resources/Core/Vendor.php b/packages/Sarga/API/Http/Resources/Core/Vendor.php
index 0dcba67..38c56e3 100644
--- a/packages/Sarga/API/Http/Resources/Core/Vendor.php
+++ b/packages/Sarga/API/Http/Resources/Core/Vendor.php
@@ -23,7 +23,7 @@ class Vendor extends JsonResource
             'banner'     => $this->banner_url,
             'ship_price'     => $this->ship_price,
             'ship_time'     => $this->ship_time,
-            'review_average' => $this->review_average,
+            // 'review_average' => $this->review_average,
             'slogan' => $this->slogan,
             // 'brand_id'   => $this->brand_attribute_id,
             // $this->mergeWhen(!empty($this->main_categories) && $this->main_categories->count(),[