Merge pull request 'Updated mail_status value in proper manner in report view / export' (#514) from ranjith-dev into master
Some checks are pending
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Waiting to run

Reviewed-on: #514
This commit was merged in pull request #514.
This commit is contained in:
2026-04-08 07:33:58 +00:00
2 changed files with 18 additions and 8 deletions

View File

@@ -71,7 +71,19 @@ class RequestCharacteristicExporter extends Exporter
ExportColumn::make('approved3_at') ExportColumn::make('approved3_at')
->label('APPROVED AT 1'), ->label('APPROVED AT 1'),
ExportColumn::make('mail_status') 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') ExportColumn::make('trigger_at')
->label('TRIGGERED AT'), ->label('TRIGGERED AT'),
ExportColumn::make('created_at') ExportColumn::make('created_at')

View File

@@ -1037,21 +1037,19 @@ class RequestCharacteristicResource extends Resource
} }
return match ($state) { return match ($state) {
'Sent' => 'Sent-Mail1', 'Sent' => 'Sent-M1',
'Sent-Mail2' => 'Sent-Mail2', 'Sent-Mail2' => 'Sent-M2',
'Sent-Mail3' => 'Sent-Mail3', 'Sent-Mail3' => 'Sent-M3',
default => '-', default => '-',
}; };
}) })
->sortable() ->sortable(),
->toggleable(isToggledHiddenByDefault: true),
Tables\Columns\TextColumn::make('trigger_at') Tables\Columns\TextColumn::make('trigger_at')
->label('Trigger At') ->label('Trigger At')
->dateTime() ->dateTime()
->alignCenter() ->alignCenter()
->searchable() ->searchable()
->sortable() ->sortable(),
->toggleable(isToggledHiddenByDefault: true),
Tables\Columns\TextColumn::make('created_at') Tables\Columns\TextColumn::make('created_at')
->label('Created At') ->label('Created At')
->dateTime() ->dateTime()