From 411458fe4cb4e0ede12ae39d488d2390a4d5ab0b Mon Sep 17 00:00:00 2001 From: Firman Ramdhani <33869609+firmanramdhani@users.noreply.github.com> Date: Mon, 7 Oct 2024 12:58:31 +0700 Subject: [PATCH] feat: add pos name and pos number at report reconciliation --- .../configs/reconciliation.ts | 21 +++++++++++++++++++ .../configs/transaction-report/index.ts | 1 - 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/modules/reports/shared/configs/transaction-report/configs/reconciliation.ts b/src/modules/reports/shared/configs/transaction-report/configs/reconciliation.ts index 395da96..3466e14 100644 --- a/src/modules/reports/shared/configs/transaction-report/configs/reconciliation.ts +++ b/src/modules/reports/shared/configs/transaction-report/configs/reconciliation.ts @@ -120,6 +120,27 @@ export default { type: DATA_TYPE.MEASURE, format: DATA_FORMAT.CURRENCY, }, + { + column: 'main__total_cash', + query: `CASE WHEN main.payment_type ='cash' and main.reconciliation_status ='confirmed' THEN main.payment_total ELSE 0 END`, + label: 'Total Tunai', + type: DATA_TYPE.MEASURE, + format: DATA_FORMAT.CURRENCY, + }, + { + column: 'main__total_transaction_bank', + query: `CASE WHEN main.payment_type !='cash' and main.reconciliation_status ='confirmed' THEN main.payment_total ELSE 0 END`, + label: 'Total Transaksi Bank', + type: DATA_TYPE.MEASURE, + format: DATA_FORMAT.CURRENCY, + }, + { + column: 'main__total_outstanding', + query: `CASE WHEN main.payment_type !='cash' and main.reconciliation_status ='pending' THEN main.payment_total ELSE 0 END`, + label: 'Total Outstanding', + type: DATA_TYPE.MEASURE, + format: DATA_FORMAT.CURRENCY, + }, { column: 'cashier', query: `CASE WHEN main.type = 'counter' THEN main.creator_name END`, diff --git a/src/modules/reports/shared/configs/transaction-report/index.ts b/src/modules/reports/shared/configs/transaction-report/index.ts index e57735d..01b7ae5 100644 --- a/src/modules/reports/shared/configs/transaction-report/index.ts +++ b/src/modules/reports/shared/configs/transaction-report/index.ts @@ -19,7 +19,6 @@ export const TransactionReportConfig: ReportConfigEntity[] = [ IncomeReportPerItemMaster, CancelReport, GivingDiscount, - BookingReport, RefundsReport, CashierLogReport,