Update dependency alperenersoy/filament-export to v4

Reviewed-on: #29

app/Filament/Resources/InvoiceValidationResource/Pages/CreateInvoiceValidation.php

@@ -3270,7 +3270,7 @@ class CreateInvoiceValidation extends CreateRecord
                     $hasPumpSetQr = $record->stickerMasterRelation->tube_sticker_pumpset ?? null;
                     $hasCapacitorQr = $record->stickerMasterRelation->panel_box_code ?? null;
 
-                    if (! $hasMotorQr && ! $hasPumpQr && ! $hasPumpSetQr && ! $hasCapacitorQr) {
+                    if (! $hasMotorQr && ! $hasPumpQr && ! $hasPumpSetQr) {// && ! $hasCapacitorQr
                         $hasMotorQr = $record->stickerMasterRelation->pack_slip_motor ?? null;
                         $hasPumpQr = $record->stickerMasterRelation->pack_slip_pump ?? null;
                         $hasPumpSetQr = $record->stickerMasterRelation->pack_slip_pumpset ?? null;
@@ -3278,12 +3278,21 @@ class CreateInvoiceValidation extends CreateRecord
                         $hasPumpQr = $record->stickerMasterRelation->pack_slip_pump ?? null;
                     }
 
+                    $invalidPackage = false;
+                    $hasTubeMotorQr = $record->stickerMasterRelation->tube_sticker_motor ?? null;
+                    $hasPackMotorQr = $record->stickerMasterRelation->pack_slip_motor ?? null;
+                    $hasTubePumpSetQr = $record->stickerMasterRelation->tube_sticker_pumpset ?? null;
+                    $hasPackPumpSetQr = $record->stickerMasterRelation->pack_slip_pumpset ?? null;
+                    if ($hasTubeMotorQr != $hasPackMotorQr || $hasTubePumpSetQr != $hasPackPumpSetQr) {
+                        $invalidPackage = true;
+                    }
+
                     $hadMotorQr = $record->motor_scanned_status ?? null;
                     $hadPumpQr = $record->pump_scanned_status ?? null;
                     $hadPumpSetQr = $record->scanned_status_set ?? null;
                     $hadCapacitorQr = $record->capacitor_scanned_status ?? null;
 
-                    if (! $hasMotorQr && ! $hasPumpQr && ! $hasPumpSetQr && ! $hasCapacitorQr) {
+                    if ((! $hasMotorQr && ! $hasPumpQr && ! $hasPumpSetQr && ! $hasCapacitorQr) || $invalidPackage) {
                         Notification::make()
                             ->title('Invalid: Item Code')
                             ->body("Scanned 'Item Code' doesn't have valid package type to proceed!")

app/Livewire/InvoiceDataTable.php

@@ -2,7 +2,6 @@
 
 namespace App\Livewire;
 
-use App\Filament\Resources\InvoiceValidationResource\Pages\CreateInvoiceValidation;
 use App\Models\InvoiceValidation;
 use App\Models\StickerMaster;
 use Filament\Facades\Filament;
@@ -41,7 +40,7 @@ class InvoiceDataTable extends Component
         'refreshEmptyInvoice' => 'loadEmptyData',
         'refreshInvoiceData' => 'loadData',
         'refreshMaterialInvoiceData' => 'loadMaterialData',
-        'openCapacitorModal' => 'showCapacitorInputBox'
+        'openCapacitorModal' => 'showCapacitorInputBox',
     ];
 
     public $capacitorInput = '';
@@ -127,70 +126,52 @@ class InvoiceDataTable extends Component
             // $stickerMaster = \App\Models\StickerMaster::with('item')->find($row['sticker_master_id'] ?? null);
             $row['code'] = StickerMaster::with('item')->find($row['sticker_master_id'] ?? null)?->item?->code ?? 'N/A';
             $curStick = StickerMaster::where('id', $row['sticker_master_id'])->first();
-            if ($curStick)
-            {
-                if ($curStick->tube_sticker_motor == 1 || $curStick->tube_sticker_pump == 1 || $curStick->tube_sticker_pumpset == 1 || Str::length($curStick->panel_box_code) > 0)
-                {
-                    if ($curStick->tube_sticker_motor == 1)
-                    {
+            if ($curStick) {
+                if (Str::length($curStick->panel_box_code) > 0) {
                     $stickCount++;
                 }
-                    if ($curStick->tube_sticker_pump == 1)
-                    {
+                if ($curStick->tube_sticker_motor == 1 || $curStick->tube_sticker_pump == 1 || $curStick->tube_sticker_pumpset == 1) {
+                    if ($curStick->tube_sticker_motor == 1) {
                         $stickCount++;
                     }
-                    if ($curStick->tube_sticker_pumpset == 1)
-                    {
+                    if ($curStick->tube_sticker_pump == 1 || ($curStick->tube_sticker_pumpset != 1 && $curStick->tube_sticker_pump != 1 && $curStick->pack_slip_pump == 1)) {
                         $stickCount++;
                     }
-                    if (Str::length($curStick->panel_box_code) > 0)
-                    {
+                    if ($curStick->tube_sticker_pumpset == 1) {
                         $stickCount++;
                     }
-                }
-                else if ($curStick->pack_slip_motor == 1 || $curStick->pack_slip_pump == 1 || $curStick->pack_slip_pumpset == 1)
-                {
-                    if ($curStick->pack_slip_motor == 1)
-                    {
+                } elseif ($curStick->pack_slip_motor == 1 || $curStick->pack_slip_pump == 1 || $curStick->pack_slip_pumpset == 1) {
+                    if ($curStick->pack_slip_motor == 1) {
                         $stickCount++;
                     }
-                    if ($curStick->pack_slip_pump == 1)
-                    {
+                    if ($curStick->pack_slip_pump == 1) {
                         $stickCount++;
                     }
-                    if ($curStick->pack_slip_pumpset == 1)
-                    {
+                    if ($curStick->pack_slip_pumpset == 1) {
                         $stickCount++;
                     }
                 }
             }
 
-            if ($row['motor_scanned_status'] == 1)
-            {
+            if ($row['motor_scanned_status'] == 1) {
                 $scannedCount++;
             }
-            if ($row['pump_scanned_status'] == 1)
-            {
+            if ($row['pump_scanned_status'] == 1) {
                 $scannedCount++;
             }
-            if ($row['capacitor_scanned_status'] == 1)
-            {
+            if ($row['capacitor_scanned_status'] == 1) {
                 $scannedCount++;
             }
-            if ($row['scanned_status_set'] == 1)
-            {
+            if ($row['scanned_status_set'] == 1) {
                 $scannedCount++;
             }
 
             $this->packageCount += $stickCount - $scannedCount;
         }
 
-        if ($onCapFocus)
-        {
+        if ($onCapFocus) {
             $this->dispatch('focus-capacitor-input');
-        }
-        else
-        {
+        } else {
             $this->dispatch('focus-serial-number');
         }
     }
@@ -228,20 +209,13 @@ class InvoiceDataTable extends Component
             // $stickerMaster = \App\Models\StickerMaster::with('item')->find($row['sticker_master_id'] ?? null);
             $row['code'] = StickerMaster::with('item')->find($row['sticker_master_id'] ?? null)?->item?->code ?? 'N/A';
             $matType = StickerMaster::where('id', $row['sticker_master_id'] ?? null)->first()->material_type ?? '';
-           if ($matType === 1)
-           {
+            if ($matType === 1) {
                 $row['material_type'] = 'Individual';
-           }
-           else if ($matType === 2)
-           {
+            } elseif ($matType === 2) {
                 $row['material_type'] = 'Bundle';
-           }
-           else if ($matType === 3)
-           {
+            } elseif ($matType === 3) {
                 $row['material_type'] = 'Quantity';
-           }
-           else
-           {
+            } else {
                 $row['material_type'] = 'N/A';
             }
         }
@@ -287,6 +261,7 @@ class InvoiceDataTable extends Component
                 // ->duration(3000)
                 ->seconds(2)
                 ->send();
+
             return;
         }
 
@@ -309,12 +284,12 @@ class InvoiceDataTable extends Component
                 ->seconds(2)
                 ->send();
             $this->capacitorInput = '';
+
             return;
         }
 
         foreach ($this->invoiceData as &$row) {
-            if (($row['code'] ?? '') === $this->currentItemCode && ($row['serial_number'] ?? '') === $this->currentSerialNumber)
-            {
+            if (($row['code'] ?? '') === $this->currentItemCode && ($row['serial_number'] ?? '') === $this->currentSerialNumber) {
                 $row['panel_box_supplier'] = $supplier;
                 $row['panel_box_item_code'] = $itemCode;
                 $row['panel_box_serial_number'] = $serialNumber;
@@ -343,8 +318,7 @@ class InvoiceDataTable extends Component
                     $packCnt = 1;
                     $scanCnt = 1;
                     // if ($hadMotorQr === $hasMotorQr && $hadPumpQr === $hasPumpQr && $hadPumpSetQr === $hasPumpSetQr)
-                    if ($hasMotorQr || $hasPumpQr || $hasPumpSetQr)
-                    {
+                    if ($hasMotorQr || $hasPumpQr || $hasPumpSetQr) {
                         $packCnt = $hasMotorQr ? $packCnt + 1 : $packCnt;
                         $packCnt = $hasPumpQr ? $packCnt + 1 : $packCnt;
                         $packCnt = $hasPumpSetQr ? $packCnt + 1 : $packCnt;
@@ -353,8 +327,7 @@ class InvoiceDataTable extends Component
                         $scanCnt = $hadPumpQr ? $scanCnt + 1 : $scanCnt;
                         $scanCnt = $hadPumpSetQr ? $scanCnt + 1 : $scanCnt;
 
-                        if ($packCnt === $scanCnt)
-                        {
+                        if ($packCnt === $scanCnt) {
                             $matchingValidation->update([
                                 'panel_box_supplier' => $supplier,
                                 'panel_box_item_code' => $itemCode,
@@ -363,9 +336,7 @@ class InvoiceDataTable extends Component
                                 'scanned_status' => 'Scanned',
                                 'operator_id' => $operatorName,
                             ]);
-                        }
-                        else
-                        {
+                        } else {
                             $matchingValidation->update([
                                 'panel_box_supplier' => $supplier,
                                 'panel_box_item_code' => $itemCode,
@@ -374,9 +345,7 @@ class InvoiceDataTable extends Component
                                 'operator_id' => $operatorName,
                             ]);
                         }
-                    }
-                    else
-                    {
+                    } else {
                         $matchingValidation->update([
                             'panel_box_supplier' => $supplier,
                             'panel_box_item_code' => $itemCode,
@@ -405,8 +374,7 @@ class InvoiceDataTable extends Component
                     //     'scanned_quantity'=> $scannedQuantity,
                     // ]);
 
-                    if ($totalQuantity === $scannedQuantity)
-                    {
+                    if ($totalQuantity === $scannedQuantity) {
                         Notification::make()
                             ->title('Completed: Serial Invoice')
                             ->body("Serial invoice '$matchingValidation->invoice_number' completed the scanning process.<br>Scan the next 'Serial Invoice' to proceed!")
@@ -414,9 +382,7 @@ class InvoiceDataTable extends Component
                             ->seconds(2)
                             ->send();
                         $this->loadCompletedData($matchingValidation->invoice_number, $matchingValidation->plant_id, true);
-                    }
-                    else
-                    {
+                    } else {
                         $this->loadData($matchingValidation->invoice_number, $matchingValidation->plant_id, false);
                     }
                 }
@@ -435,5 +401,4 @@ class InvoiceDataTable extends Component
     {
         return view('livewire.invoice-data-table');
     }
-
 }

app/Mail/InvoiceDataMail.php

@@ -2,13 +2,13 @@
 
 namespace App\Mail;
 
+use App\Models\InvoiceDataValidation;
+use DateTime;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
-use DateTime;
 
 class InvoiceDataMail extends Mailable
 {
@@ -23,7 +23,7 @@ class InvoiceDataMail extends Mailable
     /**
      * Create a new message instance.
      */
-    public function __construct($scheduleType, $tableData = [], $mailSubject)
+    public function __construct($scheduleType, $tableData, $mailSubject)
     {
         $this->scheduleType = $scheduleType;
         $this->tableData = $tableData ?? [];
@@ -48,12 +48,14 @@ class InvoiceDataMail extends Mailable
         $greeting = 'Dear Sir/Madam,<br><br>We are sending here with list of "Despatch pending sale invoice & STO invoice as on date"';
 
         if ($this->scheduleType == 'Daily') {
-            $firstRecord = \App\Models\InvoiceDataValidation::orderBy('document_date', 'asc')->first();
-            //$lastRecord = \App\Models\InvoiceDataValidation::orderBy('document_date', 'desc')->first();
+            $firstRecord = InvoiceDataValidation::orderBy('document_date', 'asc')->first(); // 'desc'
 
-            if ($firstRecord) {
+            $startDate = null;
+            if ($firstRecord && $firstRecord?->document_date != null && $firstRecord?->document_date != '') {
                 $startDate = \Carbon\Carbon::parse($firstRecord->document_date)->startOfDay();
                 // $endDate = \Carbon\Carbon::parse($lastRecord->document_date)->endOfDay();
+            } else {
+                $startDate = now()->subDay()->setTime(10, 0, 0);
             }
             $endDate = now()->setTime(10, 0, 0);
 
@@ -81,10 +83,10 @@ class InvoiceDataMail extends Mailable
         return new Content(
             view: 'mail.invoice_data_report',
             with: [
-                'company' => "CRI Digital Manufacturing Solutions",
+                'company' => 'CRI Digital Manufacturing Solutions',
                 'greeting' => $greeting,
                 'tableData' => $this->tableData,
-                'wishes' => "Thanks & Regards,<br>CRI Digital Manufacturing Solutions"
+                'wishes' => 'Thanks & Regards,<br>CRI Digital Manufacturing Solutions',
             ],
         );
     }

composer.json

@@ -7,7 +7,7 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
-        "alperenersoy/filament-export": "^3.0",
+        "alperenersoy/filament-export": "^4.0",
         "althinect/filament-spatie-roles-permissions": "^2.3",
         "erag/laravel-pwa": "^1.9",
         "filament/filament": "^3.3",

routes/console.php

@@ -1,10 +1,11 @@
 <?php
 
-use App\Models\AlertMailRule;
-use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Inspiring;
 use Illuminate\Support\Facades\Artisan;
-use Illuminate\Support\Facades\Schema;
+use App\Models\AlertMailRule;
+use Illuminate\Console\Scheduling\Schedule;
+
+
 
 Artisan::command('inspire', function () {
     $this->comment(Inspiring::quote());
@@ -13,88 +14,84 @@ Artisan::command('inspire', function () {
 //     Schedule::command('send:invoice-report');
 //   Schedule::command('send:production-report');
 
-// app()->booted(function () {
-//     $schedule = app(Schedule::class);
+app()->booted(function () {
+    $schedule = app(Schedule::class);
 
-//     // $schedule->command('report:send-daily-production')->dailyAt('07:59');
+    // $schedule->command('report:send-daily-production')->dailyAt('07:59');
+        // Production report scheduling
+        $productionRules = AlertMailRule::where('module', 'ProductionQuantities')
+            ->where('rule_name', 'ProductionMail')
+            ->select('plant', 'schedule_type')
+            ->distinct()
+            ->get();
 
-//     if (Schema::hasTable('alert_mail_rules')) {
+        foreach ($productionRules as $rule) {
+            $type = $rule->schedule_type;
+            $plantId = $rule->plant;
 
-//         // Production report scheduling
-//         $productionRules = AlertMailRule::where('module', 'ProductionQuantities')
-//             ->where('rule_name', 'ProductionMail')
-//             ->select('plant', 'schedule_type')
-//             ->distinct()
-//             ->get();
+            $command = $schedule->command('send:production-report', [$type, $plantId]);
+            // ->appendOutputTo(storage_path('logs/scheduler.log'));
 
-//         foreach ($productionRules as $rule) {
-//             $type = $rule->schedule_type;
-//             $plantId = $rule->plant;
+            switch ($type) {
+                case 'Live':
+                    $command->everyMinute();
+                    break;
+                case 'Hourly':
+                    $command->hourly();
+                    break;
+                case 'Daily':
+                    $command->dailyAt('07:59');
+                    break;
+            }
+        }
 
-//             $command = $schedule->command('send:production-report', [$type, $plantId]);
-//             // ->appendOutputTo(storage_path('logs/scheduler.log'));
+        // Invoice report scheduling
+        $invoiceRules = AlertMailRule::where('module', 'InvoiceValidation')
+            ->select('plant', 'schedule_type')
+            ->distinct()
+            ->get();
 
-//             switch ($type) {
-//                 case 'Live':
-//                     $command->everyMinute();
-//                     break;
-//                 case 'Hourly':
-//                     $command->hourly();
-//                     break;
-//                 case 'Daily':
-//                     $command->dailyAt('07:59');
-//                     break;
-//             }
-//         }
+        foreach ($invoiceRules as $rule) {
+            $type = $rule->schedule_type;
+            $plantId = $rule->plant;
 
-//         // Invoice report scheduling
-//         $invoiceRules = AlertMailRule::where('module', 'InvoiceValidation')
-//             ->select('plant', 'schedule_type')
-//             ->distinct()
-//             ->get();
+            $command = $schedule->command('send:invoice-report', [$type, $plantId]);
 
-//         foreach ($invoiceRules as $rule) {
-//             $type = $rule->schedule_type;
-//             $plantId = $rule->plant;
+            switch ($type) {
+                case 'Live':
+                    $command->everyMinute();
+                    break;
+                case 'Hourly':
+                    $command->hourly();
+                    break;
+                case 'Daily':
+                    $command->dailyAt('07:59');
+                    break;
+            }
+        }
 
-//             $command = $schedule->command('send:invoice-report', [$type, $plantId]);
+        // Invoice Data Report Scheduling
+        $invoiceDataRules = AlertMailRule::where('module', 'InvoiceDataReport')
+            ->select('plant', 'schedule_type')
+            ->distinct()
+            ->get();
 
-//             switch ($type) {
-//                 case 'Live':
-//                     $command->everyMinute();
-//                     break;
-//                 case 'Hourly':
-//                     $command->hourly();
-//                     break;
-//                 case 'Daily':
-//                     $command->dailyAt('07:59');
-//                     break;
-//             }
-//         }
+        foreach ($invoiceDataRules as $rule) {
+            $type = $rule->schedule_type;
+            $plantId = $rule->plant;
 
-//         // Invoice Data Report Scheduling
-//         $invoiceDataRules = AlertMailRule::where('module', 'InvoiceDataReport')
-//             ->select('plant', 'schedule_type')
-//             ->distinct()
-//             ->get();
+            $command = $schedule->command('send:invoice-data-report', [$type, $plantId]);
 
-//         foreach ($invoiceDataRules as $rule) {
-//             $type = $rule->schedule_type;
-//             $plantId = $rule->plant;
-
-//             $command = $schedule->command('send:invoice-data-report', [$type, $plantId]);
-
-//             switch ($type) {
-//                 case 'Live':
-//                     $command->everyMinute();
-//                     break;
-//                 case 'Hourly':
-//                     $command->hourly();
-//                     break;
-//                 case 'Daily':
-//                     $command->dailyAt('10:00');
-//                     break;
-//             }
-//         }
-//     }
-// });
+            switch ($type) {
+                case 'Live':
+                    $command->everyMinute();
+                    break;
+                case 'Hourly':
+                    $command->hourly();
+                    break;
+                case 'Daily':
+                    $command->dailyAt('10:00');
+                    break;
+            }
+        }
+});