Merge branch 'feat/fix-couch-transaction' of ssh://git.eigen.co.id:2222/eigen/pos-be into feat/adjustment-report

feat: update query report income and merge with development branch
2024-09-09 14:30:53 +07:00 · 2024-09-04 18:26:40 +07:00 · 2024-09-04 18:21:08 +07:00 · 2024-09-04 18:20:13 +07:00 · 2024-09-04 18:19:42 +07:00
4 changed files with 22 additions and 8 deletions
--- 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,
    },
--- 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,
--- 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,
--- 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,
Author	SHA1	Message	Date
Firman Ramdhani	6fb582204a	Merge branch 'feat/fix-couch-transaction' of ssh://git.eigen.co.id:2222/eigen/pos-be into feat/adjustment-report continuous-integration/drone/push Build is passing Details	2024-09-09 14:30:53 +07:00
Firman Ramdhani	7fb2995f38	feat: update query report income and merge with development branch continuous-integration/drone/push Build is passing Details	2024-09-04 18:26:40 +07:00
Firman Ramdhani	07e7b86cd4	feat: update query report income and merge with development branch continuous-integration/drone/push Build is passing Details	2024-09-04 18:21:08 +07:00
Firman Ramdhani	db57b1973e	Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into feat/fix-couch-transaction	2024-09-04 18:20:13 +07:00
Firman Ramdhani	92d60d4496	feat: update query report income continuous-integration/drone/push Build is passing Details	2024-09-04 18:19:42 +07:00