Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into development

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`,
@@ -106,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`,
@@ -140,6 +175,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',

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,6 @@ export const TransactionReportConfig: ReportConfigEntity[] = [
   IncomeReportPerItemMaster,
   CancelReport,
   GivingDiscount,
-  // VisitorsPerRideReport,
-  // TimePerRideReport,
   BookingReport,
   RefundsReport,
   CashierLogReport,