Merge pull request 'feat/report-income' (#138) from feat/report-income into development

Reviewed-on: #138

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

@@ -42,9 +42,16 @@ export default <ReportConfigEntity>{
   },
 
   column_configs: [
+    // {
+    //   column: 'main__payment_date',
+    //   query: `to_char(main.payment_date, 'DD-MM-YYYY')`,
+    //   label: 'Tgl. Pendapatan',
+    //   type: DATA_TYPE.DIMENSION,
+    //   format: DATA_FORMAT.TEXT,
+    // },
     {
       column: 'main__payment_date',
-      query: `to_char(main.payment_date, 'DD-MM-YYYY')`,
+      query: `to_char(cast(to_timestamp(main.created_at/1000) as date),'DD-MM-YYYY')`,
       label: 'Tgl. Pendapatan',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
@@ -282,15 +289,22 @@ export default <ReportConfigEntity>{
     },
   ],
   filter_configs: [
+    // {
+    //   filed_label: 'Tgl. Pembatalan',
+    //   filter_column: 'main__payment_date',
+    //   field_type: FILTER_FIELD_TYPE.date_range_picker,
+    //   filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP,
+    //   // date_format: 'DD-MM-YYYY',
+    //   date_format: 'YYYY-MM-DD',
+    // },
+
     {
       filed_label: 'Tgl. Pembatalan',
       filter_column: 'main__payment_date',
       field_type: FILTER_FIELD_TYPE.date_range_picker,
       filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP,
-      // date_format: 'DD-MM-YYYY',
+      date_format: 'DD-MM-YYYY',
-      date_format: 'YYYY-MM-DD',
     },
-
     {
       filed_label: 'Sumber',
       filter_column: 'main__type',
@@ -392,8 +406,9 @@ export default <ReportConfigEntity>{
     },
   ],
   customQueryColumn(column) {
-    if (column === 'main__payment_date') return 'main.payment_date';
+    // if (column === 'main__payment_date') return 'main.payment_date';
-    else if (column === 'refund__refund_date') return 'refund.refund_date';
+    // else if (column === 'refund__refund_date') return 'refund.refund_date';
+    if (column === 'refund__refund_date') return 'refund.refund_date';
     return;
   },
 };

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

@@ -255,7 +255,14 @@ export default <ReportConfigEntity>{
     {
       column: 'main__payment_card_information',
       query: 'main.payment_card_information',
-      label: 'Information',
+      label: 'Card Information',
+      type: DATA_TYPE.DIMENSION,
+      format: DATA_FORMAT.TEXT,
+    },
+    {
+      column: 'main__payment_code_reference',
+      query: 'main.payment_code_reference',
+      label: 'Payment Reference',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
@@ -334,6 +341,18 @@ export default <ReportConfigEntity>{
       field_type: FILTER_FIELD_TYPE.input_tag,
       filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
     },
+    {
+      filed_label: 'Card Information',
+      filter_column: 'main__payment_card_information',
+      field_type: FILTER_FIELD_TYPE.input_tag,
+      filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
+    },
+    {
+      filed_label: 'Payment Reference',
+      filter_column: 'main__payment_code_reference',
+      field_type: FILTER_FIELD_TYPE.input_tag,
+      filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
+    },
     {
       filed_label: 'Tgl. Pengembalian',
       filter_column: 'refund__refund_date',