src/modules/reports/shared/configs/transaction-report/configs/giving-discounts.ts

@@ -54,24 +54,10 @@ export default <ReportConfigEntity>{
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
-    // {
-    //   column: 'main__invoice_code',
-    //   query: 'main.invoice_code',
-    //   label: 'Kode Transaksi',
-    //   type: DATA_TYPE.DIMENSION,
-    //   format: DATA_FORMAT.TEXT,
-    // },
     {
       column: 'main__invoice_code',
-      query: `CASE WHEN main.type != 'counter' THEN main.invoice_code ELSE null END`,
+      query: 'main.invoice_code',
-      label: 'Kode Booking',
+      label: 'Kode Transaksi',
-      type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.TEXT,
-    },
-    {
-      column: 'main__payment_code',
-      query: `CASE WHEN main.type = 'counter' THEN main.invoice_code ELSE main.payment_code END`,
-      label: 'Kode Pembayaran',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },

src/modules/reports/shared/configs/transaction-report/configs/income-per-item-master.ts

@@ -59,14 +59,14 @@ export default <ReportConfigEntity>{
     },
     {
       column: 'main__invoice_code',
-      query: `CASE WHEN main.type != 'counter' THEN main.invoice_code ELSE null END`,
+      query: 'main.invoice_code',
       label: 'Kode Booking',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
     {
       column: 'main__payment_code',
-      query: `CASE WHEN main.type = 'counter' THEN main.invoice_code ELSE main.payment_code END`,
+      query: 'main.payment_code',
       label: 'Kode Pembayaran',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,

src/modules/reports/shared/configs/transaction-report/configs/income-per-item.ts

@@ -58,14 +58,14 @@ export default <ReportConfigEntity>{
     },
     {
       column: 'main__invoice_code',
-      query: `CASE WHEN main.type != 'counter' THEN main.invoice_code ELSE null END`,
+      query: 'main.invoice_code',
       label: 'Kode Booking',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
     {
       column: 'main__payment_code',
-      query: `CASE WHEN main.type = 'counter' THEN main.invoice_code ELSE main.payment_code END`,
+      query: 'main.payment_code',
       label: 'Kode Pembayaran',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,

src/modules/reports/shared/configs/transaction-report/configs/income.ts

@@ -61,14 +61,14 @@ export default <ReportConfigEntity>{
     },
     {
       column: 'main__invoice_code',
-      query: `CASE WHEN main.type != 'counter' THEN main.invoice_code ELSE null END`,
+      query: 'main.invoice_code',
       label: 'Kode Booking',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
     {
       column: 'main__payment_code',
-      query: `CASE WHEN main.type = 'counter' THEN main.invoice_code ELSE main.payment_code END`,
+      query: 'main.payment_code',
       label: 'Kode Pembayaran',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,