From bf5dd998e098a65752f739ed2b1a390eb46f4d18 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Tue, 15 Oct 2024 21:24:34 +0800 Subject: [PATCH 1/5] New website under maintenance page --- resources/views/errors/503.blade.php | 30 ++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 resources/views/errors/503.blade.php diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php new file mode 100644 index 00000000..d8fbc8c3 --- /dev/null +++ b/resources/views/errors/503.blade.php @@ -0,0 +1,30 @@ + + + + + + Site Under Maintenance + + + +
+

We'll be back soon!

+

Sorry for the inconvenience but we're performing some maintenance at the moment. We'll be back online shortly!

+

— CIEF EXCHANGE

+
+ + From 5ca86b49826225722ee957d3d04cef0c1b9ca7b5 Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Tue, 15 Oct 2024 21:25:40 +0800 Subject: [PATCH 2/5] Laravel Vapor - Disable all schedule commands --- app/Console/Kernel.php | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index e455eea1..b201f682 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -31,27 +31,27 @@ class Kernel extends ConsoleKernel protected function schedule(Schedule $schedule) { - // $schedule->command('inspire')->hourly(); - $schedule->command('mail:EmailDoToVTCommand')->dailyAt('10:00')->withoutOverlapping(); + // // $schedule->command('inspire')->hourly(); + // $schedule->command('mail:EmailDoToVTCommand')->dailyAt('10:00')->withoutOverlapping(); - $schedule->command('seasonalSegmantCompany:remove') - ->dailyAt('01:00') - ->appendOutputTo(storage_path().'/logs/soft-delete-seasonal-segmant-company.log') - ->withoutOverlapping(); - - $schedule->command('delete:bulk-download-files') - ->hourly() - ->appendOutputTo(storage_path().'/logs/delete-bulk-download-files.log') - ->withoutOverlapping(); - - $schedule->command('booking:expired') - ->dailyAt('02:00') - ->appendOutputTo(storage_path().'/logs/expire-booking.log') - ->withoutOverlapping(); - - // $schedule->command('purchaseOrder:autoFill') - // ->dailyAt('03:00') + // $schedule->command('seasonalSegmantCompany:remove') + // ->dailyAt('01:00') + // ->appendOutputTo(storage_path().'/logs/soft-delete-seasonal-segmant-company.log') // ->withoutOverlapping(); + + // $schedule->command('delete:bulk-download-files') + // ->hourly() + // ->appendOutputTo(storage_path().'/logs/delete-bulk-download-files.log') + // ->withoutOverlapping(); + + // $schedule->command('booking:expired') + // ->dailyAt('02:00') + // ->appendOutputTo(storage_path().'/logs/expire-booking.log') + // ->withoutOverlapping(); + + // // $schedule->command('purchaseOrder:autoFill') + // // ->dailyAt('03:00') + // // ->withoutOverlapping(); } /** From 2a90e974fe2edac9fa9073d63de97b3028a88d11 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Wed, 23 Oct 2024 18:18:44 +0800 Subject: [PATCH 3/5] format min transfer amount with comma --- .../ControllersLogic/FetchCompanyBookingQuotationLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyBookingQuotationLogic.php b/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyBookingQuotationLogic.php index 926acaae..2fc53955 100644 --- a/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyBookingQuotationLogic.php +++ b/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyBookingQuotationLogic.php @@ -69,7 +69,7 @@ class FetchCompanyBookingQuotationLogic extends AbstractControllerLogic /** @var Currency $currency */ $currency = $this->fetchesCurrency->execute(['id' => $conversionObject->getCurrencyId()]); - if($calculationObject->getConvertibleTotal() < $calculationObject->getConfigurations()->getMinLimit()) throw new RequestValidationException('Your transfer is below the minimum amount allowed of '.$calculationObject->getConfigurations()->getMinLimit().' '.$currency->short_code); + if($calculationObject->getConvertibleTotal() < $calculationObject->getConfigurations()->getMinLimit()) throw new RequestValidationException('Your transfer is below the minimum amount allowed of '.number_format($calculationObject->getConfigurations()->getMinLimit()).' '.$currency->short_code); //TODO add po limit validation return $this->response(['data' => $this->generatesBookingQuotation->execute($calculationObject, 0, $conversionObject)]); From 5d299b9ec929ae57d99ba870f5779fba35ed0b1e Mon Sep 17 00:00:00 2001 From: Jia Sheng Date: Thu, 31 Oct 2024 19:38:40 +0800 Subject: [PATCH 4/5] upload bank slip from white form list --- routes/web.php | 80 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/routes/web.php b/routes/web.php index 112dee31..e3775eaa 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1097,6 +1097,7 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}', echo 'PO approve date'; echo 'Remark'; echo 'Add Remarks'; + echo 'Upload Bank Slip'; echo ''; echo ''; echo ''; @@ -1114,7 +1115,7 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}', echo '' . $bill->created_at->format('d-m-Y h:i A') . ''; echo '' . $bill->issuerCompany->name . ''; echo '' . ($bill->status === ApprovalStatus::APPROVED ? $bill->updated_at->format('d-m-Y h:i A') : 'Pending Upload') . ''; - echo '' . ($po ? $po->updated_at->format('d-m-Y h:i A') : 'Pending Submission') . ''; + echo '' . ($po ? $po->updated_at->format('d-m-Y h:i A') : 'Pending Submission') . ''; echo '' . ($po ? ($po->status === ApprovalStatus::APPROVED ? $po->updated_at->format('d-m-Y h:i A') : '' ) : '' ). ''; $remarks = $bill->remarks; echo ''; @@ -1131,11 +1132,88 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}', echo csrf_field(); echo ''; echo ''; + echo '' ; + if ($bill->status !== ApprovalStatus::APPROVED) { + echo '
'; + echo ''; + echo ''; + echo csrf_field(); + echo '
'; + } + echo ''; echo ''; } echo ''; echo ''; + // script + echo ''; }); Route::get('check-duplicate-refunds', function () { From 33ff53d08c1873d832f44453c318f948f6353e06 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Tue, 12 Nov 2024 00:16:37 +0800 Subject: [PATCH 5/5] fix unable to generate PERFORMA INVOICE --- .../Processors/CreateProformaInvoiceTransactionProcessor.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php index 28a34057..079e55d9 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php @@ -110,6 +110,7 @@ class CreateProformaInvoiceTransactionProcessor $transaction = $booking->transactions() ->where('type', TransactionType::PAYMENT) + ->whereNotIn('status', [ApprovalStatus::SUSPENDED]) ->first(); if (!$transaction) {