From d911f80ff986e55bfb6d8b50c8d6c7f8c1c67798 Mon Sep 17 00:00:00 2001
From: Firman Ramdhani <33869609+firmanramdhani@users.noreply.github.com>
Date: Mon, 7 Oct 2024 10:40:47 +0700
Subject: [PATCH 1/2] feat: add pos name and pos number at report
 reconciliation

---
 .../configs/reconciliation.ts                 | 26 +++++++++++++++++++
 .../configs/transaction-report/index.ts       |  5 +---
 2 files changed, 27 insertions(+), 4 deletions(-)

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 188fc72..395da96 100644
--- a/src/modules/reports/shared/configs/transaction-report/configs/reconciliation.ts
+++ b/src/modules/reports/shared/configs/transaction-report/configs/reconciliation.ts
@@ -36,6 +36,20 @@ export default <ReportConfigEntity>{
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
+    {
+      column: 'main__creator_counter_no',
+      query: 'main.creator_counter_no',
+      label: 'No.PoS',
+      type: DATA_TYPE.DIMENSION,
+      format: DATA_FORMAT.TEXT,
+    },
+    {
+      column: 'main__creator_counter_name',
+      query: 'main.creator_counter_name',
+      label: 'Nama PoS',
+      type: DATA_TYPE.DIMENSION,
+      format: DATA_FORMAT.TEXT,
+    },
     {
       column: 'main__payment_date',
       query: `CASE WHEN main.payment_date is not null THEN to_char(main.payment_date, 'DD-MM-YYYY') ELSE null END`,
@@ -140,6 +154,18 @@ export default <ReportConfigEntity>{
       filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
       select_custom_options: [...Object.values(TransactionType)],
     },
+    {
+      filed_label: 'No. PoS',
+      filter_column: 'main__creator_counter_no',
+      field_type: FILTER_FIELD_TYPE.input_number,
+      filter_type: FILTER_TYPE.NUMBER_EQUAL,
+    },
+    {
+      filed_label: 'Nama PoS',
+      filter_column: 'main__creator_counter_name',
+      field_type: FILTER_FIELD_TYPE.input_tag,
+      filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
+    },
     {
       filed_label: 'Tgl. Transaksi',
       filter_column: 'main__payment_date',
diff --git a/src/modules/reports/shared/configs/transaction-report/index.ts b/src/modules/reports/shared/configs/transaction-report/index.ts
index 454a22a..e57735d 100644
--- a/src/modules/reports/shared/configs/transaction-report/index.ts
+++ b/src/modules/reports/shared/configs/transaction-report/index.ts
@@ -5,8 +5,6 @@ import CancelReport from './configs/cancel-transaction';
 import IncomeReportPerItem from './configs/income-per-item';
 import IncomeReportPerItemMaster from './configs/income-per-item-master';
 import GivingDiscount from './configs/giving-discounts';
-import VisitorsPerRideReport from './configs/visitors-per-ride';
-import TimePerRideReport from './configs/time-per-ride';
 import BookingReport from './configs/booking';
 import RefundsReport from './configs/refunds';
 import CashierLogReport from './configs/cashier-log';
@@ -21,8 +19,7 @@ export const TransactionReportConfig: ReportConfigEntity[] = [
   IncomeReportPerItemMaster,
   CancelReport,
   GivingDiscount,
-  // VisitorsPerRideReport,
-  // TimePerRideReport,
+
   BookingReport,
   RefundsReport,
   CashierLogReport,

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 2/2] 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 <ReportConfigEntity>{
       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,