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

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

@@ -287,7 +287,8 @@ export default <ReportConfigEntity>{
       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',
     },
 
     {
@@ -338,7 +339,8 @@ export default <ReportConfigEntity>{
       filter_column: 'refund__refund_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: 'Kode Pengembalian',
@@ -389,4 +391,9 @@ export default <ReportConfigEntity>{
       filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
     },
   ],
+  customQueryColumn(column) {
+    if (column === 'main__payment_date') return 'main.payment_date';
+    else if (column === 'refund__refund_date') return 'refund.refund_date';
+    return;
+  },
 };

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

@@ -168,7 +168,8 @@ export default <ReportConfigEntity>{
       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: 'Tipe Rate',
@@ -213,4 +214,8 @@ export default <ReportConfigEntity>{
       filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
     },
   ],
+  customQueryColumn(column) {
+    if (column === 'main__payment_date') return 'main.payment_date';
+    return;
+  },
 };

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

@@ -286,7 +286,8 @@ export default <ReportConfigEntity>{
       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: 'Kepemilikan',
@@ -360,7 +361,8 @@ export default <ReportConfigEntity>{
       filter_column: 'refund__refund_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: 'Kode Pengembalian',
@@ -387,4 +389,9 @@ export default <ReportConfigEntity>{
       filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
     },
   ],
+  customQueryColumn(column) {
+    if (column === 'main__payment_date') return 'main.payment_date';
+    else if (column === 'refund__refund_date') return 'refund.refund_date';
+    return;
+  },
 };

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

@@ -256,7 +256,8 @@ export default <ReportConfigEntity>{
       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: 'Kepemilikan',
@@ -318,7 +319,8 @@ export default <ReportConfigEntity>{
       filter_column: 'refund__refund_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: 'Kode Pengembalian',
@@ -345,4 +347,9 @@ export default <ReportConfigEntity>{
       filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
     },
   ],
+  customQueryColumn(column) {
+    if (column === 'main__payment_date') return 'main.payment_date';
+    else if (column === 'refund__refund_date') return 'refund.refund_date';
+    return;
+  },
 };

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

@@ -287,7 +287,8 @@ export default <ReportConfigEntity>{
       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',
     },
 
     {
@@ -338,7 +339,8 @@ export default <ReportConfigEntity>{
       filter_column: 'refund__refund_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: 'Kode Pengembalian',
@@ -389,4 +391,9 @@ export default <ReportConfigEntity>{
       filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
     },
   ],
+  customQueryColumn(column) {
+    if (column === 'main__payment_date') return 'main.payment_date';
+    else if (column === 'refund__refund_date') return 'refund.refund_date';
+    return;
+  },
 };

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

@@ -192,14 +192,16 @@ export default <ReportConfigEntity>{
       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: 'Tgl. Transaksi Bank',
       filter_column: 'main__payment_date_bank',
       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: 'Tgl. Konfirmasi',
@@ -253,4 +255,11 @@ export default <ReportConfigEntity>{
     }
     return [];
   },
+  customQueryColumn(column) {
+    if (column === 'main__payment_date') return 'main.payment_date';
+    else if (column === 'main__payment_date_bank') {
+      return 'main.payment_date_bank';
+    }
+    return;
+  },
 };

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

@@ -105,7 +105,8 @@ export default <ReportConfigEntity>{
       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',
@@ -133,4 +134,8 @@ export default <ReportConfigEntity>{
       filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
     },
   ],
+  customQueryColumn(column) {
+    if (column === 'main__payment_date') return 'main.payment_date';
+    return;
+  },
 };