diff --git a/app/Console/Commands/SendImportTransit.php b/app/Console/Commands/SendImportTransit.php
index 8867d7f..05d16f1 100644
--- a/app/Console/Commands/SendImportTransit.php
+++ b/app/Console/Commands/SendImportTransit.php
@@ -53,50 +53,12 @@ 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("
-            CAST(
-                regexp_replace(cri_rfq_number, '.*-([0-9]+).*', '\\1')
-                AS INTEGER
-            )
+            CASE
+                WHEN cri_rfq_number ~ '[0-9]+'
+                THEN CAST(regexp_replace(cri_rfq_number, '[^0-9]', '', 'g') AS INTEGER)
+                ELSE NULL
+            END NULLS LAST
         ")->get();