diff --git a/app/Classes/Jobs/Commands/V2/ProcessBookingForEInvoiceV2CommandJob.php b/app/Classes/Jobs/Commands/V2/ProcessBookingForEInvoiceV2CommandJob.php index e69f6923..879a45cf 100644 --- a/app/Classes/Jobs/Commands/V2/ProcessBookingForEInvoiceV2CommandJob.php +++ b/app/Classes/Jobs/Commands/V2/ProcessBookingForEInvoiceV2CommandJob.php @@ -105,5 +105,19 @@ class ProcessBookingForEInvoiceV2CommandJob implements ShouldQueue $firstInvoiceTrx->bill_no = explode('-deleted-', $firstInvoiceTrx->bill_no)[0]; $firstInvoiceTrx->save(); } + else{ + $transaction = $this->booking->transactions()->whereIn('type', [TransactionType::INVOICE]); + Log::info('count again making sure there is an invoice: ' . $transaction->count()); + if($transaction->count() === 0){ + $firstInvoiceTrx = $this->booking->transactions() + ->whereIn('type', [TransactionType::INVOICE]) + ->withTrashed() + ->orderBy('created_at', 'asc') + ->first(); + $firstInvoiceTrx->restore(); + $firstInvoiceTrx->bill_no = explode('-deleted-', $firstInvoiceTrx->bill_no)[0]; + $firstInvoiceTrx->save(); + } + } } } diff --git a/app/Classes/Modules/Bookings/ControllersLogic/BatchBookingsGenerateEInvoiceLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/BatchBookingsGenerateEInvoiceLogic.php index 187c9c2e..aece2dae 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/BatchBookingsGenerateEInvoiceLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/BatchBookingsGenerateEInvoiceLogic.php @@ -92,7 +92,10 @@ class BatchBookingsGenerateEInvoiceLogic extends AbstractControllerLogic foreach ($bookings as $booking) { // Log::info('Booking ID: ' . $booking->marking); - ProcessBookingForEInvoiceV2CommandJob::dispatch($booking); + //if($booking->marking === '833065' || $booking->marking === '798334'){ //798334, 833065 + ProcessBookingForEInvoiceV2CommandJob::dispatch($booking); + //} + } $this->processedCount = count($bookings); diff --git a/app/Console/Commands/V2/RegenerateInvoiceEInvoiceV2Comman.php b/app/Console/Commands/V2/RegenerateInvoiceEInvoiceV2Comman.php new file mode 100644 index 00000000..179dc930 --- /dev/null +++ b/app/Console/Commands/V2/RegenerateInvoiceEInvoiceV2Comman.php @@ -0,0 +1,68 @@ +whereIn('status', [ApprovalStatus::APPROVED])->get(); + + $count = 0; + foreach ($bookings as $booking) { + $count++; + $start = Carbon::parse('2026-03-05 04:00:00'); + $end = Carbon::parse('2026-03-05 05:00:00'); + + if ($booking->updated_at->between($start, $end)) { + Log::info('Processed: ' . $count . ', Booking ID: ' . $booking->marking . ', Booking updated: ' . $booking->updated_at); + $booking->status = 3; + $booking->save(); + } + Log::info('Processed: ' . $count . ', Booking ID: ' . $booking->marking . ', Booking ID: ' . $booking->marking); + } + } +}