diff --git a/app/Filament/Exports/AxnExporter.php b/app/Filament/Exports/AxnExporter.php index 43fbbb1..75a0413 100644 --- a/app/Filament/Exports/AxnExporter.php +++ b/app/Filament/Exports/AxnExporter.php @@ -14,15 +14,15 @@ class AxnExporter extends Exporter public static function getColumns(): array { - static $rowNumber = 0; + // static $rowNumber = 0; return [ - ExportColumn::make('no') - ->label('NO') - ->state(function ($record) use (&$rowNumber) { - // Increment and return the row number - return ++$rowNumber; - }), + // ExportColumn::make('no') + // ->label('NO') + // ->state(function ($record) use (&$rowNumber) { + // // Increment and return the row number + // return ++$rowNumber; + // }), // ExportColumn::make('plant.code') // ->label('PLANT CODE'), // ExportColumn::make('invoice_number') @@ -45,7 +45,11 @@ class AxnExporter extends Exporter ExportColumn::make('serial_number') ->label('SERIAL NUMBER') ->state(function ($record) { - return substr($record->serial_number, 8); + $sn = $record->serial_number; + + $offset = 2 + 2 + 4; + + return substr($sn, $offset); }), ]; } diff --git a/app/Filament/Resources/InvoiceValidationResource.php b/app/Filament/Resources/InvoiceValidationResource.php index bd91a4c..1ab0ffa 100644 --- a/app/Filament/Resources/InvoiceValidationResource.php +++ b/app/Filament/Resources/InvoiceValidationResource.php @@ -1135,20 +1135,20 @@ class InvoiceValidationResource extends Resource ->visible(function () { return Filament::auth()->user()->can('view import invoice'); }), - ExportAction::make() + ExportAction::make('invoice_export') ->label('Export Invoices') ->color('warning') ->exporter(InvoiceValidationExporter::class) ->visible(function () { return Filament::auth()->user()->can('view export invoice'); }), - // ExportAction::make() - // ->label('Export Asn') - // ->color('warning') - // ->exporter(AxnExporter::class) - // ->visible(function () { - // return Filament::auth()->user()->can('view export asn invoice'); - // }), + ExportAction::make('axn_export') + ->label('Export Asn') + ->color('warning') + ->exporter(AxnExporter::class) + ->visible(function () { + return Filament::auth()->user()->can('view export asn invoice'); + }), ]) ->filters([