diff --git a/app/Classes/Jobs/Commands/V2/ProcessPaymentReportV2CommandJob.php b/app/Classes/Jobs/Commands/V2/ProcessPaymentReportV2CommandJob.php index 6537670d..3543fec3 100644 --- a/app/Classes/Jobs/Commands/V2/ProcessPaymentReportV2CommandJob.php +++ b/app/Classes/Jobs/Commands/V2/ProcessPaymentReportV2CommandJob.php @@ -35,7 +35,7 @@ class ProcessPaymentReportV2CommandJob implements ShouldQueue public function handle() { - Log::info(Carbon::now() . ': Start job - Processing single record from 01R - RECEIVE PAYMENT (FULL PAYMENT) [AR RECEIVE PAYMENT] Import.'); + Log::info(Carbon::now() . ': Start job - Processing single record from 01R - RECEIVE PAYMENT [AR RECEIVE PAYMENT] Import.'); $start = new Carbon(); $docNo = $this->details['docno'] ?? null; @@ -73,7 +73,7 @@ class ProcessPaymentReportV2CommandJob implements ShouldQueue $end = new Carbon(); $elapsedTime = $start->diff($end)->format('%H:%I:%S'); - Log::info(Carbon::now() . ': End job - Processing single record from 01R - RECEIVE PAYMENT (FULL PAYMENT) [AR RECEIVE PAYMENT] Import. ElapsedTime: ' . $elapsedTime . '.'); + Log::info(Carbon::now() . ': End job - Processing single record from 01R - RECEIVE PAYMENT [AR RECEIVE PAYMENT] Import. ElapsedTime: ' . $elapsedTime . '.'); } diff --git a/app/Classes/Modules/Imports/ControllersLogic/ImportExcelLogic.php b/app/Classes/Modules/Imports/ControllersLogic/ImportExcelLogic.php index 377407a2..02fef6ae 100644 --- a/app/Classes/Modules/Imports/ControllersLogic/ImportExcelLogic.php +++ b/app/Classes/Modules/Imports/ControllersLogic/ImportExcelLogic.php @@ -137,7 +137,7 @@ class ImportExcelLogic extends AbstractControllerLogic elseif ($reportType === 'Customers Report' && $normalizedHeader !== $customersReportHeader) { throw new MalformedRequestException('Uploaded Excel file format is incorrect. Column headers do not match expected format.'); } - elseif ($reportType === '01R - RECEIVE PAYMENT (FULL PAYMENT) [AR RECEIVE PAYMENT]' && $normalizedHeader !== $paymentReportHeader) { + elseif ($reportType === '01R - RECEIVE PAYMENT [AR RECEIVE PAYMENT]' && $normalizedHeader !== $paymentReportHeader) { throw new MalformedRequestException('Uploaded Excel file format is incorrect. Column headers do not match expected format.'); } elseif ($reportType === 'Credit Note Report' && $normalizedHeader !== $creditNoteReportHeader) { @@ -147,7 +147,7 @@ class ImportExcelLogic extends AbstractControllerLogic if ($reportType === 'Sales Invoice Report') { $this->processSalesInvoiceReport($sheet); } - else if ($reportType === '01R - RECEIVE PAYMENT (FULL PAYMENT) [AR RECEIVE PAYMENT]'){ + else if ($reportType === '01R - RECEIVE PAYMENT [AR RECEIVE PAYMENT]'){ $result = $this->processPaymentReport($sheet); $result = [ 'message' => empty($result) diff --git a/app/Classes/Modules/Imports/Services/AutoCountDataImport.php b/app/Classes/Modules/Imports/Services/AutoCountDataImport.php index 85d47a7b..745e137a 100644 --- a/app/Classes/Modules/Imports/Services/AutoCountDataImport.php +++ b/app/Classes/Modules/Imports/Services/AutoCountDataImport.php @@ -42,7 +42,7 @@ class AutoCountDataImport implements ToCollection, WithHeadingRow, WithChunkRead if ($this->reportType === 'Sales Invoice Report') { ProcessSalesInvoiceReportV2CommandJob::dispatch($row->toArray()); } - elseif ($this->reportType === '01R - RECEIVE PAYMENT (FULL PAYMENT) [AR RECEIVE PAYMENT]') { + elseif ($this->reportType === '01R - RECEIVE PAYMENT [AR RECEIVE PAYMENT]') { ProcessPaymentReportV2CommandJob::dispatch($row->toArray()); } else if ($this->reportType === 'Credit Note Report') { @@ -107,7 +107,7 @@ class AutoCountDataImport implements ToCollection, WithHeadingRow, WithChunkRead elseif ($reportType === 'Customers Report' && $header !== $customersReportHeader) { throw new MalformedRequestException('Uploaded Excel file format is incorrect. Column headers do not match expected format.'); } - elseif ($reportType === '01R - RECEIVE PAYMENT (FULL PAYMENT) [AR RECEIVE PAYMENT]' && $header !== $paymentReportHeader) { + elseif ($reportType === '01R - RECEIVE PAYMENT [AR RECEIVE PAYMENT]' && $header !== $paymentReportHeader) { throw new MalformedRequestException('Uploaded Excel file format is incorrect. Column headers do not match expected format.'); } elseif ($reportType === 'Credit Note Report' && $header !== $creditNoteReportHeader) { diff --git a/app/Http/Controllers/Exports/ExportController.php b/app/Http/Controllers/Exports/ExportController.php index c1c6b1b5..699173fb 100644 --- a/app/Http/Controllers/Exports/ExportController.php +++ b/app/Http/Controllers/Exports/ExportController.php @@ -45,13 +45,13 @@ class ExportController public function receivePaymentDepositEntry(Request $request){ [$startDate, $endDate] = $this->getValidatedDates($request); $exporter = new ExportsReceivePaymentDepositEntryReport($startDate, $endDate); - return $this->handleExport($exporter, '01D - EXCHANGE - RECEIVE PAYMENT (FULL PAYMENT) [AR DEPOSIT ENTRY].xls'); + return $this->handleExport($exporter, '01D - Sales Deposit Received [AR DEPOSIT ENTRY].xls'); } public function receivePaymentDepositForBooking(Request $request){ [$startDate, $endDate] = $this->getValidatedDates($request); $exporter = new ExportsReceivePaymentForBookingReport($startDate, $endDate); - return $this->handleExport($exporter, '01R- RECEIVE PAYMENT (FULL PAYMENT) [AR RECEIVE PAYMENT].xls'); + return $this->handleExport($exporter, '01R - RECEIVE PAYMENT [AR RECEIVE PAYMENT].xls'); } public function walletTopUpDepositEntry(Request $request){ diff --git a/resources/assets/vue/components/bookings/elements/DownloadUploadComponent.vue b/resources/assets/vue/components/bookings/elements/DownloadUploadComponent.vue index db55e7b0..b8bd397c 100644 --- a/resources/assets/vue/components/bookings/elements/DownloadUploadComponent.vue +++ b/resources/assets/vue/components/bookings/elements/DownloadUploadComponent.vue @@ -18,10 +18,10 @@
1. Sales Invoice Report → Filters by Payment Date
2. Customers Report → Filters by E-Invoice Requested Date
- 3. 01D - RECEIVE PAYMENT (FULL PAYMENT) [AR DEPOSIT ENTRY] → Filters by Payment Date
- 4. 01R - RECEIVE PAYMENT (FULL PAYMENT) [AR RECEIVE PAYMENT] → Filters by Payment Date
+ 3. 01D - Sales Deposit Received [AR DEPOSIT ENTRY] → Filters by Payment Date
+ 4. 01R - RECEIVE PAYMENT [AR RECEIVE PAYMENT] → Filters by Payment Date
5. Credit Note Report → Filters by Credit Note Created Date
- 6. Wallet Top Up Report → Filters by Top Up Date
+ 6. WALLET TOP UP REPORT [Wallet Deposit Received] → Filters by Top Up Date
"> @@ -44,10 +44,10 @@
1. Sales Invoice Report → Filters by Payment Date
2. Customers Report → Filters by E-Invoice Requested Date
- 3. 01D - RECEIVE PAYMENT (FULL PAYMENT) [AR DEPOSIT ENTRY] → Filters by Payment Date
- 4. 01R - RECEIVE PAYMENT (FULL PAYMENT) [AR RECEIVE PAYMENT] → Filters by Payment Date
+ 3. 01D - Sales Deposit Received [AR DEPOSIT ENTRY] → Filters by Payment Date
+ 4. 01R - RECEIVE PAYMENT [AR RECEIVE PAYMENT] → Filters by Payment Date
5. Credit Note Report → Filters by Credit Note Created Date
- 6. Wallet Top Up Report → Filters by Top Up Date
+ 6. WALLET TOP UP REPORT [Wallet Deposit Received] → Filters by Top Up Date
"> @@ -148,7 +148,7 @@ export default { generateEInvoicesUrl: null, allowedReportTypes: [ 'Sales Invoice Report', - '01R - RECEIVE PAYMENT (FULL PAYMENT) [AR RECEIVE PAYMENT]', + '01R - RECEIVE PAYMENT [AR RECEIVE PAYMENT]', 'Credit Note Report' ] } @@ -172,7 +172,7 @@ export default { const importRoutesMap = { 'Sales Invoice Report': route('api.import.sales_invoices'), - '01R - RECEIVE PAYMENT (FULL PAYMENT) [AR RECEIVE PAYMENT]': route('api.import.official_receipt'), + '01R - RECEIVE PAYMENT [AR RECEIVE PAYMENT]': route('api.import.official_receipt'), 'Credit Note Report': route('api.import.credit_note'), }; @@ -185,10 +185,10 @@ export default { 'Sales Invoice Report', 'Sales Invoice Report (with refund)', 'Customers Report', - '01D - RECEIVE PAYMENT (FULL PAYMENT) [AR DEPOSIT ENTRY]', - '01R - RECEIVE PAYMENT (FULL PAYMENT) [AR RECEIVE PAYMENT]', + '01D - Sales Deposit Received [AR DEPOSIT ENTRY]', + '01R - RECEIVE PAYMENT [AR RECEIVE PAYMENT]', 'Credit Note Report', - 'Wallet Top Up Report', + 'WALLET TOP UP REPORT [Wallet Deposit Received]', ]; }, handleExportClick(){ @@ -201,10 +201,10 @@ export default { 'Sales Invoice Report': route('api.export.bookings.sales_invoices'), 'Sales Invoice Report (with refund)': route('api.export.bookings.sales_invoices_w_refund'), 'Customers Report': route('api.export.companies.customers_data'), - '01D - RECEIVE PAYMENT (FULL PAYMENT) [AR DEPOSIT ENTRY]': route('api.export.transactions.receive_payment_deposit_entry'), - '01R - RECEIVE PAYMENT (FULL PAYMENT) [AR RECEIVE PAYMENT]': route('api.export.transactions.receive_payment_for_booking'), + '01D - Sales Deposit Received [AR DEPOSIT ENTRY]': route('api.export.transactions.receive_payment_deposit_entry'), + '01R - RECEIVE PAYMENT [AR RECEIVE PAYMENT]': route('api.export.transactions.receive_payment_for_booking'), 'Credit Note Report': route('api.export.transactions.ar_credit_note'), - 'Wallet Top Up Report': route('api.export.transactions.wallet_top_up_deposit_entry'), + 'WALLET TOP UP REPORT [Wallet Deposit Received]': route('api.export.transactions.wallet_top_up_deposit_entry'), }; let url = `${routesMap[reportType]}?startDate=${this.parameters.startDate}&endDate=${this.parameters.endDate}`;