mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git
synced 2026-08-19 04:23:55 +00:00
Merge branch 'dillon/135-fix-booking-status-inconsistency' into vapor/development
This commit is contained in:
@@ -104,7 +104,7 @@ class CreateInvoiceTransactionV2Processor
|
||||
$generateEInvoice = $options['generateEInvoice'] ?? false;
|
||||
$generateEInvoiceWithNormalInvoiceTemplate = $options['generateEInvoiceWithNormalInvoiceTemplate'] ?? false;
|
||||
$generateEInvoiceRefund = $options['generateEInvoiceRefund'] ?? false;
|
||||
$bookingOriginalStatus = $options['bookingOriginalStatus'] ?? ApprovalStatus::APPROVED;
|
||||
$bookingOriginalStatus = $options['bookingOriginalStatus'] ?? null;
|
||||
|
||||
// Log::info('CreateInvoiceTransactionV2Processor generateEInvoice:' . json_encode($generateEInvoice));
|
||||
// Log::info('CreateInvoiceTransactionV2Processor generateEInvoiceWithNormalInvoiceTemplate: ' . json_encode($generateEInvoiceWithNormalInvoiceTemplate));
|
||||
@@ -344,8 +344,8 @@ class CreateInvoiceTransactionV2Processor
|
||||
// }
|
||||
}
|
||||
|
||||
//if(!$generateEInvoiceRefund){
|
||||
if($bookingOriginalStatus){
|
||||
$this->updatesBookingStatus->execute($booking, $bookingOriginalStatus);
|
||||
//}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -758,6 +758,8 @@ Route::get('/payments/manual', function(){
|
||||
|
||||
Route::get('/invoice/fix', function(){
|
||||
|
||||
dd('Deprecated, call Tech Support');
|
||||
|
||||
set_time_limit(14400);
|
||||
$processed_invoice = 1;
|
||||
|
||||
@@ -1038,6 +1040,8 @@ Route::get('transaction/{id}/credit_note/download/v2', 'Transactions\GenerateCre
|
||||
|
||||
Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking, $started_at, $ended_at) {
|
||||
|
||||
dd('Deprecated, call Tech Support');
|
||||
|
||||
set_time_limit(14400);
|
||||
$processed_invoice = 1;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user