Update dependency erag/laravel-pwa to v2

app/Console/Commands/Scheduler.php

@@ -337,7 +337,7 @@ class Scheduler extends Command
                     }
                     break;
                 case 'Daily':
-                    if (now()->format('H:i') == '09:30') {
+                    if (now()->format('H:i') == '11:30') {
                         try {
                             \Artisan::call('send-import-transit', [
                                 'schedule_type' => $rule->schedule_type,

app/Console/Commands/SendImportTransit.php

@@ -53,12 +53,50 @@ class SendImportTransit extends Command
             return;
         }
 
+        // $todayRecordExists = ImportTransit::whereDate('created_at', now()->toDateString())->first();
+
+        // if (!$todayRecordExists) {
+        //     $this->info('No records created today. Mail not sent.');
+        //     return;
+        // }
+
+        // $tableData = ImportTransit::select([
+        //         'cri_rfq_number',
+        //         'mail_received_date',
+        //         'pricol_ref_number',
+        //         'requester',
+        //         'shipper',
+        //         'shipper_location',
+        //         'shipper_invoice',
+        //         'shipper_invoice_date',
+        //         'customs_agent_name',
+        //         'eta_date',
+        //         'status',
+        //         'delivery_location',
+        //         'etd_date',
+        //         'mode',
+        //         'inco_terms',
+        //         'port_of_loading',
+        //         'port_of_discharge',
+        //         'delivery_city',
+        //         'packages',
+        //         'type_of_package',
+        //         'gross_weight',
+        //         'volume',
+        //         'bill_number',
+        //         'bill_received_date',
+        //         'vessel_number',
+        //         'remark',
+        //         'is_transit_identified',
+        //     ])
+        //     ->where('status', '!=', 'Delivered')
+        //     ->get();
+
         $tableData = ImportTransit::where('status', '!=', 'Delivered')->orderByRaw("
-            CASE
+            CAST(
-                WHEN cri_rfq_number ~ '[0-9]+'
+                regexp_replace(cri_rfq_number, '.*-([0-9]+).*', '\\1')
-                THEN CAST(regexp_replace(cri_rfq_number, '[^0-9]', '', 'g') AS INTEGER)
+                AS INTEGER
-                ELSE NULL
+            )
-            END NULLS LAST
         ")->get();
 
 

app/Filament/Resources/QualityValidationResource.php

@@ -3529,80 +3529,14 @@ class QualityValidationResource extends Resource
 
                             $mPlantName = $mailData['plant_name'];
                             $emails = $mailData['emails'];
-                            $ccEmails = $mailData['cc_emails'] ?? [];
                             $mUserName = Filament::auth()->user()->name;
 
-                            // if (! empty($emails)) {
+                            if (! empty($emails)) {
-                            //     if (is_array($emails)) {
+                                // Mail::to($emails)->send(new InvalidSerialMail($serNo, $invoiceNumber, $mPlantName, $mInvoiceType));
-                            //         $emailList = collect($emails)
+                                Mail::to($emails)->send(
-                            //             ->flatMap(fn ($email) => explode(',', $email))
+                                    new InvalidQualityMail($state, $mPorder, $mPlantName, $mLinePart, $mUserName, $mExpectedValue, 'InvalidPartNumber')
-                            //             ->map(fn ($email) => trim($email))
+                                );
-                            //             ->filter()
+                            } else {
-                            //             ->toArray();
-                            //     } else {
-                            //         $emailList = array_map('trim', explode(',', $emails));
-                            //     }
-
-                            //     $ccList = [];
-
-                            //     if (!empty($cc_emails)) {
-                            //         if (is_array($cc_emails)) {
-                            //             $ccList = collect($cc_emails)
-                            //                 ->flatMap(fn ($email) => explode(',', $email))
-                            //                 ->map(fn ($email) => trim($email))
-                            //                 ->filter()
-                            //                 ->toArray();
-                            //         } else {
-                            //             $ccList = collect(explode(',', $cc_emails))
-                            //                 ->map(fn ($email) => trim($email))
-                            //                 ->filter()
-                            //                 ->toArray();
-                            //         }
-                            //     }
-
-                            //     Mail::to($emailList)
-                            //         ->cc($ccList)
-                            //         ->send(
-                            //         new InvalidQualityMail(
-                            //             $state,
-                            //             $mPorder,
-                            //             $mPlantName,
-                            //             $mLinePart,
-                            //             $mUserName,
-                            //             $mExpectedValue,
-                            //             'InvalidPartNumber'
-                            //         )
-                            //     );
-                            // }
-                            if (!empty($emails)) {
-
-                                $emailList = collect(is_array($emails) ? $emails : explode(',', $emails))
-                                    ->flatMap(fn ($email) => explode(',', $email))
-                                    ->map(fn ($email) => trim($email))
-                                    ->filter()
-                                    ->toArray();
-
-                                $ccList = collect(is_array($ccEmails) ? $ccEmails : explode(',', $ccEmails))
-                                    ->flatMap(fn ($email) => explode(',', $email))
-                                    ->map(fn ($email) => trim($email))
-                                    ->filter()
-                                    ->toArray();
-
-                                Mail::to($emailList)
-                                    ->cc($ccList)
-                                    ->send(
-                                        new InvalidQualityMail(
-                                            $state,
-                                            $mPorder,
-                                            $mPlantName,
-                                            $mLinePart,
-                                            $mUserName,
-                                            $mExpectedValue,
-                                            'InvalidPartNumber'
-                                        )
-                                    );
-                            }
-                            else {
                                 \Log::warning("No recipients found for plant {$mPlantName}, module Serial, rule invalid_serial.");
                             }
                             $set('part_validation1', null);
@@ -4044,7 +3978,6 @@ class QualityValidationResource extends Resource
             ->where('module', 'QualityValidation')
             ->where('rule_name', 'QualityMail')
             ->where(fn ($q) => $q->whereNull('schedule_type')->orWhere('schedule_type', ''))
-            // ->get()
             ->pluck('email')
             ->toArray();
 
@@ -4062,16 +3995,13 @@ class QualityValidationResource extends Resource
             ->where('module', 'QualityValidation')
             ->where('rule_name', 'QualityMail')
             ->where(fn ($q) => $q->whereNull('schedule_type')->orWhere('schedule_type', ''))
-            ->get(['email', 'cc_emails']);
+            ->pluck('email')
-            // ->pluck('email')
+            ->toArray();
-            // ->toArray();
 
         return [
             'plant_id' => $plantId,
             'plant_name' => $mPlantName,
-            'emails'     => $emails->pluck('email')->filter()->toArray(),
+            'emails' => $emails,
-            'cc_emails'  => $emails->pluck('cc_emails')->filter()->toArray(),
-            // 'emails' => $emails,
         ];
     }
 

app/Filament/Resources/TestingPanelReadingResource.php

@@ -813,7 +813,7 @@ class TestingPanelReadingResource extends Resource
                                 if ($plantId) {
                                     return MotorTestingMaster::whereHas('testingPanelReadings', function ($query) {
                                         $query->whereNotNull('id');
-                                    })->whereNotNull('subassembly_code')->orderBy('subassembly_code')->pluck('subassembly_code', 'id');
+                                    })->orderBy('subassembly_code')->pluck('subassembly_code', 'id');
                                 } else {
                                     return [];
                                     // return Item::whereHas('motorTestingMasters')

composer.json

@@ -10,7 +10,7 @@
         "alperenersoy/filament-export": "^3.0",
         "althinect/filament-spatie-roles-permissions": "^2.3",
         "diogogpinto/filament-auth-ui-enhancer": "^1.0",
-        "erag/laravel-pwa": "^1.9",
+        "erag/laravel-pwa": "^2.0",
         "filament/filament": "^3.3",
         "intervention/image": "^3.11",
         "irazasyed/telegram-bot-sdk": "^3.15",

resources/views/mail/characteristic-approval.blade.php

@@ -29,10 +29,6 @@
         <td>Item Code</td>
         <td style="text-align: center;">{{ $request->item->code ?? $request->code }}</td>
     </tr>
-    <tr>
-        <td>Description</td>
-        <td style="text-align: center;">{{ $request->item->description ?? $request->description }}</td>
-    </tr>
     <tr>
         <td>Job Number</td>
         <td style="text-align: center;">{{ $request->aufnr }}</td>