diff --git a/04_Laravel/app/Filament/Resources/CustomerCreditResource.php b/04_Laravel/app/Filament/Resources/CustomerCreditResource.php index 33521d6..23d3bce 100644 --- a/04_Laravel/app/Filament/Resources/CustomerCreditResource.php +++ b/04_Laravel/app/Filament/Resources/CustomerCreditResource.php @@ -134,11 +134,16 @@ class CustomerCreditResource extends Resource 'has_available' => 'باقیمانده', ]) ->query(function ($query, $filter) { - match ($filter->getState()) { + $state = $filter->getState(); + if (is_array($state)) { + $state = $state['value'] ?? null; + } + match ($state) { 'has_limit' => $query->where('credit_limit', '>', 0), 'no_limit' => $query->where('credit_limit', 0), 'has_used' => $query->where('credit_used', '>', 0), 'has_available' => $query->whereRaw('credit_limit - credit_used > 0'), + default => null, }; }), ]) diff --git a/04_Laravel/app/Filament/Resources/ShipmentChecklistResource.php b/04_Laravel/app/Filament/Resources/ShipmentChecklistResource.php index 81b29b0..899ee04 100644 --- a/04_Laravel/app/Filament/Resources/ShipmentChecklistResource.php +++ b/04_Laravel/app/Filament/Resources/ShipmentChecklistResource.php @@ -128,9 +128,11 @@ class ShipmentChecklistResource extends Resource 'pending' => 'در انتظار', ]) ->query(function ($query, $filter) { - match ($filter->getState()) { + $state = is_array($filter->getState()) ? ($filter->getState()['value'] ?? null) : $filter->getState(); + match ($state) { 'completed' => $query->where('is_completed', true), 'pending' => $query->where('is_completed', false), + default => null, }; }), Tables\Filters\SelectFilter::make('status') diff --git a/04_Laravel/app/Models/ShipmentChecklist.php b/04_Laravel/app/Models/ShipmentChecklist.php index 55e7b0f..49171a1 100644 --- a/04_Laravel/app/Models/ShipmentChecklist.php +++ b/04_Laravel/app/Models/ShipmentChecklist.php @@ -4,11 +4,10 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; -use Illuminate\Database\Eloquent\SoftDeletes; class ShipmentChecklist extends Model { - use HasFactory, SoftDeletes; + use HasFactory; protected $fillable = [ 'shipment_id',