diff --git a/src/modules/reports/shared/configs/transaction-report/configs/giving-discounts.ts b/src/modules/reports/shared/configs/transaction-report/configs/giving-discounts.ts
index 99e1a3e..840a185 100644
--- a/src/modules/reports/shared/configs/transaction-report/configs/giving-discounts.ts
+++ b/src/modules/reports/shared/configs/transaction-report/configs/giving-discounts.ts
@@ -54,10 +54,24 @@ 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: 'main.invoice_code',
-      label: 'Kode Transaksi',
+      query: `CASE WHEN main.type != 'counter' THEN main.invoice_code ELSE null END`,
+      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`,
+      label: 'Kode Pembayaran',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
diff --git a/src/modules/reports/shared/configs/transaction-report/configs/income-per-item-master.ts b/src/modules/reports/shared/configs/transaction-report/configs/income-per-item-master.ts
index f41e3df..cd1a9c6 100644
--- a/src/modules/reports/shared/configs/transaction-report/configs/income-per-item-master.ts
+++ b/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: 'main.invoice_code',
+      query: `CASE WHEN main.type != 'counter' THEN main.invoice_code ELSE null END`,
       label: 'Kode Booking',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
     {
       column: 'main__payment_code',
-      query: '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,
diff --git a/src/modules/reports/shared/configs/transaction-report/configs/income-per-item.ts b/src/modules/reports/shared/configs/transaction-report/configs/income-per-item.ts
index d6fab37..5a6edb8 100644
--- a/src/modules/reports/shared/configs/transaction-report/configs/income-per-item.ts
+++ b/src/modules/reports/shared/configs/transaction-report/configs/income-per-item.ts
@@ -58,14 +58,14 @@ export default <ReportConfigEntity>{
     },
     {
       column: 'main__invoice_code',
-      query: 'main.invoice_code',
+      query: `CASE WHEN main.type != 'counter' THEN main.invoice_code ELSE null END`,
       label: 'Kode Booking',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
     {
       column: 'main__payment_code',
-      query: '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,
diff --git a/src/modules/reports/shared/configs/transaction-report/configs/income.ts b/src/modules/reports/shared/configs/transaction-report/configs/income.ts
index 2f12668..24b49a2 100644
--- a/src/modules/reports/shared/configs/transaction-report/configs/income.ts
+++ b/src/modules/reports/shared/configs/transaction-report/configs/income.ts
@@ -61,14 +61,14 @@ export default <ReportConfigEntity>{
     },
     {
       column: 'main__invoice_code',
-      query: 'main.invoice_code',
+      query: `CASE WHEN main.type != 'counter' THEN main.invoice_code ELSE null END`,
       label: 'Kode Booking',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
     {
       column: 'main__payment_code',
-      query: '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,