diff --git a/app/Filament/Exports/RequestCharacteristicExporter.php b/app/Filament/Exports/RequestCharacteristicExporter.php index fa6eb67..289e341 100644 --- a/app/Filament/Exports/RequestCharacteristicExporter.php +++ b/app/Filament/Exports/RequestCharacteristicExporter.php @@ -71,7 +71,19 @@ class RequestCharacteristicExporter extends Exporter ExportColumn::make('approved3_at') ->label('APPROVED AT 1'), ExportColumn::make('mail_status') - ->label('MAIL STATUS'), + ->label('MAIL STATUS') + ->formatStateUsing(function ($state) { + if (! $state || $state == '' || $state == null) { + return '-'; + } + + return match ($state) { + 'Sent' => 'Sent-M1', + 'Sent-Mail2' => 'Sent-M2', + 'Sent-Mail3' => 'Sent-M3', + default => '-', + }; + }), ExportColumn::make('trigger_at') ->label('TRIGGERED AT'), ExportColumn::make('created_at') diff --git a/app/Filament/Resources/RequestCharacteristicResource.php b/app/Filament/Resources/RequestCharacteristicResource.php index f3c4d64..76b8a87 100644 --- a/app/Filament/Resources/RequestCharacteristicResource.php +++ b/app/Filament/Resources/RequestCharacteristicResource.php @@ -1037,21 +1037,19 @@ class RequestCharacteristicResource extends Resource } return match ($state) { - 'Sent' => 'Sent-Mail1', - 'Sent-Mail2' => 'Sent-Mail2', - 'Sent-Mail3' => 'Sent-Mail3', + 'Sent' => 'Sent-M1', + 'Sent-Mail2' => 'Sent-M2', + 'Sent-Mail3' => 'Sent-M3', default => '-', }; }) - ->sortable() - ->toggleable(isToggledHiddenByDefault: true), + ->sortable(), Tables\Columns\TextColumn::make('trigger_at') ->label('Trigger At') ->dateTime() ->alignCenter() ->searchable() - ->sortable() - ->toggleable(isToggledHiddenByDefault: true), + ->sortable(), Tables\Columns\TextColumn::make('created_at') ->label('Created At') ->dateTime()