Merge pull request 'feat/adjustment-report' (#95) from feat/adjustment-report into development

Reviewed-on: #95

src/modules/reports/report/report.service.ts

@@ -99,7 +99,6 @@ export class ReportService extends BaseReportService {
       const builder = new ReportQueryBuilder(reportConfig, queryModel);
       const SQL = builder.getSql();
       const queryResult = await this.dataSource.query(SQL);
-
       const realData = [];
       const configColumns = reportConfig.column_configs;
 

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

@@ -7,17 +7,4 @@ export default <ReportConfigEntity>{
   group_name: REPORT_GROUP.tenant_report,
   unique_name: `${REPORT_GROUP.tenant_report}__income_per_item_master`,
   label: 'Pendapatan',
-  whereCondition(filterModel) {
-    const queryFilter = [];
-    const breakdown = filterModel.tr_item__breakdown_bundling;
-    if (breakdown) {
-      console.log({ breakdown });
-      const value = breakdown.filter.map((item) => {
-        return item === 'Yes' ? true : false;
-      });
-
-      queryFilter.push(`tr_item.breakdown_bundling in (${value.join()})`);
-    }
-    return queryFilter;
-  },
 };

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

@@ -39,17 +39,16 @@ export default <ReportConfigEntity>{
     },
     {
       column: 'main__booking_date',
-      query: 'main.booking_date',
+      query: `to_char(main.booking_date, 'DD-MM-YYYY')`,
       label: 'Tgl. Booking',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_TIMESTAMP,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD/MM/YYYY',
     },
     {
       column: 'main__no_of_group',
-      query: 'main.no_of_group',
+      query: 'main.no_of_group::NUMERIC',
       label: '#Visitor',
-      type: DATA_TYPE.DIMENSION,
+      type: DATA_TYPE.MEASURE,
       format: DATA_FORMAT.NUMBER,
     },
     {
@@ -111,11 +110,10 @@ export default <ReportConfigEntity>{
 
     {
       column: 'main__invoice_date',
-      query: 'main.invoice_date',
+      query: `to_char(main.invoice_date, 'DD-MM-YYYY')`,
       label: 'Tgl. Invoice',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_TIMESTAMP,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD/MM/YYYY',
     },
     {
       column: 'main__invoice_code',
@@ -126,19 +124,17 @@ export default <ReportConfigEntity>{
     },
     {
       column: 'main__settlement_date',
-      query: 'main.settlement_date',
+      query: `to_char(main.settlement_date, 'DD-MM-YYYY')`,
       label: 'Tgl Settlement',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_TIMESTAMP,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD/MM/YYYY',
     },
     {
       column: 'refund__request_date',
-      query: 'refund.request_date',
+      query: `to_char(refund.request_date, 'DD-MM-YYYY')`,
       label: 'Request Refund',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_TIMESTAMP,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD/MM/YYYY',
     },
     {
       column: 'refund__code',
@@ -149,13 +145,11 @@ export default <ReportConfigEntity>{
     },
     {
       column: 'refund__refund_date',
-      query: 'refund.refund_date',
+      query: `to_char(refund.refund_date, 'DD-MM-YYYY')`,
       label: 'Tgl. Refund',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_TIMESTAMP,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD/MM/YYYY',
     },
-
     {
       column: 'main__creator_name',
       query: 'main.creator_name',
@@ -190,6 +184,7 @@ export default <ReportConfigEntity>{
       filter_column: 'main__booking_date',
       field_type: FILTER_FIELD_TYPE.date_range_picker,
       filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP,
+      date_format: 'DD-MM-YYYY',
     },
     {
       filed_label: 'Sumber',
@@ -231,6 +226,7 @@ export default <ReportConfigEntity>{
       filter_column: 'main__invoice_date',
       field_type: FILTER_FIELD_TYPE.date_range_picker,
       filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP,
+      date_format: 'DD-MM-YYYY',
     },
     {
       filed_label: 'Kode Invoice',
@@ -243,12 +239,14 @@ export default <ReportConfigEntity>{
       filter_column: 'main__settlement_date',
       field_type: FILTER_FIELD_TYPE.date_range_picker,
       filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP,
+      date_format: 'DD-MM-YYYY',
     },
     {
       filed_label: 'Request Refund',
       filter_column: 'refund__request_date',
       field_type: FILTER_FIELD_TYPE.date_range_picker,
       filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP,
+      date_format: 'DD-MM-YYYY',
     },
     {
       filed_label: 'Kode Refund',
@@ -261,6 +259,7 @@ 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',
     },
     {
       filed_label: 'Dibuat Oleh',

src/modules/reports/shared/configs/transaction-report/configs/cash-withdrawals.ts

@@ -29,11 +29,10 @@ export default <ReportConfigEntity>{
   column_configs: [
     {
       column: 'main__date',
-      query: 'main.created_at',
+      query: `to_char(cast(to_timestamp(main.created_at/1000) as date),'DD-MM-YYYY')`,
       label: 'Tanggal',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_EPOCH,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD-MM-YYYY',
     },
     {
       column: 'main__time',
@@ -64,6 +63,13 @@ export default <ReportConfigEntity>{
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
+    {
+      column: 'main__pos_name',
+      query: 'main.pos_name',
+      label: 'Nama PoS',
+      type: DATA_TYPE.DIMENSION,
+      format: DATA_FORMAT.TEXT,
+    },
     {
       column: 'main__total_balance',
       query: 'main.total_balance',
@@ -77,7 +83,8 @@ export default <ReportConfigEntity>{
       filed_label: 'Tanggal',
       filter_column: 'main__date',
       field_type: FILTER_FIELD_TYPE.date_range_picker,
-      filter_type: FILTER_TYPE.DATE_IN_RANGE_EPOCH,
+      filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP,
+      date_format: 'DD-MM-YYYY',
     },
     {
       filed_label: 'Nama Penarik',
@@ -98,4 +105,7 @@ export default <ReportConfigEntity>{
       filter_type: FILTER_TYPE.NUMBER_EQUAL,
     },
   ],
+  whereCondition(filterModel) {
+    return [`main.created_at is not null`];
+  },
 };

src/modules/reports/shared/configs/transaction-report/configs/cashier-log.ts

@@ -29,11 +29,10 @@ export default <ReportConfigEntity>{
   column_configs: [
     {
       column: 'main__date',
-      query: 'main.created_at',
+      query: `to_char(cast(to_timestamp(main.created_at/1000) as date),'DD-MM-YYYY')`,
       label: 'Tanggal',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_EPOCH,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD-MM-YYYY',
     },
     {
       column: 'main__time',
@@ -64,13 +63,21 @@ export default <ReportConfigEntity>{
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
+    {
+      column: 'main__pos_name',
+      query: 'main.pos_name',
+      label: 'Nama PoS',
+      type: DATA_TYPE.DIMENSION,
+      format: DATA_FORMAT.TEXT,
+    },
   ],
   filter_configs: [
     {
       filed_label: 'Tanggal',
       filter_column: 'main__date',
       field_type: FILTER_FIELD_TYPE.date_range_picker,
-      filter_type: FILTER_TYPE.DATE_IN_RANGE_EPOCH,
+      filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP,
+      date_format: 'DD-MM-YYYY',
     },
     {
       filed_label: 'Tipe',

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

@@ -31,6 +31,11 @@ export default <ReportConfigEntity>{
       filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
       values: [TransactionType.COUNTER],
     },
+    {
+      column: 'main.is_recap_transaction',
+      filter_type: FILTER_TYPE.TEXT_EQUAL,
+      values: [false],
+    },
   ],
   defaultOrderBy: [],
   lowLevelOrderBy: [],
@@ -40,12 +45,11 @@ export default <ReportConfigEntity>{
 
   column_configs: [
     {
-      column: 'main__settlement_date',
+      column: 'main__payment_date',
-      query: 'main.settlement_date',
+      query: `to_char(main.payment_date, 'DD-MM-YYYY')`,
-      label: 'Tanggal Transaksi',
+      label: 'Tgl. Transaksi',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_TIMESTAMP,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD/MM/YYYY',
     },
     {
       column: 's_period_type__name',
@@ -54,13 +58,6 @@ 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`,
@@ -131,6 +128,13 @@ export default <ReportConfigEntity>{
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
+    {
+      column: 'main__creator_counter_name',
+      query: 'main.creator_counter_name',
+      label: 'Nama PoS',
+      type: DATA_TYPE.DIMENSION,
+      format: DATA_FORMAT.TEXT,
+    },
     {
       column: 'main__customer_name',
       query: 'main.customer_name',
@@ -155,10 +159,11 @@ export default <ReportConfigEntity>{
   ],
   filter_configs: [
     {
-      filed_label: 'Tanggal Transaksi',
+      filed_label: 'Tgl. Transaksi',
-      filter_column: 'main__settlement_date',
+      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',
     },
     {
       filed_label: 'Tipe Rate',

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

@@ -27,6 +27,11 @@ export default <ReportConfigEntity>{
       filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
       values: [STATUS.SETTLED, STATUS.REFUNDED, STATUS.PROCESS_REFUND],
     },
+    {
+      column: 'main.is_recap_transaction',
+      filter_type: FILTER_TYPE.TEXT_EQUAL,
+      values: [false],
+    },
   ],
   defaultOrderBy: [],
   lowLevelOrderBy: [],
@@ -36,12 +41,18 @@ export default <ReportConfigEntity>{
 
   column_configs: [
     {
-      column: 'main__settlement_date',
+      column: 'main__payment_date',
-      query: 'main.settlement_date',
+      query: `to_char(main.payment_date, 'DD-MM-YYYY')`,
       label: 'Tgl. Pendapatan',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_TIMESTAMP,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD/MM/YYYY',
+    },
+    {
+      column: 'main__status',
+      query: 'main.status',
+      label: 'Status',
+      type: DATA_TYPE.DIMENSION,
+      format: DATA_FORMAT.STATUS,
     },
     {
       column: 'item_owner',
@@ -79,26 +90,27 @@ export default <ReportConfigEntity>{
       format: DATA_FORMAT.TEXT,
     },
     {
-      column: 'tr_item__item_name',
+      column: 'tr_item__item_type',
-      query: 'tr_item.item_name',
+      query: 'tr_item.item_type',
-      label: 'Nama Item',
+      label: 'Tipe Item',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
-    {
-      column: 'tr_item__breakdown_bundling',
-      query: 'tr_item.breakdown_bundling',
-      label: 'Breakdown Bundling',
-      type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.BOOLEAN,
-    },
     {
       column: 'tr_item_bundling__item_name',
-      query: 'tr_item_bundling.item_name',
+      query: `CASE WHEN tr_item.item_type = 'bundling' THEN tr_item.item_name ELSE tr_item_bundling.item_name END`,
       label: 'Nama Item Bundling',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
+
+    {
+      column: 'tr_item__item_name',
+      query: `CASE WHEN tr_item.item_type = 'bundling' THEN tr_item_bundling.item_name ELSE tr_item.item_name END`,
+      label: 'Nama Item ',
+      type: DATA_TYPE.DIMENSION,
+      format: DATA_FORMAT.TEXT,
+    },
     {
       column: 'main__customer_type',
       query: 'main.customer_type',
@@ -113,6 +125,13 @@ export default <ReportConfigEntity>{
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
+    {
+      column: 'main__creator_counter_name',
+      query: 'main.creator_counter_name',
+      label: 'Nama PoS',
+      type: DATA_TYPE.DIMENSION,
+      format: DATA_FORMAT.TEXT,
+    },
     {
       column: 'tr_item__qty',
       query: 'tr_item.qty',
@@ -164,11 +183,10 @@ export default <ReportConfigEntity>{
     },
     {
       column: 'refund__refund_date',
-      query: 'refund.refund_date',
+      query: `to_char(refund.refund_date, 'DD-MM-YYYY')`,
       label: 'Tgl. Pengembalian',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_TIMESTAMP,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD/MM/YYYY',
     },
     {
       column: 'refund__status',
@@ -191,21 +209,6 @@ export default <ReportConfigEntity>{
       type: DATA_TYPE.MEASURE,
       format: DATA_FORMAT.NUMBER,
     },
-    {
-      column: 'refund_item__refund_total',
-      query: '(refund_item.refund_total * -1)',
-      label: 'Total Pengembalian',
-      type: DATA_TYPE.MEASURE,
-      format: DATA_FORMAT.CURRENCY,
-    },
-
-    {
-      column: 'transaction_balance',
-      query: `CASE WHEN refund.id  is null THEN tr_item.total_price ELSE tr_item.total_price - refund_item.refund_total END`,
-      label: 'Balance',
-      type: DATA_TYPE.MEASURE,
-      format: DATA_FORMAT.CURRENCY,
-    },
     {
       column: 'tr_item__item_tenant_share_margin',
       query: 'tr_item.item_tenant_share_margin',
@@ -266,9 +269,10 @@ export default <ReportConfigEntity>{
   filter_configs: [
     {
       filed_label: 'Tgl. Pendapatan',
-      filter_column: 'main__settlement_date',
+      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',
     },
     {
       filed_label: 'Kepemilikan',
@@ -308,11 +312,10 @@ export default <ReportConfigEntity>{
       filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
     },
     {
-      filed_label: 'Breakdown Item',
+      filed_label: 'Tipe Item',
-      filter_column: 'tr_item__breakdown_bundling',
+      filter_column: 'tr_item__item_type',
-      field_type: FILTER_FIELD_TYPE.select,
+      field_type: FILTER_FIELD_TYPE.input_tag,
       filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
-      select_custom_options: ['Yes', 'No'],
     },
     {
       filed_label: 'Nama Item Bundling',
@@ -332,11 +335,18 @@ export default <ReportConfigEntity>{
       field_type: FILTER_FIELD_TYPE.input_number,
       filter_type: FILTER_TYPE.NUMBER_EQUAL,
     },
+    {
+      filed_label: 'Nama PoS',
+      filter_column: 'main__creator_counter_name',
+      field_type: FILTER_FIELD_TYPE.input_tag,
+      filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
+    },
     {
       filed_label: 'Tgl. Pengembalian',
       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',
     },
     {
       filed_label: 'Kode Pengembalian',

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

@@ -26,6 +26,11 @@ export default <ReportConfigEntity>{
       filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
       values: [STATUS.SETTLED, STATUS.REFUNDED, STATUS.PROCESS_REFUND],
     },
+    {
+      column: 'main.is_recap_transaction',
+      filter_type: FILTER_TYPE.TEXT_EQUAL,
+      values: [false],
+    },
   ],
   defaultOrderBy: [],
   lowLevelOrderBy: [],
@@ -35,12 +40,18 @@ export default <ReportConfigEntity>{
 
   column_configs: [
     {
-      column: 'main__settlement_date',
+      column: 'main__payment_date',
-      query: 'main.settlement_date',
+      query: `to_char(main.payment_date, 'DD-MM-YYYY')`,
       label: 'Tgl. Pendapatan',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_TIMESTAMP,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD/MM/YYYY',
+    },
+    {
+      column: 'main__status',
+      query: 'main.status',
+      label: 'Status',
+      type: DATA_TYPE.DIMENSION,
+      format: DATA_FORMAT.STATUS,
     },
     {
       column: 'item_owner',
@@ -98,6 +109,13 @@ export default <ReportConfigEntity>{
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
+    {
+      column: 'main__creator_counter_name',
+      query: 'main.creator_counter_name',
+      label: 'Nama PoS',
+      type: DATA_TYPE.DIMENSION,
+      format: DATA_FORMAT.TEXT,
+    },
     {
       column: 'tr_item__qty',
       query: 'tr_item.qty',
@@ -149,11 +167,10 @@ export default <ReportConfigEntity>{
     },
     {
       column: 'refund__refund_date',
-      query: 'refund.refund_date',
+      query: `to_char(refund.refund_date, 'DD-MM-YYYY')`,
       label: 'Tgl. Pengembalian',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_TIMESTAMP,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD/MM/YYYY',
     },
     {
       column: 'refund__status',
@@ -176,21 +193,6 @@ export default <ReportConfigEntity>{
       type: DATA_TYPE.MEASURE,
       format: DATA_FORMAT.NUMBER,
     },
-    {
-      column: 'refund_item__refund_total',
-      query: '(refund_item.refund_total * -1)',
-      label: 'Total Pengembalian',
-      type: DATA_TYPE.MEASURE,
-      format: DATA_FORMAT.CURRENCY,
-    },
-
-    {
-      column: 'transaction_balance',
-      query: `CASE WHEN refund.id  is null THEN tr_item.total_price ELSE tr_item.total_price - refund_item.refund_total END`,
-      label: 'Balance',
-      type: DATA_TYPE.MEASURE,
-      format: DATA_FORMAT.CURRENCY,
-    },
     {
       column: 'tr_item__item_tenant_share_margin',
       query: 'tr_item.item_tenant_share_margin',
@@ -238,9 +240,10 @@ export default <ReportConfigEntity>{
   filter_configs: [
     {
       filed_label: 'Tgl. Pendapatan',
-      filter_column: 'main__settlement_date',
+      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',
     },
     {
       filed_label: 'Kepemilikan',
@@ -291,11 +294,18 @@ export default <ReportConfigEntity>{
       field_type: FILTER_FIELD_TYPE.input_number,
       filter_type: FILTER_TYPE.NUMBER_EQUAL,
     },
+    {
+      filed_label: 'Nama PoS',
+      filter_column: 'main__creator_counter_name',
+      field_type: FILTER_FIELD_TYPE.input_tag,
+      filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
+    },
     {
       filed_label: 'Tgl. Pengembalian',
       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',
     },
     {
       filed_label: 'Kode Pengembalian',

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

@@ -29,6 +29,11 @@ export default <ReportConfigEntity>{
       filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
       values: [STATUS.SETTLED, STATUS.REFUNDED, STATUS.PROCESS_REFUND],
     },
+    {
+      column: 'main.is_recap_transaction',
+      filter_type: FILTER_TYPE.TEXT_EQUAL,
+      values: [false],
+    },
   ],
   defaultOrderBy: [],
   lowLevelOrderBy: [],
@@ -38,12 +43,18 @@ export default <ReportConfigEntity>{
 
   column_configs: [
     {
-      column: 'main__settlement_date',
+      column: 'main__payment_date',
-      query: 'main.settlement_date',
+      query: `to_char(main.payment_date, 'DD-MM-YYYY')`,
       label: 'Tgl. Pendapatan',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_TIMESTAMP,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD/MM/YYYY',
+    },
+    {
+      column: 'main__status',
+      query: 'main.status',
+      label: 'Status',
+      type: DATA_TYPE.DIMENSION,
+      format: DATA_FORMAT.STATUS,
     },
     {
       column: 'main__type',
@@ -88,12 +99,19 @@ export default <ReportConfigEntity>{
       format: DATA_FORMAT.TEXT,
     },
     {
-      column: 'main__no_of_group',
+      column: 'main__creator_counter_name',
-      query: 'main.no_of_group',
+      query: 'main.creator_counter_name',
-      label: '#Visitor',
+      label: 'Nama PoS',
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
+    {
+      column: 'main__no_of_group',
+      query: 'main.no_of_group::NUMERIC',
+      label: '#Visitor',
+      type: DATA_TYPE.MEASURE,
+      format: DATA_FORMAT.NUMBER,
+    },
     {
       column: 'item__total_hpp_item',
       query: 'item.total_hpp_item',
@@ -152,11 +170,10 @@ export default <ReportConfigEntity>{
     },
     {
       column: 'refund__refund_date',
-      query: 'refund.refund_date',
+      query: `to_char(refund.refund_date, 'DD-MM-YYYY')`,
       label: 'Tgl. Pengembalian',
-      type: DATA_TYPE.MEASURE,
+      type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_TIMESTAMP,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD/MM/YYYY',
     },
     {
       column: 'refund__status',
@@ -172,20 +189,20 @@ export default <ReportConfigEntity>{
       type: DATA_TYPE.DIMENSION,
       format: DATA_FORMAT.TEXT,
     },
-    {
+    // {
-      column: 'refund__refund_total',
+    //   column: 'refund__refund_total',
-      query: '(refund.refund_total * -1)',
+    //   query: '(refund.refund_total * -1)',
-      label: 'Total Pengembalian',
+    //   label: 'Total Pengembalian',
-      type: DATA_TYPE.MEASURE,
+    //   type: DATA_TYPE.MEASURE,
-      format: DATA_FORMAT.CURRENCY,
+    //   format: DATA_FORMAT.CURRENCY,
-    },
+    // },
-    {
+    // {
-      column: 'transaction_balance',
+    //   column: 'transaction_balance',
-      query: `CASE WHEN refund.id  is null THEN main.payment_total ELSE main.payment_total - refund.refund_total END`,
+    //   query: `CASE WHEN refund.id  is null THEN main.payment_total ELSE main.payment_total - refund.refund_total END`,
-      label: 'Balance',
+    //   label: 'Balance',
-      type: DATA_TYPE.MEASURE,
+    //   type: DATA_TYPE.MEASURE,
-      format: DATA_FORMAT.CURRENCY,
+    //   format: DATA_FORMAT.CURRENCY,
-    },
+    // },
     {
       column: 'main__discount_code',
       query: 'main.discount_code',
@@ -260,10 +277,12 @@ export default <ReportConfigEntity>{
   filter_configs: [
     {
       filed_label: 'Tgl. Pendapatan',
-      filter_column: 'main__settlement_date',
+      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',
     },
+
     {
       filed_label: 'Sumber',
       filter_column: 'main__type',
@@ -301,11 +320,18 @@ export default <ReportConfigEntity>{
       field_type: FILTER_FIELD_TYPE.input_number,
       filter_type: FILTER_TYPE.NUMBER_EQUAL,
     },
+    {
+      filed_label: 'Nama PoS',
+      filter_column: 'main__creator_counter_name',
+      field_type: FILTER_FIELD_TYPE.input_tag,
+      filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
+    },
     {
       filed_label: 'Tgl. Pengembalian',
       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',
     },
     {
       filed_label: 'Kode Pengembalian',

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

@@ -38,27 +38,24 @@ export default <ReportConfigEntity>{
     },
     {
       column: 'main__payment_date',
-      query: 'main.payment_date',
+      query: `CASE WHEN main.payment_date is not null THEN to_char(main.payment_date, 'DD-MM-YYYY') ELSE null END`,
       label: 'Tgl. Transaksi',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_TIMESTAMP,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD/MM/YYYY',
     },
     {
       column: 'main__payment_date_bank',
-      query: 'main.payment_date_bank',
+      query: `CASE WHEN main.payment_date_bank is not null THEN to_char(main.payment_date_bank, 'DD-MM-YYYY') ELSE null END`,
       label: 'Tgl. Transaksi Bank',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_TIMESTAMP,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD/MM/YYYY',
     },
     {
       column: 'main__reconciliation_confirm_date',
-      query: 'main.reconciliation_confirm_date',
+      query: `CASE WHEN main.reconciliation_confirm_date is not null THEN to_char(cast(to_timestamp(COALESCE(main.reconciliation_confirm_date::NUMERIC)/1000) as date),'DD-MM-YYYY') ELSE null END`,
       label: 'Tgl. Konfirmasi',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_TIMESTAMP,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD/MM/YYYY',
     },
     {
       column: 'main__payment_code_reference',
@@ -148,18 +145,21 @@ 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',
     },
     {
       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',
     },
     {
       filed_label: 'Tgl. Konfirmasi',
       filter_column: 'main__reconciliation_confirm_date',
       field_type: FILTER_FIELD_TYPE.date_range_picker,
       filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP,
+      date_format: 'DD-MM-YYYY',
     },
     {
       filed_label: 'Referensi',

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

@@ -46,19 +46,17 @@ export default <ReportConfigEntity>{
     },
     {
       column: 'main__request_date',
-      query: 'main.request_date',
+      query: `to_char(main.request_date, 'DD-MM-YYYY')`,
       label: 'Tgl. Permintaan',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_TIMESTAMP,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD/MM/YYYY',
     },
     {
       column: 'main__refund_date',
-      query: 'main.refund_date',
+      query: `to_char(main.refund_date, 'DD-MM-YYYY')`,
       label: 'Tgl. Refund',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_TIMESTAMP,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD/MM/YYYY',
     },
     {
       column: 'tr__payment_code',
@@ -69,11 +67,10 @@ export default <ReportConfigEntity>{
     },
     {
       column: 'tr__settlement_date',
-      query: 'tr.settlement_date',
+      query: `to_char(tr.settlement_date, 'DD-MM-YYYY')`,
       label: 'Tgl. Settlement',
       type: DATA_TYPE.DIMENSION,
-      format: DATA_FORMAT.DATE_EPOCH,
+      format: DATA_FORMAT.TEXT,
-      date_format: 'DD/MM/YYYY',
     },
     {
       column: 'tr__payment_total',
@@ -185,12 +182,14 @@ export default <ReportConfigEntity>{
       filter_column: 'main__request_date',
       field_type: FILTER_FIELD_TYPE.date_range_picker,
       filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP,
+      date_format: 'DD-MM-YYYY',
     },
     {
       filed_label: 'Tgl. Refund',
       filter_column: 'main__refund_date',
       field_type: FILTER_FIELD_TYPE.date_range_picker,
       filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP,
+      date_format: 'DD-MM-YYYY',
     },
     {
       filed_label: 'Kode Settlement',
@@ -203,6 +202,7 @@ export default <ReportConfigEntity>{
       filter_column: 'tr__settlement_date',
       field_type: FILTER_FIELD_TYPE.date_range_picker,
       filter_type: FILTER_TYPE.DATE_IN_RANGE_TIMESTAMP,
+      date_format: 'DD-MM-YYYY',
     },
     {
       filed_label: 'Bank Tujuan',

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

@@ -0,0 +1,136 @@
+import {
+  DATA_FORMAT,
+  DATA_TYPE,
+  FILTER_FIELD_TYPE,
+  FILTER_TYPE,
+  REPORT_GROUP,
+} from '../../../constant';
+import { ReportConfigEntity } from '../../../entities/report-config.entity';
+import { TransactionType } from 'src/modules/transaction/transaction/constants';
+import { STATUS } from 'src/core/strings/constants/base.constants';
+
+export default <ReportConfigEntity>{
+  group_name: REPORT_GROUP.transaction_report,
+  unique_name: `${REPORT_GROUP.transaction_report}__tax`,
+  label: 'Tax Pendapatan',
+  table_schema: `transactions main
+  left join transaction_taxes tr_taxes on tr_taxes.transaction_id = main.id`,
+  main_table_alias: 'main',
+  whereDefaultConditions: [
+    {
+      column: 'main.status',
+      filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
+      values: [STATUS.SETTLED, STATUS.REFUNDED, STATUS.PROCESS_REFUND],
+    },
+    {
+      column: 'main.is_recap_transaction',
+      filter_type: FILTER_TYPE.TEXT_EQUAL,
+      values: [false],
+    },
+  ],
+  defaultOrderBy: [],
+  lowLevelOrderBy: [],
+  filter_period_config: {
+    hidden: true,
+  },
+
+  column_configs: [
+    {
+      column: 'main__payment_date',
+      query: `to_char(main.payment_date, 'DD-MM-YYYY')`,
+      label: 'Tgl. Transaksi',
+      type: DATA_TYPE.DIMENSION,
+      format: DATA_FORMAT.TEXT,
+    },
+    {
+      column: 'main__status',
+      query: 'main.status',
+      label: 'Status',
+      type: DATA_TYPE.DIMENSION,
+      format: DATA_FORMAT.STATUS,
+    },
+    {
+      column: 'main__type',
+      query: 'main.type',
+      label: 'Sumber',
+      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`,
+      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,
+    },
+    {
+      column: 'main__payment_total',
+      query: 'main.payment_total',
+      label: 'Total Penjualan',
+      type: DATA_TYPE.MEASURE,
+      format: DATA_FORMAT.CURRENCY,
+    },
+    {
+      column: 'main__payment_total_dpp',
+      query: 'main.payment_total_dpp',
+      label: 'DPP',
+      type: DATA_TYPE.MEASURE,
+      format: DATA_FORMAT.CURRENCY,
+    },
+    {
+      column: 'tr_taxes__tax_name',
+      query: 'tr_taxes.tax_name',
+      label: 'Tipe Tax',
+      type: DATA_TYPE.DIMENSION,
+      format: DATA_FORMAT.TEXT,
+    },
+    {
+      column: 'tr_taxes__tax_total_value',
+      query: 'tr_taxes.tax_total_value',
+      label: 'Value Tax',
+      type: DATA_TYPE.MEASURE,
+      format: DATA_FORMAT.CURRENCY,
+    },
+  ],
+  filter_configs: [
+    {
+      filed_label: 'Tgl. Transaksi',
+      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',
+    },
+    {
+      filed_label: 'Sumber',
+      filter_column: 'main__type',
+      field_type: FILTER_FIELD_TYPE.select,
+      filter_type: FILTER_TYPE.TEXT_IN_MEMBER,
+      select_custom_options: [...Object.values(TransactionType)],
+    },
+    {
+      filed_label: 'Kode Booking',
+      filter_column: 'main__invoice_code',
+      field_type: FILTER_FIELD_TYPE.input_tag,
+      filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
+    },
+    {
+      filed_label: 'Kode Pembayaran',
+      filter_column: 'main__payment_code',
+      field_type: FILTER_FIELD_TYPE.input_tag,
+      filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
+    },
+    {
+      filed_label: 'Tipe Tax',
+      filter_column: 'tr_taxes__tax_name',
+      field_type: FILTER_FIELD_TYPE.input_tag,
+      filter_type: FILTER_TYPE.TEXT_MULTIPLE_CONTAINS,
+    },
+  ],
+};

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

@@ -11,6 +11,7 @@ import RefundsReport from './configs/refunds';
 import CashierLogReport from './configs/cashier-log';
 import CashWithdrawalsReport from './configs/cash-withdrawals';
 import ReconciliationReport from './configs/reconciliation';
+import TaxReport from './configs/tax';
 
 export const TransactionReportConfig: ReportConfigEntity[] = [
   IncomeReport,
@@ -24,4 +25,5 @@ export const TransactionReportConfig: ReportConfigEntity[] = [
   CashierLogReport,
   CashWithdrawalsReport,
   ReconciliationReport,
+  TaxReport,
 ];

src/modules/reports/shared/entities/report-config.entity.ts

@@ -12,7 +12,7 @@ export interface ReportColumnConfigEntity {
 export interface FilterConfigEntity {
   filter_column: string;
   filter_type: FILTER_TYPE;
-
+  date_format?: string;
   filed_label: string;
   field_type: string;
   hide_field?: boolean;
@@ -46,7 +46,7 @@ export interface ReportConfigEntity {
   whereDefaultConditions?: {
     column: string;
     filter_type: FILTER_TYPE;
-    values: string[];
+    values: string[] | boolean[] | number[];
   }[];
   defaultOrderBy?: string[];
   lowLevelOrderBy?: string[];

src/modules/reports/shared/helpers/query-builder.ts

@@ -331,7 +331,11 @@ export class ReportQueryBuilder {
       groupKeys.forEach(function (key, index) {
         const colName = rowGroupCols[index].field;
         // whereParts.push(colName + ' = "' + key + '"');
-        whereParts.push(`${thisSelf.findQueryConfig(colName)} = '${key}'`);
+        if (!key) {
+          whereParts.push(`${thisSelf.findQueryConfig(colName)} is null`);
+        } else {
+          whereParts.push(`${thisSelf.findQueryConfig(colName)} = '${key}'`);
+        }
       });
     }
 
@@ -363,6 +367,7 @@ export class ReportQueryBuilder {
     const tableWhereConditions = [...whereCondition, ...whereParts].filter(
       Boolean,
     );
+
     const defaultWhereConditions = defaultWhereOptions.filter(Boolean);
 
     if (tableWhereConditions.length > 0) {