Update: laravel 8 to 12, php 7.3 to php 8.3, Jenkinsfile, Unit/Feature testing, vapor, docker

routes/account.php

@@ -1,48 +1,64 @@
 <?php
 
 use App\Http\Controllers\Accounts\CreateSystemUserController;
+use App\Http\Controllers\Accounts\UserAuthenticationLogoutController;
+use App\Http\Controllers\Accounts\RefreshAuthenticationTokenController;
+use App\Http\Controllers\Accounts\UserAuthenticationController;
+use App\Http\Controllers\Accounts\CheckEmailController;
+use App\Http\Controllers\Accounts\GeneratePasswordResetController;
+use App\Http\Controllers\Accounts\ResetPasswordController;
+use App\Http\Controllers\Accounts\CreateCustomerController;
+use App\Http\Controllers\Accounts\UserEmailVerificationController;
+use App\Http\Controllers\Accounts\ResendEmailVerificationController;
+use App\Http\Controllers\Accounts\FetchUserByEmailController;
+use App\Http\Controllers\Accounts\FetchUserController;
+use App\Http\Controllers\Accounts\ListUsersController;
+use App\Http\Controllers\Accounts\UpdateUserController;
+use App\Http\Controllers\Accounts\CreateAdminUserController;
+use App\Http\Controllers\Accounts\DeleteUserController;
+use App\Http\Controllers\Accounts\UpdateUserRoleController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => 'account', 'namespace' => 'Accounts', 'as' => 'account.'], function () {
+Route::group(['prefix' => 'account', 'as' => 'account.'], function () {
 
     Route::group(['prefix' => 'authentication', 'as' => 'authentication.'], function () {
 
 
         Route::group(['middleware' => 'valid.token'], function () {
-            Route::get('/logout', 'UserAuthenticationLogoutController@logout')->name('logout');
-            Route::get('/refresh', 'RefreshAuthenticationTokenController@refresh')->name('refresh');
+            Route::get('/logout', [UserAuthenticationLogoutController::class, 'logout'])->name('logout');
+            Route::get('/refresh', [RefreshAuthenticationTokenController::class, 'refresh'])->name('refresh');
         });
 
          Route::group(['prefix' => 'login', 'as' => 'authenticate.'], function () {
-            Route::post('/attempt', 'UserAuthenticationController@authenticate')->name('attempt');
-            Route::post('/check_email', 'CheckEmailController@check')->name('email.check');
+            Route::post('/attempt', [UserAuthenticationController::class, 'authenticate'])->name('attempt');
+            Route::post('/check_email', [CheckEmailController::class, 'check'])->name('email.check');
          });
 
          Route::group(['prefix' => 'password', 'as' => 'password.'], function () {
-            Route::post('/forget', 'GeneratePasswordResetController@generate')->name('forget');
-            Route::post('/reset', 'ResetPasswordController@reset')->name('reset');
+            Route::post('/forget', [GeneratePasswordResetController::class, 'generate'])->name('forget');
+            Route::post('/reset', [ResetPasswordController::class, 'reset'])->name('reset');
          });
 
     });
 
     Route::group(['prefix' => 'registration', 'as' => 'registration.'], function () {
-        Route::post('/registration', 'CreateCustomerController@create')->name('register');
+        Route::post('/registration', [CreateCustomerController::class, 'create'])->name('register');
     });
 
     Route::group(['prefix' => 'email', 'as' => 'email.'], function () {
-        Route::post('/verify', 'UserEmailVerificationController@verify')->name('verify');
-        Route::post('/verification/resend', 'ResendEmailVerificationController@resend')->name('verification.resend');
+        Route::post('/verify', [UserEmailVerificationController::class, 'verify'])->name('verify');
+        Route::post('/verification/resend', [ResendEmailVerificationController::class, 'resend'])->name('verification.resend');
     });
 
     Route::group(['prefix' => 'user', 'as' => 'user.', 'middleware' => 'valid.token'], function () {
-        Route::get('email/{email}', 'FetchUserByEmailController@fetch')->name('company');
-        Route::post('/show', 'FetchUserController@fetch')->name('show');
-        Route::get('/list', 'ListUsersController@list')->name('list');
-        Route::put('/update/{id}', 'UpdateUserController@update')->name('update');
+        Route::get('email/{email}', [FetchUserByEmailController::class, 'fetch'])->name('company');
+        Route::post('/show', [FetchUserController::class, 'fetch'])->name('show');
+        Route::get('/list', [ListUsersController::class, 'list'])->name('list');
+        Route::put('/update/{id}', [UpdateUserController::class, 'update'])->name('update');
 
-        Route::post('/admin/create', 'CreateAdminUserController@create')->name('admin.create');
-        Route::delete('/delete/{id}', 'DeleteUserController@delete')->name('delete');
-        Route::put('/update/{id}/role', 'UpdateUserRoleController@update')->name('update.role');
+        Route::post('/admin/create', [CreateAdminUserController::class, 'create'])->name('admin.create');
+        Route::delete('/delete/{id}', [DeleteUserController::class, 'delete'])->name('delete');
+        Route::put('/update/{id}/role', [UpdateUserRoleController::class, 'update'])->name('update.role');
         Route::post('/system/create', [CreateSystemUserController::class, 'create'])->name('system.create');
     });
 

routes/accounting.php

@@ -1,22 +1,27 @@
 <?php
 
+use App\Http\Controllers\Accounting\ApproveDuplicateBankStatementDetailsStatusController;
+use App\Http\Controllers\Accounting\BankStatementController;
+use App\Http\Controllers\Accounting\GroupApproveStatementTransactionController;
+use App\Http\Controllers\Accounting\HistoryImportedTransactionMappedController;
+use App\Http\Controllers\Accounting\UpdateStatementTransactionStatusController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => 'accounting', 'as' => 'accounting.', 'namespace' => 'Accounting'], function () {
-    Route::post('/import', 'BankStatementController@import')->name('statement.import');
-    Route::get('/bank_account', 'BankStatementController@transactions')->name('bank.transaction');
+Route::group(['prefix' => 'accounting', 'as' => 'accounting.'], function () {
+    Route::post('/import', [BankStatementController::class, 'import'])->name('statement.import');
+    Route::get('/bank_account', [BankStatementController::class, 'transactions'])->name('bank.transaction');
     Route::group(['prefix' => 'statements/{id}', 'as' => 'statement.'], function () {
-        Route::get('/details', 'BankStatementController@fetch')->name('details');
-        Route::put('/details/update', 'BankStatementController@update')->name('details.update');
+        Route::get('/details', [BankStatementController::class, 'fetch'])->name('details');
+        Route::put('/details/update', [BankStatementController::class, 'update'])->name('details.update');
     });
 
-    Route::post('bankStatement/{id}/details/{status}', 'ApproveDuplicateBankStatementDetailsStatusController@update')->where('status', 'approve|reject|pending_verification')->name('bankStatement.details.status.update');
+    Route::post('bankStatement/{id}/details/{status}', [ApproveDuplicateBankStatementDetailsStatusController::class, 'update'])->where('status', 'approve|reject|pending_verification')->name('bankStatement.details.status.update');
 
     Route::group(['prefix' => 'statement_transaction', 'as' => 'statement_transaction.'], function () {
-        Route::post('/owner/group-approve', 'GroupApproveStatementTransactionController@approve')->name('owner.groupApprove');
-        Route::post('/{id}/owner/{status}', 'UpdateStatementTransactionStatusController@update')->where('status', 'approve|reject')->name('owner.status.update');
+        Route::post('/owner/group-approve', [GroupApproveStatementTransactionController::class, 'approve'])->name('owner.groupApprove');
+        Route::post('/{id}/owner/{status}', [UpdateStatementTransactionStatusController::class, 'update'])->where('status', 'approve|reject')->name('owner.status.update');
     });
 
-    Route::get('history/imported', 'HistoryImportedTransactionMappedController@getImported')->name('history.imported');
-    
+    Route::get('history/imported', [HistoryImportedTransactionMappedController::class, 'getImported'])->name('history.imported');
+
 });

routes/affiliate.php

@@ -1,14 +1,20 @@
 <?php
 
+use App\Http\Controllers\Affiliate\GetAffiliateSettingsController;
+use App\Http\Controllers\Affiliate\UpdateAffiliateSettingsController;
+use App\Http\Controllers\Affiliate\ListAffiliatesController;
+use App\Http\Controllers\Affiliate\CreateAffiliateController;
+use App\Http\Controllers\Affiliate\UpdateAffiliateController;
+use App\Http\Controllers\Affiliate\DeleteAffiliateController;
 use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => 'affiliate', 'as' => 'affiliate.'], function () {
-    Route::get('/settings', 'Affiliate\GetAffiliateSettingsController@get')->name('settings.get');
-    Route::post('/settings', 'Affiliate\UpdateAffiliateSettingsController@update')->name('settings.update');
-    
-    Route::get('/list', 'Affiliate\ListAffiliatesController@list')->name('list');
-    Route::post('/create', 'Affiliate\CreateAffiliateController@create')->name('create');
-    Route::put('/update/{id}', 'Affiliate\UpdateAffiliateController@update')->name('update');
-    Route::delete('/delete/{id}', 'Affiliate\DeleteAffiliateController@delete')->name('delete');
+    Route::get('/settings', [GetAffiliateSettingsController::class, 'get'])->name('settings.get');
+    Route::post('/settings', [UpdateAffiliateSettingsController::class, 'update'])->name('settings.update');
+
+    Route::get('/list', [ListAffiliatesController::class, 'list'])->name('list');
+    Route::post('/create', [CreateAffiliateController::class, 'create'])->name('create');
+    Route::put('/update/{id}', [UpdateAffiliateController::class, 'update'])->name('update');
+    Route::delete('/delete/{id}', [DeleteAffiliateController::class, 'delete'])->name('delete');
 });
 

routes/announcement.php

@@ -1,15 +1,21 @@
 <?php
 
+use App\Http\Controllers\Announcements\AssignAnnouncementToSegmentController;
+use App\Http\Controllers\Announcements\CreateAnnouncementController;
+use App\Http\Controllers\Announcements\DeleteAnnouncementController;
+use App\Http\Controllers\Announcements\ListAnnouncementsController;
+use App\Http\Controllers\Announcements\RemoveSegmentFromAnnouncementController;
+use App\Http\Controllers\Announcements\UpdateAnnouncementController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => 'announcement', 'as' => 'announcement.', 'namespace' => 'Announcements'], function () {
-    Route::get('/list', 'ListAnnouncementsController@list')->name('list');
-    Route::post('/create', 'CreateAnnouncementController@create')->name('create');
-    Route::put('/update/{id}', 'UpdateAnnouncementController@update')->name('update');    
-    Route::delete('/delete/{id}', 'DeleteAnnouncementController@delete')->name('delete');
-    
+Route::group(['prefix' => 'announcement', 'as' => 'announcement.'], function () {
+    Route::get('/list', [ListAnnouncementsController::class, 'list'])->name('list');
+    Route::post('/create', [CreateAnnouncementController::class, 'create'])->name('create');
+    Route::put('/update/{id}', [UpdateAnnouncementController::class, 'update'])->name('update');
+    Route::delete('/delete/{id}', [DeleteAnnouncementController::class, 'delete'])->name('delete');
+
     Route::group(['prefix' => '{id}/segment', 'as' => 'segment.'], function () {
-        Route::post('/assign', 'AssignAnnouncementToSegmentController@assign')->name('assign');
-        Route::delete('/detach/{segment_id}', 'RemoveSegmentFromAnnouncementController@detach')->name('detach');
+        Route::post('/assign', [AssignAnnouncementToSegmentController::class, 'assign'])->name('assign');
+        Route::delete('/detach/{segment_id}', [RemoveSegmentFromAnnouncementController::class, 'detach'])->name('detach');
     });
 });

routes/api.php

@@ -1,5 +1,14 @@
 <?php
 
+use App\Http\Controllers\Services\CountriesListController;
+use App\Http\Controllers\Billplz\CallbackBillplzController;
+use App\Http\Controllers\Documents\RenderDocumentController;
+use App\Http\Controllers\Imports\ImportUpdateDebtorController;
+use App\Http\Controllers\Imports\ImportHoneyTrapController;
+use App\Http\Controllers\Imports\ImportStatementInvoiceController;
+use App\Http\Controllers\Imports\ImportStatementReceiptsController;
+use App\Http\Controllers\Companies\BulkDownloadCustomerInvoicesController;
+use App\Http\Controllers\Companies\BulkDownloadSupplierWhiteFormsController;
 use Illuminate\Support\Facades\Route;
 
 /*
@@ -13,28 +22,28 @@ use Illuminate\Support\Facades\Route;
 |
 */
 
-Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function () {
+Route::group(['prefix' => 'v1', 'as' => 'api.'], function () {
 
     require __DIR__ . '/account.php';
 
-//    Route::get('/rate/calculate', 'RateCalculateCurrencyController@convert')->name('calculate');
+//    Route::get('/rate/calculate', [RateCalculateCurrencyController::class, 'convert'])->name('calculate');
 
     Route::group(['prefix' => 'service', 'as' => 'service.'], function () {
-        Route::get('countries/list', 'Services\CountriesListController@index')->name('list.countries');
+        Route::get('countries/list', [CountriesListController::class, 'index'])->name('list.countries');
     });
 
-    Route::post('online_payment/callback', 'Billplz\CallbackBillplzController@callback')->name('online_payment.callback');
+    Route::post('online_payment/callback', [CallbackBillplzController::class, 'callback'])->name('online_payment.callback');
 
     Route::group(['middleware' => 'valid.token'], function () {
         Route::group(['middleware' => 'admin'], function () { //cief maintenance
 
-            Route::get('/storage/{fileName}/fetch', 'Documents\RenderDocumentController@fileStorageServe')->where(['fileName' => '.*'])->name('storage.document.file');
-            Route::post('/import/update-debtor/f614e339d7058904a831aad742e24d55', 'Imports\ImportUpdateDebtorController@import')->name('debtor.import');
-            Route::post('/import/upload-honey-trap', 'Imports\ImportHoneyTrapController@import')->name('honey_trap.upload');
-            Route::post('/import/upload-import-invoices', 'Imports\ImportStatementInvoiceController@import')->name('import_invoices.upload');
-            Route::post('/import/upload-import-receipt', 'Imports\ImportStatementReceiptsController@import')->name('import_receipts.upload');
-            Route::post('/customers/invoices', 'Companies\BulkDownloadCustomerInvoicesController@download')->name('customers.invoices');
-            Route::post('/supplier/white-form/bulk-download', 'Companies\BulkDownloadSupplierWhiteFormsController@download')->name('suppliers.white_forms');
+            Route::get('/storage/{fileName}/fetch', [RenderDocumentController::class, 'fileStorageServe'])->where(['fileName' => '.*'])->name('storage.document.file');
+            Route::post('/import/update-debtor/f614e339d7058904a831aad742e24d55', [ImportUpdateDebtorController::class, 'import'])->name('debtor.import');
+            Route::post('/import/upload-honey-trap', [ImportHoneyTrapController::class, 'import'])->name('honey_trap.upload');
+            Route::post('/import/upload-import-invoices', [ImportStatementInvoiceController::class, 'import'])->name('import_invoices.upload');
+            Route::post('/import/upload-import-receipt', [ImportStatementReceiptsController::class, 'import'])->name('import_receipts.upload');
+            Route::post('/customers/invoices', [BulkDownloadCustomerInvoicesController::class, 'download'])->name('customers.invoices');
+            Route::post('/supplier/white-form/bulk-download', [BulkDownloadSupplierWhiteFormsController::class, 'download'])->name('suppliers.white_forms');
 
             require __DIR__ . '/company.php';
 

routes/apipub.php

@@ -2,11 +2,12 @@
 
 use App\Http\Controllers\Bookings\ListBookingsSalesInvoiceController;
 use App\Http\Controllers\Bookings\UpdateBookingSalesInvoiceController;
+use App\Http\Controllers\Transactions\ListMappableTransactionsController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['middleware' => 'apipub', 'prefix' => 'v1', 'as' => 'apipub.'], function () {
+Route::group(['prefix' => 'v1', 'as' => 'apipub.'], function () {
     Route::group(['middleware' => 'token.check'], function () {
-        Route::get('transactions/mappable/query', 'Transactions\ListMappableTransactionsController@list')->name('transaction.mappable.list');
+        Route::get('transactions/mappable/query', [ListMappableTransactionsController::class, 'list'])->name('transaction.mappable.list');
 
         Route::group(['prefix' => 'booking', 'as' => 'booking.'], function () {
             Route::get('/sales-invoice/list', [ListBookingsSalesInvoiceController::class, 'list'])->name('booking.sales-invoice.list');

routes/bank.php

@@ -1,15 +1,22 @@
 <?php
 
+use App\Http\Controllers\Banks\CreateBankController;
+use App\Http\Controllers\Banks\DeleteBankController;
+use App\Http\Controllers\Banks\ListBanksController;
+use App\Http\Controllers\Banks\SetBankToDefaultController;
+use App\Http\Controllers\Banks\UpdateBankController;
+use App\Http\Controllers\Banks\UpdateBankMetadataController;
+use App\Http\Controllers\Banks\UpdateBankStatusController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => 'bank', 'as' => 'bank.', 'namespace' => 'Banks'], function () {
-    Route::get('/list', 'ListBanksController@list')->name('list');
-    Route::post('/create', 'CreateBankController@create')->name('create');
-    Route::put('/update/{id}', 'UpdateBankController@update')->name('update');
-    Route::put('/{id}/default', 'SetBankToDefaultController@update')->name('default');
-    Route::delete('/delete/{id}', 'DeleteBankController@delete')->name('delete');
+Route::group(['prefix' => 'bank', 'as' => 'bank.'], function () {
+    Route::get('/list', [ListBanksController::class, 'list'])->name('list');
+    Route::post('/create', [CreateBankController::class, 'create'])->name('create');
+    Route::put('/update/{id}', [UpdateBankController::class, 'update'])->name('update');
+    Route::put('/{id}/default', [SetBankToDefaultController::class, 'update'])->name('default');
+    Route::delete('/delete/{id}', [DeleteBankController::class, 'delete'])->name('delete');
 
-    Route::put('/update/{id}/status', 'UpdateBankStatusController@update')->name('status.update');
+    Route::put('/update/{id}/status', [UpdateBankStatusController::class, 'update'])->name('status.update');
 
-    Route::post('/metadata/update/{id}', 'UpdateBankMetadataController@delete')->name('update.metadata');
+    Route::post('/metadata/update/{id}', [UpdateBankMetadataController::class, 'delete'])->name('update.metadata');
 });

routes/billplz.php

@@ -1,9 +1,10 @@
 <?php
 
+use App\Http\Controllers\Billplz\CreateBillplzBillController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => 'billplz', 'as' => 'billplz.', 'namespace' => 'Billplz'], function () {
+Route::group(['prefix' => 'billplz', 'as' => 'billplz.'], function () {
     Route::group(['prefix' => 'bill', 'as' => 'bill.'], function () {
-        Route::post('/create', 'CreateBillplzBillController@create')->name('create');
+        Route::post('/create', [CreateBillplzBillController::class, 'create'])->name('create');
     });
 });

routes/booking.php

@@ -1,53 +1,77 @@
 <?php
 
-use App\Http\Controllers\Bookings\RegenerateBookingPaymentRVController;
-use App\Http\Controllers\Bookings\RegenerateBookingEInvoiceController;
-use App\Http\Controllers\Bookings\UpdateBookingAmountController;
+use App\Http\Controllers\Bookings\ApprovePaymentVerificationController;
+use App\Http\Controllers\Bookings\ApprovePurchaseOrderController;
+use App\Http\Controllers\Bookings\CancelBookingController;
 use App\Http\Controllers\Bookings\CreateBankingInvoiceTransactionController;
+use App\Http\Controllers\Bookings\CreateBookingController;
 use App\Http\Controllers\Bookings\CreateBookingLockController;
+use App\Http\Controllers\Bookings\CreateBookingPaymentController;
+use App\Http\Controllers\Bookings\CreateBookingRefundController;
+use App\Http\Controllers\Bookings\CreateBookingRefundCreditNoteController;
+use App\Http\Controllers\Bookings\CreatePaymentVerificationController;
+use App\Http\Controllers\Bookings\CreateProformaInvoiceTransaction;
+use App\Http\Controllers\Bookings\DeleteBookingController;
 use App\Http\Controllers\Bookings\DeleteBookingLockController;
+use App\Http\Controllers\Bookings\DeletePurchaseOrderPdfController;
+use App\Http\Controllers\Bookings\ExpireBookingPaymentController;
+use App\Http\Controllers\Bookings\FetchBookingController;
+use App\Http\Controllers\Bookings\FetchBookingPaymentQuotationController;
+use App\Http\Controllers\Bookings\ListBookingsController;
+use App\Http\Controllers\Bookings\ListBookingsJobController;
+use App\Http\Controllers\Bookings\MergeBookingController;
+use App\Http\Controllers\Bookings\RegenerateBookingEInvoiceController;
+use App\Http\Controllers\Bookings\RegenerateBookingPaymentRVController;
+use App\Http\Controllers\Bookings\RegenerateInvoiceBookingController;
+use App\Http\Controllers\Bookings\RestoreBookingController;
+use App\Http\Controllers\Bookings\UpdateBookingAmountController;
+use App\Http\Controllers\Bookings\UpdateBookingController;
+use App\Http\Controllers\Bookings\UpdateBookingOrderReferenceController;
+use App\Http\Controllers\Bookings\UpdateBookingOwnerController;
+use App\Http\Controllers\Bookings\UpdateBookingRecipientController;
+use App\Http\Controllers\Bookings\UploadPurchaseOrderController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => 'booking', 'as' => 'booking.', 'namespace' => 'Bookings'], function () {
-    Route::get('/show/{marking}', 'FetchBookingController@fetch')->name('show');
-    Route::get('/list', 'ListBookingsController@list')->name('list');
-    Route::get('/list/job', 'ListBookingsJobController@list')->name('list.job');
-    Route::post('/create', 'CreateBookingController@create')->name('create');
+Route::group(['prefix' => 'booking', 'as' => 'booking.'], function () {
+    Route::get('/show/{marking}', [FetchBookingController::class, 'fetch'])->name('show');
+    Route::get('/list', [ListBookingsController::class, 'list'])->name('list');
+    Route::get('/list/job', [ListBookingsJobController::class, 'list'])->name('list.job');
+    Route::post('/create', [CreateBookingController::class, 'create'])->name('create');
     Route::post('/create/lock', [CreateBookingLockController::class, 'create'])->name('create.lock');
     Route::delete('/delete/lock/{id}', [DeleteBookingLockController::class, 'delete'])->name('delete.lock');
-    Route::put('/update/{id}', 'UpdateBookingController@update')->name('update');
-    Route::put('/recipient/update/{id}', 'UpdateBookingRecipientController@update')->name('update.recipient');
-    Route::put('/cancel/{id}', 'CancelBookingController@cancel')->name('cancel');
-    Route::put('/restore/{id}', 'RestoreBookingController@restore')->name('restore');
-    Route::delete('/delete/{id}', 'DeleteBookingController@delete')->name('delete');
-    Route::post('/regenerate/invoice/{id}', 'RegenerateInvoiceBookingController@regenerate')->name('regenerate.invoice');
+    Route::put('/update/{id}', [UpdateBookingController::class, 'update'])->name('update');
+    Route::put('/recipient/update/{id}', [UpdateBookingRecipientController::class, 'update'])->name('update.recipient');
+    Route::put('/cancel/{id}', [CancelBookingController::class, 'cancel'])->name('cancel');
+    Route::put('/restore/{id}', [RestoreBookingController::class, 'restore'])->name('restore');
+    Route::delete('/delete/{id}', [DeleteBookingController::class, 'delete'])->name('delete');
+    Route::post('/regenerate/invoice/{id}', [RegenerateInvoiceBookingController::class, 'regenerate'])->name('regenerate.invoice');
 
-    Route::put('/owner/update/{id}', 'UpdateBookingOwnerController@update')->name('owner.update');
+    Route::put('/owner/update/{id}', [UpdateBookingOwnerController::class, 'update'])->name('owner.update');
 
     Route::group(['prefix' => '{id}/payment', 'as' => 'payment.'], function () {
-        Route::post('quotation', 'FetchBookingPaymentQuotationController@fetch')->name('quotation');
-        Route::post('create', 'CreateBookingPaymentController@create')->name('create');
-        Route::post('{payment_id}/verification/create', 'CreatePaymentVerificationController@create')->name('verification.create');
-        Route::put('/{payment_id}/approval/{status}', 'ApprovePaymentVerificationController@approve')->where('status', 'approve|reject')->name('approval');
-        Route::post('delete', 'ExpireBookingPaymentController@expire')->name('expire');
+        Route::post('quotation', [FetchBookingPaymentQuotationController::class, 'fetch'])->name('quotation');
+        Route::post('create', [CreateBookingPaymentController::class, 'create'])->name('create');
+        Route::post('{payment_id}/verification/create', [CreatePaymentVerificationController::class, 'create'])->name('verification.create');
+        Route::put('/{payment_id}/approval/{status}', [ApprovePaymentVerificationController::class, 'approve'])->where('status', 'approve|reject')->name('approval');
+        Route::post('delete', [ExpireBookingPaymentController::class, 'expire'])->name('expire');
     });
 
     Route::group(['prefix' => '{id}/refund', 'as' => 'refund.'], function () {
-        Route::post('{payment_id}/create', 'CreateBookingRefundController@create')->name('create');
-        Route::post('{payment_id}/credit_note/create', 'CreateBookingRefundCreditNoteController@create')->name('credit_note.create');
+        Route::post('{payment_id}/create', [CreateBookingRefundController::class, 'create'])->name('create');
+        Route::post('{payment_id}/credit_note/create', [CreateBookingRefundCreditNoteController::class, 'create'])->name('credit_note.create');
     });
 
-    Route::post('{id}/purchase_order/verification', 'ApprovePurchaseOrderController@approve')->name('po.approval');
-    Route::post('{id}/purchase_order/pdf', 'UploadPurchaseOrderController@upload')->name('po.pdf');
-    Route::delete('{id}/purchase_order/pdf', 'DeletePurchaseOrderPdfController@delete')->name('po.pdf.delete');
+    Route::post('{id}/purchase_order/verification', [ApprovePurchaseOrderController::class, 'approve'])->name('po.approval');
+    Route::post('{id}/purchase_order/pdf', [UploadPurchaseOrderController::class, 'upload'])->name('po.pdf');
+    Route::delete('{id}/purchase_order/pdf', [DeletePurchaseOrderPdfController::class, 'delete'])->name('po.pdf.delete');
 
-    Route::put('{id}/updateAmount', 'UpdateBookingAmountController@update')->name('booking_amount.update');
+    Route::put('{id}/updateAmount', [UpdateBookingAmountController::class, 'update'])->name('booking_amount.update');
     Route::put('{id}/updateAmountWithPO', [UpdateBookingAmountController::class, 'updateOnHold'])->name('amount.update');
-    Route::put('{id}/updateOrderReferences', 'UpdateBookingOrderReferenceController@update')->name('booking_order_reference.update');
+    Route::put('{id}/updateOrderReferences', [UpdateBookingOrderReferenceController::class, 'update'])->name('booking_order_reference.update');
 
-    Route::post('/merge', 'MergeBookingController@merge')->name('merge');
+    Route::post('/merge', [MergeBookingController::class, 'merge'])->name('merge');
 
-    Route::post('{id}/proforma/create', 'CreateProformaInvoiceTransaction@create')->name('proforma.create');
+    Route::post('{id}/proforma/create', [CreateProformaInvoiceTransaction::class, 'create'])->name('proforma.create');
     Route::post('{id}/banking/create', [CreateBankingInvoiceTransactionController::class, 'create'])->name('banking.create');
 
 

routes/company.php

@@ -1,42 +1,60 @@
 <?php
 
+use App\Http\Controllers\Companies\AddNewMemberController;
+use App\Http\Controllers\Companies\ApproveIdentificationDocumentController;
+use App\Http\Controllers\Companies\AssignCompanyToSegmentController;
+use App\Http\Controllers\Companies\CreateCompanyController;
+use App\Http\Controllers\Companies\CreateIdentificationDocumentController;
+use App\Http\Controllers\Companies\DeleteCompanyController;
+use App\Http\Controllers\Companies\FetchCompanyBookingQuotationController;
+use App\Http\Controllers\Companies\FetchCompanyController;
 use App\Http\Controllers\Companies\FetchCompanyEInvoiceInfoController;
+use App\Http\Controllers\Companies\ListBusinessTypesController;
+use App\Http\Controllers\Companies\ListCompaniesController;
+use App\Http\Controllers\Companies\ListCompanyTypesController;
+use App\Http\Controllers\Companies\RemoveCompanyFromSegmentController;
+use App\Http\Controllers\Companies\UpdateCompanyController;
+use App\Http\Controllers\Companies\UpdateCompanyDebtorController;
 use App\Http\Controllers\Companies\UpdateCompanyDetailsController;
 use App\Http\Controllers\Companies\UpdateCompanyEInvoiceInfoController;
+use App\Http\Controllers\Companies\UpdateCompanyNameAndDebtorController;
+use App\Http\Controllers\Companies\UpdateCompanyProfileController;
+use App\Http\Controllers\Companies\UpdateCompanyStatusController;
+use App\Http\Controllers\Companies\UpdateSupplierCurrenciesController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Companies'], function () {
-    Route::get('/{id}/show', 'FetchCompanyController@fetch')->name('show');
-    Route::get('/list', 'ListCompaniesController@list')->name('list');
-    Route::post('/create', 'CreateCompanyController@create')->name('create');
-    Route::put('/update/{id}', 'UpdateCompanyController@update')->name('update');
-    Route::put('/update/{id}/profile', 'UpdateCompanyProfileController@update')->name('profile.update');
-    Route::put('update/{id}/status', 'UpdateCompanyStatusController@update')->name('status.update');
-    // Route::delete('/delete/{id}', 'DeleteCompanyController@destroy')->name('delete');
-    Route::delete('/delete/{id}', 'DeleteCompanyController@destroy')->name('destroy');
-    Route::put('/name-and-debtor/update/{id}', 'UpdateCompanyNameAndDebtorController@update')->name('update.nameAndDebtor');
+Route::group(['prefix' => 'company', 'as' => 'company.'], function () {
+    Route::get('/{id}/show', [FetchCompanyController::class, 'fetch'])->name('show');
+    Route::get('/list', [ListCompaniesController::class, 'list'])->name('list');
+    Route::post('/create', [CreateCompanyController::class, 'create'])->name('create');
+    Route::put('/update/{id}', [UpdateCompanyController::class, 'update'])->name('update');
+    Route::put('/update/{id}/profile', [UpdateCompanyProfileController::class, 'update'])->name('profile.update');
+    Route::put('update/{id}/status', [UpdateCompanyStatusController::class, 'update'])->name('status.update');
+    // Route::delete('/delete/{id}', [DeleteCompanyController::class, 'destroy'])->name('delete');
+    Route::delete('/delete/{id}', [DeleteCompanyController::class, 'destroy'])->name('destroy');
+    Route::put('/name-and-debtor/update/{id}', [UpdateCompanyNameAndDebtorController::class, 'update'])->name('update.nameAndDebtor');
 
-    Route::get('/business-type/list', 'ListBusinessTypesController@list')->name('business_type.list');
-    Route::get('/company-type/list', 'ListCompanyTypesController@list')->name('company_type.list');
+    Route::get('/business-type/list', [ListBusinessTypesController::class, 'list'])->name('business_type.list');
+    Route::get('/company-type/list', [ListCompanyTypesController::class, 'list'])->name('company_type.list');
 
-    Route::put('/update/debtor/{id}', 'UpdateCompanyDebtorController@update')->name('delete');
+    Route::put('/update/debtor/{id}', [UpdateCompanyDebtorController::class, 'update'])->name('delete');
 
-    Route::post('/team/create', 'AddNewMemberController@create')->name('team.create');
+    Route::post('/team/create', [AddNewMemberController::class, 'create'])->name('team.create');
 
     Route::group(['prefix' => '{id}/segment', 'as' => 'segment.'], function () {
-        Route::post('/assign', 'AssignCompanyToSegmentController@assign')->name('assign');
-        Route::delete('/detach/{segment_id}', 'RemoveCompanyFromSegmentController@detach')->name('detach');
+        Route::post('/assign', [AssignCompanyToSegmentController::class, 'assign'])->name('assign');
+        Route::delete('/detach/{segment_id}', [RemoveCompanyFromSegmentController::class, 'detach'])->name('detach');
     });
 
     Route::group(['prefix' => '{id}/currency', 'as' => 'currency.'], function () {
-        Route::post('/convert', 'FetchCompanyBookingQuotationController@fetch')->name('convert');
+        Route::post('/convert', [FetchCompanyBookingQuotationController::class, 'fetch'])->name('convert');
     });
 
-    Route::put('supplier/{id}/currencies/update', 'UpdateSupplierCurrenciesController@update')->name('supplier.currencies.update');
+    Route::put('supplier/{id}/currencies/update', [UpdateSupplierCurrenciesController::class, 'update'])->name('supplier.currencies.update');
 
     Route::group(['prefix' => '{id}/identification', 'as' => 'identification.'], function () {
-        Route::post('/create', 'CreateIdentificationDocumentController@create')->name('create');
-        Route::put('/{document_id}/approval/{status}', 'ApproveIdentificationDocumentController@approve')->where('status', 'approve|reject')->name('approval');
+        Route::post('/create', [CreateIdentificationDocumentController::class, 'create'])->name('create');
+        Route::put('/{document_id}/approval/{status}', [ApproveIdentificationDocumentController::class, 'approve'])->where('status', 'approve|reject')->name('approval');
     });
 
     Route::put('/details/update/{id}', [UpdateCompanyDetailsController::class, 'update'])->name('update.details');

routes/crud.php

@@ -1,38 +1,51 @@
 <?php
 
-use Illuminate\Support\Facades\Route;
+use App\Http\Controllers\Addresses\FetchAddressController;
+use App\Http\Controllers\Addresses\ListAddressesController;
+use App\Http\Controllers\Addresses\ListDistrictsController;
 use App\Http\Controllers\Addresses\ListStatesController;
+use App\Http\Controllers\Addresses\CreateAddressController;
+use App\Http\Controllers\Addresses\UpdateAddressController;
+use App\Http\Controllers\Addresses\SetAddressToDefaultController;
+use App\Http\Controllers\Addresses\DeleteAddressController;
+use App\Http\Controllers\ServiceTypes\FetchServiceTypeController;
+use App\Http\Controllers\ServiceTypes\ListServiceTypesController;
+use App\Http\Controllers\ServiceTypes\CreateServiceTypeController;
+use App\Http\Controllers\ServiceTypes\UpdateServiceTypeController;
+use App\Http\Controllers\ServiceTypes\UpdateServiceTypeStatusController;
+use App\Http\Controllers\ServiceTypes\DeleteServiceTypeController;
+use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => 'address', 'as' => 'address.', 'namespace' => 'Addresses'], function () {
+Route::group(['prefix' => 'address', 'as' => 'address.'], function () {
 
-    Route::get('/{id}/show', 'FetchAddressController@fetch')->name('show');
+    Route::get('/{id}/show', [FetchAddressController::class, 'fetch'])->name('show');
 
-    Route::get('/list', 'ListAddressesController@list')->name('list');
-    Route::get('district/list', 'ListDistrictsController@list')->name('district.list');
+    Route::get('/list', [ListAddressesController::class, 'list'])->name('list');
+    Route::get('district/list', [ListDistrictsController::class, 'list'])->name('district.list');
     Route::get('state/list', [ListStatesController::class, 'list'])->name('state.list');
 
-    Route::post('/create', 'CreateAddressController@create')->name('create');
+    Route::post('/create', [CreateAddressController::class, 'create'])->name('create');
 
-    Route::put('/update/{id}', 'UpdateAddressController@update')->name('update');
+    Route::put('/update/{id}', [UpdateAddressController::class, 'update'])->name('update');
 
-    Route::put('/{id}/default', 'SetAddressToDefaultController@update')->name('default');
+    Route::put('/{id}/default', [SetAddressToDefaultController::class, 'update'])->name('default');
 
-    Route::delete('/delete/{id}', 'DeleteAddressController@destroy')->name('delete');
+    Route::delete('/delete/{id}', [DeleteAddressController::class, 'destroy'])->name('delete');
 
 });
 
-Route::group(['prefix' => 'service_type', 'as' => 'service_type.', 'namespace' => 'ServiceTypes'], function () {
+Route::group(['prefix' => 'service_type', 'as' => 'service_type.'], function () {
 
-    Route::get('/{id}/show', 'FetchServiceTypeController@fetch')->name('show');
+    Route::get('/{id}/show', [FetchServiceTypeController::class, 'fetch'])->name('show');
 
-    Route::get('/list', 'ListServiceTypesController@list')->name('list');
+    Route::get('/list', [ListServiceTypesController::class, 'list'])->name('list');
 
-    Route::post('/create', 'CreateServiceTypeController@create')->name('create');
+    Route::post('/create', [CreateServiceTypeController::class, 'create'])->name('create');
 
-    Route::put('/update/{id}', 'UpdateServiceTypeController@update')->name('update');
+    Route::put('/update/{id}', [UpdateServiceTypeController::class, 'update'])->name('update');
 
-    Route::put('/status/{id}/{status}', 'UpdateServiceTypeStatusController@activate')->where('status', 'active|inactive')->name('status');
+    Route::put('/status/{id}/{status}', [UpdateServiceTypeStatusController::class, 'activate'])->where('status', 'active|inactive')->name('status');
 
-    Route::delete('/delete/{id}', 'DeleteServiceTypeController@destroy')->name('delete');
+    Route::delete('/delete/{id}', [DeleteServiceTypeController::class, 'destroy'])->name('delete');
 
 });

routes/currency.php

@@ -1,14 +1,19 @@
 <?php
 
+use App\Http\Controllers\Currencies\FetchSystemPrimaryCurrencyController;
+use App\Http\Controllers\Currencies\ListCurrencyController;
+use App\Http\Controllers\Currencies\CreateCurrencyController;
+use App\Http\Controllers\Currencies\DeleteCurrencyController;
+use App\Http\Controllers\Currencies\History\ListCurrencyRateHistory;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['namespace' => 'Currencies', 'as' => 'currency.', 'prefix' => 'currency'], function () {
-    Route::get('/primary/show', 'FetchSystemPrimaryCurrencyController@fetch')->name('primary.show');
-    Route::get('/list', 'ListCurrencyController@list')->name('list');
-    Route::post('/create', 'CreateCurrencyController@create')->name('create');
-    Route::delete('/delete/{id}', 'DeleteCurrencyController@delete')->name('delete');
+Route::group(['as' => 'currency.', 'prefix' => 'currency'], function () {
+    Route::get('/primary/show', [FetchSystemPrimaryCurrencyController::class, 'fetch'])->name('primary.show');
+    Route::get('/list', [ListCurrencyController::class, 'list'])->name('list');
+    Route::post('/create', [CreateCurrencyController::class, 'create'])->name('create');
+    Route::delete('/delete/{id}', [DeleteCurrencyController::class, 'delete'])->name('delete');
 
-    Route::group(['prefix' => 'history', 'namespace' => 'History', 'as' => 'history.'], function () {
-        Route::get('/list', 'ListCurrencyRateHistory@list')->name('list');
+    Route::group(['prefix' => 'history', 'as' => 'history.'], function () {
+        Route::get('/list', [ListCurrencyRateHistory::class, 'list'])->name('list');
     });
 });

routes/document.php

@@ -1,13 +1,19 @@
 <?php
 
+use App\Http\Controllers\Documents\ApproveDocumentController;
+use App\Http\Controllers\Documents\DeleteDocumentController;
+use App\Http\Controllers\Documents\ListDocumentsController;
+use App\Http\Controllers\Documents\ListDocumentsJobController;
+use App\Http\Controllers\Documents\RejectDocumentController;
+use App\Http\Controllers\Documents\UpdateDocumentReferenceController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => 'document', 'as' => 'document.', 'namespace' => 'Documents'], function () {
-    Route::get('/list', 'ListDocumentsController@list')->name('list');
-    Route::get('/list/job', 'ListDocumentsJobController@list')->name('list.job');
-    Route::delete('/{id}/delete', 'DeleteDocumentController@delete')->name('delete');
-    Route::put('/{id}/approve', 'ApproveDocumentController@approve')->name('status.approve');
-    Route::put('/{id}/reject', 'RejectDocumentController@reject')->name('status.reject');
+Route::group(['prefix' => 'document', 'as' => 'document.'], function () {
+    Route::get('/list', [ListDocumentsController::class, 'list'])->name('list');
+    Route::get('/list/job', [ListDocumentsJobController::class, 'list'])->name('list.job');
+    Route::delete('/{id}/delete', [DeleteDocumentController::class, 'delete'])->name('delete');
+    Route::put('/{id}/approve', [ApproveDocumentController::class, 'approve'])->name('status.approve');
+    Route::put('/{id}/reject', [RejectDocumentController::class, 'reject'])->name('status.reject');
 
-    Route::put('/{id}/reference/update', 'UpdateDocumentReferenceController@update')->name('reference.update');
+    Route::put('/{id}/reference/update', [UpdateDocumentReferenceController::class, 'update'])->name('reference.update');
 });

routes/export.php

@@ -5,7 +5,7 @@ use App\Http\Controllers\Imports\ImportController;
 use Illuminate\Support\Facades\Route;
 
 
-Route::group(['prefix' => 'export', 'as' => 'export.', 'namespace' => 'Exports'], function () {
+Route::group(['prefix' => 'export', 'as' => 'export.'], function () {
     Route::group(['prefix' => 'bookings', 'as' => 'bookings.'], function () {
         Route::get('/sales-invoices', [ExportController::class, 'salesInvoices'])->name('sales_invoices');
         Route::get('/sales-invoices-refund', [ExportController::class, 'salesInvoicesWithRefund'])->name('sales_invoices_w_refund');
@@ -24,7 +24,7 @@ Route::group(['prefix' => 'export', 'as' => 'export.', 'namespace' => 'Exports']
     });
 });
 
-Route::group(['prefix' => 'import', 'as' => 'import.', 'namespace' => 'Imports'], function () {
+Route::group(['prefix' => 'import', 'as' => 'import.'], function () {
     Route::post('/import/sales-invoice', [ImportController::class, 'salesInvoices'])->name('sales_invoices');
     Route::post('/import/offical-receipt', [ImportController::class, 'officialReceipt'])->name('official_receipt');
     Route::post('/import/sales-deposit', [ImportController::class, 'salesDeposit'])->name('sales_deposit');

routes/job.php

@@ -1,8 +1,9 @@
 <?php
 
+use App\Http\Controllers\Jobs\FetchJobResultController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => 'job', 'as' => 'job.', 'namespace' => 'Jobs'], function () {
-    Route::get('/fetch/{job_id}', 'FetchJobResultController@fetch')->name('fetch');
-    Route::get('/fetch/{job_id}/{is_last}', 'FetchJobResultController@fetch')->name('fetch.last.attempt');
+Route::group(['prefix' => 'job', 'as' => 'job.'], function () {
+    Route::get('/fetch/{job_id}', [FetchJobResultController::class, 'fetch'])->name('fetch');
+    Route::get('/fetch/{job_id}/{is_last}', [FetchJobResultController::class, 'fetch'])->name('fetch.last.attempt');
 });

routes/key_value_pair.php

@@ -1,15 +1,15 @@
 <?php
 
 use App\Http\Controllers\KeyValuePairs\CreateChatGPTPromptKVPController;
+use App\Http\Controllers\KeyValuePairs\CreateClaudePromptKVPController;
+use App\Http\Controllers\KeyValuePairs\DeleteChatGPTPromptKVPController;
+use App\Http\Controllers\KeyValuePairs\DeleteClaudePromptKVPController;
 use App\Http\Controllers\KeyValuePairs\ListAiPromptsKVPController;
 use App\Http\Controllers\KeyValuePairs\UpdateChatGPTPromptKVPController;
-use App\Http\Controllers\KeyValuePairs\DeleteChatGPTPromptKVPController;
-use App\Http\Controllers\KeyValuePairs\CreateClaudePromptKVPController;
 use App\Http\Controllers\KeyValuePairs\UpdateClaudePromptKVPController;
-use App\Http\Controllers\KeyValuePairs\DeleteClaudePromptKVPController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => 'kvp', 'as' => 'kvp.', 'namespace' => 'KeyValuePairs'], function () {
+Route::group(['prefix' => 'kvp', 'as' => 'kvp.'], function () {
     Route::get('/prompts/list', [ListAiPromptsKVPController::class, 'list'])->name('prompts.list');
 
     Route::put('/chatgpt/prompt/update/{id}', [UpdateChatGPTPromptKVPController::class, 'update'])->name('chatgpt.prompt.update');

routes/milestone.php

@@ -1,11 +1,16 @@
 <?php
 
+use App\Http\Controllers\Milestones\CreateMilestoneController;
+use App\Http\Controllers\Milestones\DeleteMilestoneController;
+use App\Http\Controllers\Milestones\ListMilestoneProgressController;
+use App\Http\Controllers\Milestones\ListMilestonesController;
+use App\Http\Controllers\Milestones\UpdateMilestoneController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => 'milestone', 'as' => 'milestone.', 'namespace' => 'Milestones'], function () {
-    Route::post('/create', 'CreateMilestoneController@create')->name('create');
-    Route::put('/update/{id}', 'UpdateMilestoneController@update')->name('update');
-    Route::get('/list', 'ListMilestonesController@list')->name('list');
-    Route::get('/user/{id}/progress/list', 'ListMilestoneProgressController@list')->name('progress.list');
-    Route::delete('/delete/{id}', 'DeleteMilestoneController@delete')->name('delete');
+Route::group(['prefix' => 'milestone', 'as' => 'milestone.'], function () {
+    Route::post('/create', [CreateMilestoneController::class, 'create'])->name('create');
+    Route::put('/update/{id}', [UpdateMilestoneController::class, 'update'])->name('update');
+    Route::get('/list', [ListMilestonesController::class, 'list'])->name('list');
+    Route::get('/user/{id}/progress/list', [ListMilestoneProgressController::class, 'list'])->name('progress.list');
+    Route::delete('/delete/{id}', [DeleteMilestoneController::class, 'delete'])->name('delete');
 });

routes/rate.php

@@ -1,12 +1,18 @@
 <?php
 
+use App\Http\Controllers\Currencies\Rates\FetchRateController;
+use App\Http\Controllers\Currencies\Rates\ListRatesController;
+use App\Http\Controllers\Currencies\Rates\CalculateRateController;
+use App\Http\Controllers\Currencies\Rates\CreateRateController;
+use App\Http\Controllers\Currencies\Rates\UpdateRateController;
+use App\Http\Controllers\Currencies\Rates\DeleteRateController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['namespace' => 'Rates', 'prefix' => 'currency-rate'], function () {
-    Route::get('/{id}/show', 'FetchRateController@fetch')->name('show');
-    Route::get('/list', 'ListRatesController@list')->name('list');
-    Route::get('/calculate', 'CalculateRateController@calculate')->name('calculate');
-    Route::post('/create', 'CreateRateController@create')->name('create');
-    Route::put('/update/{id}', 'UpdateRateController@update')->name('update');
-    Route::delete('/delete/{id}', 'DeleteRateController@delete')->name('delete');
-});
+Route::group(['prefix' => 'currency-rate'], function () {
+    Route::get('/{id}/show', [FetchRateController::class, 'fetch'])->name('show');
+    Route::get('/list', [ListRatesController::class, 'list'])->name('list');
+    Route::get('/calculate', [CalculateRateController::class, 'calculate'])->name('calculate');
+    Route::post('/create', [CreateRateController::class, 'create'])->name('create');
+    Route::put('/update/{id}', [UpdateRateController::class, 'update'])->name('update');
+    Route::delete('/delete/{id}', [DeleteRateController::class, 'delete'])->name('delete');
+});

routes/receipt.php

@@ -1,10 +1,11 @@
 <?php
 
+use App\Http\Controllers\Receipts\CreateReceiptController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => 'receipt', 'namespace' => 'Receipts', 'as' => 'receipt.'], function () {
+Route::group(['prefix' => 'receipt', 'as' => 'receipt.'], function () {
 
-    Route::post('/create/{id}', 'CreateReceiptController@create')->name('create');
-    //Route::post('/create-transaction/{id}', 'CreateWalletTransactionController@create')->name('create_transaction');
+    Route::post('/create/{id}', [CreateReceiptController::class, 'create'])->name('create');
+    //Route::post('/create-transaction/{id}', [CreateWalletTransactionController::class, 'create'])->name('create_transaction');
 
 });

routes/remark.php

@@ -1,14 +1,19 @@
 <?php
 
+use App\Http\Controllers\Remarks\CreateRemarkController;
+use App\Http\Controllers\Remarks\DeleteRemarkController;
+use App\Http\Controllers\Remarks\FetchRemarkController;
 use App\Http\Controllers\Remarks\ListRefundRemarksController;
+use App\Http\Controllers\Remarks\ListRemarksController;
+use App\Http\Controllers\Remarks\UpdateRemarkController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['namespace' => 'Remarks', 'as' => 'remark.', 'prefix' => 'remark'], function () {
-    Route::get('/{id}/show', 'FetchRemarkController@fetch')->name('show');
-    Route::get('/list', 'ListRemarksController@list')->name('list');
-    Route::post('/{id}/create', 'CreateRemarkController@create')->name('create');
-    Route::put('/update/{id}', 'UpdateRemarkController@update')->name('update');
-    Route::delete('/delete/{id}', 'DeleteRemarkController@delete')->name('delete');
+Route::group(['as' => 'remark.', 'prefix' => 'remark'], function () {
+    Route::get('/{id}/show', [FetchRemarkController::class, 'fetch'])->name('show');
+    Route::get('/list', [ListRemarksController::class, 'list'])->name('list');
+    Route::post('/{id}/create', [CreateRemarkController::class, 'create'])->name('create');
+    Route::put('/update/{id}', [UpdateRemarkController::class, 'update'])->name('update');
+    Route::delete('/delete/{id}', [DeleteRemarkController::class, 'delete'])->name('delete');
 
     Route::get('/list/refund-reasons', [ListRefundRemarksController::class, 'list'])->name('list.refund_reasons');
 });

routes/reward.php

@@ -1,11 +1,15 @@
 <?php
 
+use App\Http\Controllers\Rewards\CreateRewardController;
+use App\Http\Controllers\Rewards\ListRewardsController;
+use App\Http\Controllers\Rewards\ListRewardsDetailsController;
+use App\Http\Controllers\Rewards\DeleteRewardController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => 'reward', 'as' => 'reward.', 'namespace' => 'Rewards'], function () {
-    Route::post('/create', 'CreateRewardController@create')->name('create');
-    Route::get('/list', 'ListRewardsController@list')->name('list');
-    Route::get('/list/details', 'ListRewardsDetailsController@list')->name('list.details');
-    Route::get('/list/details/{user_id}', 'ListRewardsDetailsController@list')->name('list.details.admin');
-    Route::delete('/delete/{id}', 'DeleteRewardController@delete')->name('delete');
+Route::group(['prefix' => 'reward', 'as' => 'reward.'], function () {
+    Route::post('/create', [CreateRewardController::class, 'create'])->name('create');
+    Route::get('/list', [ListRewardsController::class, 'list'])->name('list');
+    Route::get('/list/details', [ListRewardsDetailsController::class, 'list'])->name('list.details');
+    Route::get('/list/details/{user_id}', [ListRewardsDetailsController::class, 'list'])->name('list.details.admin');
+    Route::delete('/delete/{id}', [DeleteRewardController::class, 'delete'])->name('delete');
 });

routes/segment.php

@@ -1,18 +1,26 @@
 <?php
 
+use App\Http\Controllers\Segments\CreateSegmentController;
+use App\Http\Controllers\Segments\DeleteSegmentController;
+use App\Http\Controllers\Segments\FetchConstantController;
+use App\Http\Controllers\Segments\FetchSegmentController;
+use App\Http\Controllers\Segments\ListSegmentsController;
+use App\Http\Controllers\Segments\UpdateConstantController;
+use App\Http\Controllers\Segments\UpdateCustomServiceConstantController;
+use App\Http\Controllers\Segments\UpdateSegmentController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => 'segment', 'as' => 'segment.', 'namespace' => 'Segments'], function () {
-    Route::get('/{id}/show', 'FetchSegmentController@fetch')->name('show');
-    Route::post('/create', 'CreateSegmentController@create')->name('create');
-    Route::put('/update/{id}', 'UpdateSegmentController@update')->name('update');
-    Route::delete('/delete/{id}', 'DeleteSegmentController@delete')->name('delete');
-    Route::get('/list', 'ListSegmentsController@list')->name('list');
+Route::group(['prefix' => 'segment', 'as' => 'segment.'], function () {
+    Route::get('/{id}/show', [FetchSegmentController::class, 'fetch'])->name('show');
+    Route::post('/create', [CreateSegmentController::class, 'create'])->name('create');
+    Route::put('/update/{id}', [UpdateSegmentController::class, 'update'])->name('update');
+    Route::delete('/delete/{id}', [DeleteSegmentController::class, 'delete'])->name('delete');
+    Route::get('/list', [ListSegmentsController::class, 'list'])->name('list');
 
     Route::group(['prefix' => '{id}/constant', 'as' => 'constant.'], function () {
-        Route::put('/service/update', 'UpdateCustomServiceConstantController@update')->name('service.update');
-        Route::put('/update', 'UpdateConstantController@update')->name('update');
-        Route::get('/show/{reference}', 'FetchConstantController@fetch')->name('show');
+        Route::put('/service/update', [UpdateCustomServiceConstantController::class, 'update'])->name('service.update');
+        Route::put('/update', [UpdateConstantController::class, 'update'])->name('update');
+        Route::get('/show/{reference}', [FetchConstantController::class, 'fetch'])->name('show');
     });
 
 });

routes/segment_constant.php

@@ -1,23 +1,24 @@
 <?php
 
+use App\Http\Controllers\SegmentConstants\CreateSegmentConstantController;
+use App\Http\Controllers\SegmentConstants\FetchSegmentConstantController;
+use App\Http\Controllers\SegmentConstants\UpdateSegmentConstantController;
 use Illuminate\Support\Facades\Route;
 
 // Route::group(['namespace' => 'StandardSegmentConstants'], function () {
 //     Route::group(['middleware' => 'valid.token'], function () {
 //         Route::group(['prefix' => 'standard-segment-constant'], function () {
-//             Route::get('/list', 'ListStandardSegmentConstantsController@list')->name('standard_segment.update');
-//             Route::put('/update/{id}', 'UpdateStandardSegmentConstantController@update')->name('standard_segment_constant.update');
+//             Route::get('/list', [ListStandardSegmentConstantsController::class, 'list'])->name('standard_segment.update');
+//             Route::put('/update/{id}', [UpdateStandardSegmentConstantController::class, 'update'])->name('standard_segment_constant.update');
 //         });
 //     });
 // });
 
 
-Route::group(['namespace' => 'SegmentConstants'], function () {
-    Route::group(['middleware' => 'valid.token'], function () {
-        Route::group(['prefix' => 'segment-constant'], function () {
-            Route::get('/{id}/show', 'FetchSegmentConstantController@fetch')->name('segment_constant.show');
-            Route::post('/create', 'CreateSegmentConstantController@create')->name('segment_constant.create');
-            Route::put('/update/{id}', 'UpdateSegmentConstantController@update')->name('segment_constant.update');
-        });
+Route::group(['middleware' => 'valid.token'], function () {
+    Route::group(['prefix' => 'segment-constant'], function () {
+        Route::get('/{id}/show', [FetchSegmentConstantController::class, 'fetch'])->name('segment_constant.show');
+        Route::post('/create', [CreateSegmentConstantController::class, 'create'])->name('segment_constant.create');
+        Route::put('/update/{id}', [UpdateSegmentConstantController::class, 'update'])->name('segment_constant.update');
     });
 });

routes/transaction.php

@@ -1,55 +1,84 @@
 <?php
 
 use App\Http\Controllers\Transactions\ETLPurchaseOrderTransactionController;
+use App\Http\Controllers\Transactions\ListTransactionsController;
+use App\Http\Controllers\Transactions\ListTransactionsJobController;
+use App\Http\Controllers\Transactions\ListUrgentTransactionsController;
+use App\Http\Controllers\Transactions\SuspendTransactionController;
+use App\Http\Controllers\Transactions\CreateSupplierTransactionController;
+use App\Http\Controllers\Transactions\CreateSupplierBillGroupController;
+use App\Http\Controllers\Transactions\CreatePaymentProofDocumentController;
+use App\Http\Controllers\Transactions\UpdatePaymentTransactionStatusController;
+use App\Http\Controllers\Transactions\UpdateRefundTransactionStatusController;
+use App\Http\Controllers\Transactions\DeleteRefundTransactionController;
+use App\Http\Controllers\Transactions\DeletePaymentProofDocumentController;
+use App\Http\Controllers\Transactions\CreatePurchaseOrderTransactionController;
+use App\Http\Controllers\Transactions\ImportPurchaseOrderTransactionController;
+use App\Http\Controllers\Transactions\CreateBulkPurchaseOrderTransactionController;
+use App\Http\Controllers\Transactions\ListWalletTransactionsController;
+use App\Http\Controllers\Transactions\FetchCompanyAccountBalanceController;
+use App\Http\Controllers\Transactions\FetchCompanyTransactionStatementController;
+use App\Http\Controllers\Transactions\FetchBankAccountBalanceController;
+use App\Http\Controllers\Transactions\ListGroupsController;
+use App\Http\Controllers\Transactions\DeleteGroupController;
+use App\Http\Controllers\Transactions\UpdateGroupController;
+use App\Http\Controllers\Transactions\UpdateGroupTransferFeeController;
+use App\Http\Controllers\Transactions\CreateBulkPurchaseOrderDocumentController;
+use App\Http\Controllers\Transactions\ListBillGroupsController;
+use App\Http\Controllers\Transactions\CreateBillGroupPaymentProofDocumentController;
+use App\Http\Controllers\Transactions\ApproveBillGroupPaymentVerificationController;
+use App\Http\Controllers\Transactions\DeleteBillGroupController;
+use App\Http\Controllers\Transactions\CancelBillGroupController;
+use App\Http\Controllers\Transactions\CreateBillGroupPaymentTransactionController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' => 'transaction.'], function () {
+Route::group(['prefix' => 'transactions', 'as' => 'transaction.'], function () {
 
-    Route::get('/list', 'ListTransactionsController@list')->name('list');
-    Route::get('/list/job', 'ListTransactionsJobController@list')->name('list.job');
-    Route::get('/list/urgent', 'ListUrgentTransactionsController@list')->name('list.urgent');
-    Route::delete('/suspend/{id}', 'SuspendTransactionController@suspend')->name('suspend');
+    Route::get('/list', [ListTransactionsController::class, 'list'])->name('list');
+    Route::get('/list/job', [ListTransactionsJobController::class, 'list'])->name('list.job');
+    Route::get('/list/urgent', [ListUrgentTransactionsController::class, 'list'])->name('list.urgent');
+    Route::delete('/suspend/{id}', [SuspendTransactionController::class, 'suspend'])->name('suspend');
 
-    route::post('/supplier/{id}/bill/create', 'CreateSupplierTransactionController@create')->name('supplier.create');
-    route::post('/supplier/{id}/bill/group/create', 'CreateSupplierBillGroupController@create')->name('supplier.bill_group.create');
-    route::post('{id}/bill/verification', 'CreatePaymentProofDocumentController@verify')->name('bill.verification');
-    route::post('{id}/bill/pay', 'CreatePaymentProofDocumentController@pay')->name('bill.pay');
-    Route::put('/{id}/bill/{status}', 'UpdatePaymentTransactionStatusController@update')->where('status', 'pending|complete')->name('bill.status');
-    Route::put('/{id}/refund/status/update/{status}', 'UpdateRefundTransactionStatusController@update')->name('refund.status.update');
+    Route::post('/supplier/{id}/bill/create', [CreateSupplierTransactionController::class, 'create'])->name('supplier.create');
+    Route::post('/supplier/{id}/bill/group/create', [CreateSupplierBillGroupController::class, 'create'])->name('supplier.bill_group.create');
+    Route::post('{id}/bill/verification', [CreatePaymentProofDocumentController::class, 'verify'])->name('bill.verification');
+    Route::post('{id}/bill/pay', [CreatePaymentProofDocumentController::class, 'pay'])->name('bill.pay');
+    Route::put('/{id}/bill/{status}', [UpdatePaymentTransactionStatusController::class, 'update'])->where('status', 'pending|complete')->name('bill.status');
+    Route::put('/{id}/refund/status/update/{status}', [UpdateRefundTransactionStatusController::class, 'update'])->name('refund.status.update');
 
-    Route::delete('/refund/{id}/delete', 'DeleteRefundTransactionController@delete')->name('refund.delete');
+    Route::delete('/refund/{id}/delete', [DeleteRefundTransactionController::class, 'delete'])->name('refund.delete');
 
-    route::delete('{id}/bill/delete', 'DeletePaymentProofDocumentController@delete')->name('bill.delete');
+    Route::delete('{id}/bill/delete', [DeletePaymentProofDocumentController::class, 'delete'])->name('bill.delete');
 
-    Route::post('booking/{id}/details/update', 'CreatePurchaseOrderTransactionController@create')->name('po.create');
-    Route::post('booking/{id}/details/import', 'ImportPurchaseOrderTransactionController@import')->name('po.import');
+    Route::post('booking/{id}/details/update', [CreatePurchaseOrderTransactionController::class, 'create'])->name('po.create');
+    Route::post('booking/{id}/details/import', [ImportPurchaseOrderTransactionController::class, 'import'])->name('po.import');
     Route::post('booking/{id}/details/etl', [ETLPurchaseOrderTransactionController::class, 'etl'])->name('po.etl');
 
-    Route::get('bulk/po/{issuer_id}/{start_date}/{end_date}', 'CreateBulkPurchaseOrderTransactionController@create')->name('po.bulk.create');
+    Route::get('bulk/po/{issuer_id}/{start_date}/{end_date}', [CreateBulkPurchaseOrderTransactionController::class, 'create'])->name('po.bulk.create');
 
-    Route::get('wallet/list', 'ListWalletTransactionsController@list')->name('wallet.list');
+    Route::get('wallet/list', [ListWalletTransactionsController::class, 'list'])->name('wallet.list');
 
-    Route::get('/company/{id}/account/balance', 'FetchCompanyAccountBalanceController@fetch')->name('company.account.balance');
-    Route::get('/company/{id}/transaction/fetch', 'FetchCompanyTransactionStatementController@fetch')->name('company.transaction.fetch');
+    Route::get('/company/{id}/account/balance', [FetchCompanyAccountBalanceController::class, 'fetch'])->name('company.account.balance');
+    Route::get('/company/{id}/transaction/fetch', [FetchCompanyTransactionStatementController::class, 'fetch'])->name('company.transaction.fetch');
 
-    Route::get('/bank/{id}/account/balance', 'FetchBankAccountBalanceController@fetch')->name('bank.account.balance');
+    Route::get('/bank/{id}/account/balance', [FetchBankAccountBalanceController::class, 'fetch'])->name('bank.account.balance');
 
     Route::group(['prefix' => 'groups', 'as' => 'group.'], function () {
-        Route::get('/list', 'ListGroupsController@list')->name('list');
-        Route::delete('/{id}/delete', 'DeleteGroupController@delete')->name('delete');
-        Route::put('/{id}/update', 'UpdateGroupController@update')->name('update');
-        Route::put('/{id}/update/fee', 'UpdateGroupTransferFeeController@update')->name('fee.update');
-        Route::post('/{id}/approve', 'CreateBulkPurchaseOrderDocumentController@aprove')->name('approve');
-        Route::post('/bulk/po', 'CreateBulkPurchaseOrderDocumentController@create')->name('bulk.po');
+        Route::get('/list', [ListGroupsController::class, 'list'])->name('list');
+        Route::delete('/{id}/delete', [DeleteGroupController::class, 'delete'])->name('delete');
+        Route::put('/{id}/update', [UpdateGroupController::class, 'update'])->name('update');
+        Route::put('/{id}/update/fee', [UpdateGroupTransferFeeController::class, 'update'])->name('fee.update');
+        Route::post('/{id}/approve', [CreateBulkPurchaseOrderDocumentController::class, 'aprove'])->name('approve');
+        Route::post('/bulk/po', [CreateBulkPurchaseOrderDocumentController::class, 'create'])->name('bulk.po');
 
         Route::group(['prefix' => 'bills', 'as' => 'bill.'], function () {
-            Route::get('/list', 'ListBillGroupsController@list')->name('list');
-            Route::post('/transaction/{id}', 'CreateBillGroupPaymentProofDocumentController@create')->name('payment_proof.create');
-            Route::post('/transaction/{id}/approval/{status}', 'ApproveBillGroupPaymentVerificationController@approve')->where('status', 'approve|reject')->name('payment_proof.approval');
-            Route::delete('/{id}/delete', 'DeleteBillGroupController@delete')->name('delete');
-            Route::put('/{id}/cancel', 'CancelBillGroupController@cancel')->name('cancel');
-            Route::post('/{id}/pay', 'CreateBillGroupPaymentTransactionController@pay')->name('pay');
-            // Route::post('/bulk/po', 'CreateBulkPurchaseOrderDocumentController@create')->name('bulk.po');
+            Route::get('/list', [ListBillGroupsController::class, 'list'])->name('list');
+            Route::post('/transaction/{id}', [CreateBillGroupPaymentProofDocumentController::class, 'create'])->name('payment_proof.create');
+            Route::post('/transaction/{id}/approval/{status}', [ApproveBillGroupPaymentVerificationController::class, 'approve'])->where('status', 'approve|reject')->name('payment_proof.approval');
+            Route::delete('/{id}/delete', [DeleteBillGroupController::class, 'delete'])->name('delete');
+            Route::put('/{id}/cancel', [CancelBillGroupController::class, 'cancel'])->name('cancel');
+            Route::post('/{id}/pay', [CreateBillGroupPaymentTransactionController::class, 'pay'])->name('pay');
+            // Route::post('/bulk/po', [CreateBulkPurchaseOrderDocumentController::class, 'create'])->name('bulk.po');
         });
     });
 });

routes/voucher.php

@@ -1,11 +1,15 @@
 <?php
 
+use App\Http\Controllers\Vouchers\ValidateVoucherController;
+use App\Http\Controllers\Vouchers\CreateVoucherController;
+use App\Http\Controllers\Vouchers\ListUserVouchersController;
+use App\Http\Controllers\Vouchers\ListVoucherCampaignsController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => 'voucher', 'as' => 'voucher.', 'namespace' => 'Vouchers'], function () {
-    Route::post('fetch', 'ValidateVoucherController@validate')->name('validate');
-    Route::post('create', 'CreateVoucherController@create')->name('create');
-    // Route::post('redeem', 'RedeemVoucherController@redeem')->name('redeem');
-    Route::get('/user/list', 'ListUserVouchersController@list')->name('user.list');
-    Route::get('/voucher/campaigns/list', 'ListVoucherCampaignsController@list')->name('campaigns.list');
+Route::group(['prefix' => 'voucher', 'as' => 'voucher.'], function () {
+    Route::post('fetch', [ValidateVoucherController::class, 'validate'])->name('validate');
+    Route::post('create', [CreateVoucherController::class, 'create'])->name('create');
+    // Route::post('redeem', [RedeemVoucherController::class, 'redeem'])->name('redeem');
+    Route::get('/user/list', [ListUserVouchersController::class, 'list'])->name('user.list');
+    Route::get('/voucher/campaigns/list', [ListVoucherCampaignsController::class, 'list'])->name('campaigns.list');
 });

routes/wallet.php

@@ -1,15 +1,21 @@
 <?php
 
+use App\Http\Controllers\Wallets\CreateWalletController;
+use App\Http\Controllers\Wallets\CreditWalletController;
+use App\Http\Controllers\Wallets\ListWalletController;
+use App\Http\Controllers\Wallets\TopUpWalletController;
+use App\Http\Controllers\Wallets\UpdateStatusWalletController;
+use App\Http\Controllers\Wallets\WalletReportController;
 use Illuminate\Support\Facades\Route;
 
-Route::group(['prefix' => 'wallets', 'namespace' => 'Wallets', 'as' => 'wallet.'], function () {
-    Route::get('/', 'ListWalletController@list')->name('list');
-    Route::post('/create', 'CreateWalletController@create')->name('create');
+Route::group(['prefix' => 'wallets', 'as' => 'wallet.'], function () {
+    Route::get('/', [ListWalletController::class, 'list'])->name('list');
+    Route::post('/create', [CreateWalletController::class, 'create'])->name('create');
 
-    Route::post('/topup', 'TopUpWalletController@topUp')->name('topup'); // user
-    Route::post('/credit', 'CreditWalletController@credit')->name('credit'); // admin +
+    Route::post('/topup', [TopUpWalletController::class, 'topUp'])->name('topup'); // user
+    Route::post('/credit', [CreditWalletController::class, 'credit'])->name('credit'); // admin +
 
-    Route::put('/{transaction_id}/update-status/{status}', 'UpdateStatusWalletController@updateStatus')->where('status', 'approve|reject')->name('approval');
+    Route::put('/{transaction_id}/update-status/{status}', [UpdateStatusWalletController::class, 'updateStatus'])->where('status', 'approve|reject')->name('approval');
 
-    Route::get('/reports', 'WalletReportController@walletsReport')->name('reports');
+    Route::get('/reports', [WalletReportController::class, 'walletsReport'])->name('reports');
 });

routes/web.php

@@ -1,7 +1,17 @@
 <?php
 
+use App\Http\Controllers\Billplz\CallbackBillplzController;
 use App\Classes\General\LogHelper;
 use App\Http\Controllers\Accounting\BankStatementController;
+use App\Http\Controllers\Bookings\AutoPurchaseOrderFillController;
+use App\Http\Controllers\Bookings\DownloadBookingDocumentController;
+use App\Http\Controllers\Exports\ExportAnalyticToExcelController;
+use App\Http\Controllers\Exports\ExportCustomersToExcelController;
+use App\Http\Controllers\Exports\ExportCustomersWalletTransactionToExcelController;
+use App\Http\Controllers\Imports\ImportBankRecordController;
+use App\Http\Controllers\Notifications\ListNotificationsController;
+use App\Http\Controllers\Transactions\DownloadMockUpWhiteFormPdfController;
+use App\Http\Controllers\Transactions\GenerateCreditNotePdfController;
 use App\Models\Group;
 use App\Models\Remark;
 use Carbon\Carbon;
@@ -266,7 +276,7 @@ Route::post('/support', function (Request $request) {
 
 })->name('support'); //duplicate name
 
-Route::get('/online_payment/redirect', 'Billplz\CallbackBillplzController@callback')->name('online_payment.redirect');
+Route::get('/online_payment/redirect', [CallbackBillplzController::class, 'callback'])->name('online_payment.redirect');
 
 Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsProducts $exportsProducts) {
     $exportFileName = 'products.csv';
@@ -315,7 +325,7 @@ Route::get('/wallet/{marking}/details', function ($marking) {
     return view('pages.wallet.index', ['id' => $id, 'wallet_id' => $wallet_id]);
 })->name('wallet.details');
 
-Route::get('/wallet/{marking}/{is_precise}/export', 'Exports\ExportCustomersWalletTransactionToExcelController@export')->name('wallet.details-export');
+Route::get('/wallet/{marking}/{is_precise}/export', [ExportCustomersWalletTransactionToExcelController::class, 'export'])->name('wallet.details-export');
 
 Route::get('/wallets', function () {
     return view('pages.wallet.wallets');
@@ -325,31 +335,31 @@ Route::get('/bookings/billplz', function () {
     return view('pages.billplz_redirect');
 })->name('bookings.billplz');
 
-Route::get('/document/download', 'Bookings\DownloadBookingDocumentController@download')->name('documents.download');
+Route::get('/document/download', [DownloadBookingDocumentController::class, 'download'])->name('documents.download');
 
 Route::get('billplz/bills/{bill_no}', function($bill_no){
    return redirect(env('BILLPLZ_BASE_URL').'/bills/'.$bill_no);
 })->name('billplz.bill');
 
 
-Route::get('/export/customers/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@export')->name('customers.export');
-Route::get('/export/transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@transactions')->name('transactions.export');
-Route::get('/export/transactions/v2/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@v2transactions')->name('transactions.v2.export');
-Route::get('/export/null-debtor/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@nullDebtor')->name('newDebtor.export');
-Route::get('/export/payment-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@paymentTransactions')->name('paymentTransactions.export');
-Route::get('/export/white-form-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@whiteFormTransactions')->name('whiteFormTransactions.export');
-Route::get('/export/wallet-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@walletTransactions')->name('walletTransactions.export');
-Route::get('/export/booking-transactions', 'Exports\ExportCustomersToExcelController@bookingTransactions')->name('export.transactions.booking');
-Route::get('/export/invoice-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@invoiceTransactions')->name('invoiceTransactions.export');
-Route::get('/export/receipt-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@receiptTransactions')->name('receiptTransactions.export');
-Route::get('/export/imported-invoice-mapped', 'Exports\ExportCustomersToExcelController@importedInvoiceMapped')->name('importedInvoiceMapped.export');
-Route::get('/export/imported-receipt-mapped', 'Exports\ExportCustomersToExcelController@importedReceiptMapped')->name('importedReceiptMapped.export');
-Route::get('/export/analytic/booking', 'Exports\ExportAnalyticToExcelController@bookingData')->name('bookingData.export');;
-Route::get('/export/analytic/bills', 'Exports\ExportAnalyticToExcelController@billingData')->name('billingData.export');;
-Route::get('/export/customers/leads', 'Exports\ExportCustomersToExcelController@leadsData')->name('leads.export');
-route::get('/export/excel/{id}', 'Exports\ExportCustomersToExcelController@exportCurrencyVendorOrder')->name('group.excel');
-Route::get('/export/einv-debtor/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@eInvoiceDebtorSummary')->name('eInvoiceDebtorSummary.export');
-Route::get('/export/all-customers-info-for-lark-system', 'Exports\ExportCustomersToExcelController@exportAllCustomersInfoForLarkSystem')->name('exportAllCustomersInfoForLarkSystem.export');
+Route::get('/export/customers/f614e339d7058904a831aad742e24d55', [ExportCustomersToExcelController::class, 'export'])->name('customers.export');
+Route::get('/export/transactions/f614e339d7058904a831aad742e24d55', [ExportCustomersToExcelController::class, 'transactions'])->name('transactions.export');
+Route::get('/export/transactions/v2/f614e339d7058904a831aad742e24d55', [ExportCustomersToExcelController::class, 'v2transactions'])->name('transactions.v2.export');
+Route::get('/export/null-debtor/f614e339d7058904a831aad742e24d55', [ExportCustomersToExcelController::class, 'nullDebtor'])->name('newDebtor.export');
+Route::get('/export/payment-transactions/f614e339d7058904a831aad742e24d55', [ExportCustomersToExcelController::class, 'paymentTransactions'])->name('paymentTransactions.export');
+Route::get('/export/white-form-transactions/f614e339d7058904a831aad742e24d55', [ExportCustomersToExcelController::class, 'whiteFormTransactions'])->name('whiteFormTransactions.export');
+Route::get('/export/wallet-transactions/f614e339d7058904a831aad742e24d55', [ExportCustomersToExcelController::class, 'walletTransactions'])->name('walletTransactions.export');
+Route::get('/export/booking-transactions', [ExportCustomersToExcelController::class, 'bookingTransactions'])->name('export.transactions.booking');
+Route::get('/export/invoice-transactions/f614e339d7058904a831aad742e24d55', [ExportCustomersToExcelController::class, 'invoiceTransactions'])->name('invoiceTransactions.export');
+Route::get('/export/receipt-transactions/f614e339d7058904a831aad742e24d55', [ExportCustomersToExcelController::class, 'receiptTransactions'])->name('receiptTransactions.export');
+Route::get('/export/imported-invoice-mapped', [ExportCustomersToExcelController::class, 'importedInvoiceMapped'])->name('importedInvoiceMapped.export');
+Route::get('/export/imported-receipt-mapped', [ExportCustomersToExcelController::class, 'importedReceiptMapped'])->name('importedReceiptMapped.export');
+Route::get('/export/analytic/booking', [ExportAnalyticToExcelController::class, 'bookingData'])->name('bookingData.export');;
+Route::get('/export/analytic/bills', [ExportAnalyticToExcelController::class, 'billingData'])->name('billingData.export');;
+Route::get('/export/customers/leads', [ExportCustomersToExcelController::class, 'leadsData'])->name('leads.export');
+Route::get('/export/excel/{id}', [ExportCustomersToExcelController::class, 'exportCurrencyVendorOrder'])->name('group.excel');
+Route::get('/export/einv-debtor/f614e339d7058904a831aad742e24d55', [ExportCustomersToExcelController::class, 'eInvoiceDebtorSummary'])->name('eInvoiceDebtorSummary.export');
+Route::get('/export/all-customers-info-for-lark-system', [ExportCustomersToExcelController::class, 'exportAllCustomersInfoForLarkSystem'])->name('exportAllCustomersInfoForLarkSystem.export');
 
 Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsProducts $exportsProducts) {
     $bookings = Booking::where(function($query){
@@ -370,7 +380,7 @@ Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsP
     }
 })->name('products.random.3');
 
-Route::get('/auto-purchase-order-fill', 'Bookings\AutoPurchaseOrderFillController@auto')->name('assign');
+Route::get('/auto-purchase-order-fill', [AutoPurchaseOrderFillController::class, 'auto'])->name('assign');
 
 Route::get('purchase/sensitive/', function(Request $request){
     $keywords = json_decode($request->input('keywords'));
@@ -391,9 +401,9 @@ Route::get('purchase/sensitive/', function(Request $request){
     }
 });
 
-Route::get('/transactions/supplier/{id}/mock_up', 'Transactions\DownloadMockUpWhiteFormPdfController@download')->name('whiteForm.mockUp');
+Route::get('/transactions/supplier/{id}/mock_up', [DownloadMockUpWhiteFormPdfController::class, 'download'])->name('whiteForm.mockUp');
 
-Route::get('/notifications/list', 'Notifications\ListNotificationsController@list')->name('notifications.list');
+Route::get('/notifications/list', [ListNotificationsController::class, 'list'])->name('notifications.list');
 
 Route::get('/supplier/pi/export/{month}/{year}/{id?}', function($month, $year, $id = null){
 
@@ -943,7 +953,7 @@ Route::get('/statements/{account}/transactions', function ($account) {
 Route::get('/statements/{statement}', [BankStatementController::class, 'show'])->name('statements.show');
 Route::get('/statements/mapping/rerun', [BankStatementController::class, 'rerun'])->name('statements.rerun');
 // Route::get('/statements/{statement}/download', 'StatementController@download')->name('statements.download');
-Route::get('/bank-record', 'Imports\ImportBankRecordController@import');
+Route::get('/bank-record', [ImportBankRecordController::class, 'import']);
 
 Route::get('/po/outsource/check', function(){
     $bookings = Booking::whereIn('marking', [34735, 43980, 35339, 28104, 40185, 46648, 34192, 21512, 84607, 31319, 23566, 48372, 59239, 72665, 81127, 46881, 41055, 67368, 41817, 60443, 28958, 46782, 98512, 43356, 78469, 88173, 52592, 77036, 76750, 77732, 31980, 57146, 38544, 78567, 98297, 90128, 43680, 86478, 80340, 41961, 26857, 33992, 79929, 53226, 88107, 31187, 68015, 43762, 34928, 55525, 44528, 57146, 31980, 27399, 63141, 74987, 85935, 37032, 95911, 59511, 47395, 97293, 43906, 74944, 53418, 61988, 81406, 83889, 83359, 66896, 21425, 61124, 23536, 56129, 21116, 64213, 72950, 20502, 20067, 64213, 59854, 44783, 35681, 74828, 28179, 32961, 46412, 99908, 49008, 77655, 45250, 65047, 37167, 90598, 26275, 58013, 38994, 63187, 33219, 52669, 79885, 74828, 91775, 29282, 46781, 96415, 36318, 84491, 32659, 23846, 38994, 65329, 25936, 68209, 72866, 63231, 32216, 82977, 24819, 32600, 38019, 80872, 65505, 37236, 82262, 30815, 59033, 46776, 87317, 89548, 36548, 54468, 35340, 98242, 29234, 47129, 67047, 64210, 36698, 39353, 86435, 65240, 37116, 71007, 40148, 88187, 76368, 91155, 57040, 95456, 29961, 66447, 43023, 29396, 30637, 60789, 84221, 35805, 44552, 35524, 43457, 22810, 83545, 92252, 83603, 59797, 40526, 32520, 71011, 95151, 90464, 78629, 61225, 74864, 73518, 53793, 26478, 57640, 43674, 23476, 76683, 23920, 22810, 44603, 56291, 23580, 94241, 51565, 83769, 63123, 58369, 99399, 41098, 60942, 69442, 80963, 48392, 73169, 59764, 66099, 21107, 33029, 38288, 32223, 55931, 43685, 24267, 83865, 52066, 61501, 83210, 20731, 55951, 82502, 66618, 62216, 22020, 42402, 99644, 35305, 49263, 37387, 73928, 92279, 26445, 83497, 96740, 38374, 29273, 94073, 99785, 21502, 51269, 31609, 97369, 73078, 28982, 64902, 41380, 87008, 59377, 39441, 81341, 62750, 29410, 85975, 37215, 43386, 80627, 79967, 81729, 81738, 58658, 40579, 56179, 37548, 72436, 77165, 32069, 97447, 84575, 49167, 45507, 96371, 90835, 27942, 87691, 30431, 47815, 82960, 43228, 87534, 93737, 98938, 69548, 82923, 48463, 24385, 96569, 53812, 32926, 54418, 34399, 53189, 49377, 27036, 68832, 72799, 76120, 78203, 87009, 86992, 97722, 96262, 95551, 77632, 54408, 33931, 62397, 58343, 52347, 59419, 50339, 54941, 31199, 92385, 90028, 90379, 43070, 25357, 24591, 60276, 91851, 96371, 81886, 24377, 21236, 66737, 93637, 85844, 23130, 75659, 27318, 43587, 46555, 28903, 44930, 52377, 20387, 40705, 79255, 29196, 30968, 76319, 54600, 29881, 37920, 43319, 35893, 65863, 33102, 71589, 45905, 49031, 97435, 70157, 78795, 47570, 71881, 92076, 45847, 35957, 58785, 84896, 65918, 25550, 49031, 50624, 83286, 63111, 21402, 56300, 77238, 21271, 21984, 30500, 76170, 95325, 22888, 84895, 26100, 84952, 49302, 41944, 43703, 84028, 53672, 49162, 28342, 47182, 70484, 59467, 85415, 20202, 97967, 58011, 85807, 79868, 81192, 86985, 43867, 47473, 28063, 68849, 61628, 96641, 37285, 58384, 86505, 51720, 63951, 91958, 28082, 46229, 57439, 55178, 96813, 34444, 28100, 75967, 33204, 75922, 68707, 71960, 34769, 29161, 49088, 79773, 91131, 53033, 77611, 81034, 72625, 36273, 78240, 34647, 21838, 73195, 83282, 60911, 29019, 98859, 44064, 82113, 51118, 54681, 59751, 64347, 21623, 47023, 62168, 23466, 62137, 85432, 85043, 41984, 30417, 40616, 97170, 69106, 81484, 68902, 78149, 62438, 67710, 57370, 99207, 64271, 33959, 60821, 51292, 44130, 28469, 77069, 91088, 47702, 89046, 84958, 41601, 99752, 72976, 26393, 85548, 32920, 86353, 97430, 71507, 36667, 57059, 71148, 44588, 35807, 80213, 89884, 76616, 35999, 79860, 37284, 72249, 32885, 70622, 47036, 97366, 60483, 89171, 37048, 34227, 76290, 46761, 31389, 73977, 54421, 87527, 75925, 68236, 31131, 43871, 54753, 90896, 41653, 82304, 87123, 80391, 42368, 35553, 60587, 30941, 31843, 25076])
@@ -1035,8 +1045,8 @@ Route::get('/customer/vouchers/{marking}', function ($marking) {
     }
 })->name('customer.reward');
 
-Route::get('transaction/{id}/credit_note/download', 'Transactions\GenerateCreditNotePdfController@downloadV2')->name('transaction.credit_note.download');
-Route::get('transaction/{id}/credit_note/download/v2', 'Transactions\GenerateCreditNotePdfController@downloadV2')->name('transaction.credit_note.download.v2');
+Route::get('transaction/{id}/credit_note/download', [GenerateCreditNotePdfController::class, 'downloadV2'])->name('transaction.credit_note.download');
+Route::get('transaction/{id}/credit_note/download/v2', [GenerateCreditNotePdfController::class, 'downloadV2'])->name('transaction.credit_note.download.v2');
 
 Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking, $started_at, $ended_at) {
 
@@ -1117,7 +1127,7 @@ Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking,
     );
 })->name('invoice.fix.byCustomerMarking');
 
-route:: post('/transaction/{id}/create-remark',function ($transactionId) {
+Route::post('/transaction/{id}/create-remark',function ($transactionId) {
     $transaction = Transaction::find($transactionId);
     $remark = new Remark();