|
@@ -400,12 +400,14 @@ class Client extends Model
|
|
public function supplyOrders()
|
|
public function supplyOrders()
|
|
{
|
|
{
|
|
return $this->hasMany(SupplyOrder::class, 'client_id', 'id')
|
|
return $this->hasMany(SupplyOrder::class, 'client_id', 'id')
|
|
|
|
+ ->where('is_cancelled', false)
|
|
->orderBy('created_at', 'desc');
|
|
->orderBy('created_at', 'desc');
|
|
}
|
|
}
|
|
|
|
|
|
public function unshippedSupplyOrders()
|
|
public function unshippedSupplyOrders()
|
|
{
|
|
{
|
|
return $this->hasMany(SupplyOrder::class, 'client_id', 'id')
|
|
return $this->hasMany(SupplyOrder::class, 'client_id', 'id')
|
|
|
|
+ ->where('is_cancelled', false)
|
|
->whereNull('shipment_id')
|
|
->whereNull('shipment_id')
|
|
->orderBy('created_at', 'desc');
|
|
->orderBy('created_at', 'desc');
|
|
}
|
|
}
|