merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

order status error fix

This commit is contained in:
merdan 2022-12-05 12:46:01 +05:00
parent eec0508967
commit 44310c1351
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Sarga/API/Http/Controllers/Vendors.php
View File

@ -23,7 +23,7 @@ class Vendors extends V1Controller
public function sources(){ public function sources(){
$vendors = $this->vendorRepository->select('marketplace_sellers.id','url','shop_title') $vendors = $this->vendorRepository->select('marketplace_sellers.id','url','shop_title')
->where('is_approved',true) ->where('is_approved',true)
->with(['categories:seller_id,type,categories']) // ->with(['categories:seller_id,type,categories'])
// ->leftJoin('seller_categories','marketplace_sellers.id','=','seller_categories.seller_id') // ->leftJoin('seller_categories','marketplace_sellers.id','=','seller_categories.seller_id')
->get(); ->get();
//return $vendors; //return $vendors;

6
packages/Sarga/API/Http/Resources/Core/Source.php
View File

@ -18,9 +18,9 @@ class Source extends \Illuminate\Http\Resources\Json\JsonResource
'id' => $this->id, 'id' => $this->id,
'shop_title' => $this->shop_title, 'shop_title' => $this->shop_title,
'logo' => $this->logo_url, 'logo' => $this->logo_url,
$this->mergeWhen(!empty($this->main_categories) && $this->main_categories->count(),[ // $this->mergeWhen(!empty($this->main_categories) && $this->main_categories->count(),[
'categories' => VendorCategory::collection($this->main_categories) // 'categories' => VendorCategory::collection($this->main_categories)
]) // ])
]; ];
} }
} }

8
packages/Sarga/Shop/src/Models/Order.php
View File

@ -36,5 +36,11 @@ class Order extends \Webkul\Sales\Models\Order implements \Sarga\Shop\Contracts\
public function canInvoice(): bool{ public function canInvoice(): bool{
return $this->status === self::STATUS_SHIPPING && parent::canInvoice(); return $this->status === self::STATUS_SHIPPING && parent::canInvoice();
} }
/**
* Returns the status label from status code
*/
public function getStatusLabelAttribute()
{
return $this->statusLabel[$this->status];
}
} }