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

2024-10-09 12:49:56 +07:00 · 2024-10-09 12:49:56 +07:00 · 6efe5618cb
parent 60167cd807 0dfaeb2045
commit 6efe5618cb
2 changed files with 9 additions and 2 deletions
--- 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
@ -34,7 +34,11 @@ export default <ReportConfigEntity>{
    },
  ],
  defaultOrderBy: [],
-  lowLevelOrderBy: [],
+  lowLevelOrderBy: [
+    `to_char(main.payment_date, 'DD-MM-YYYY') DESC`,
+    `tr_item.id DESC`,
+    `tr_item_bundling.id DESC`,
+  ],
  filter_period_config: {
    hidden: true,
  },
--- 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
@ -33,7 +33,10 @@ export default <ReportConfigEntity>{
    },
  ],
  defaultOrderBy: [],
-  lowLevelOrderBy: [],
+  lowLevelOrderBy: [
+    `to_char(main.payment_date, 'DD-MM-YYYY') DESC`,
+    `tr_item.id DESC`,
+  ],
  filter_period_config: {
    hidden: true,
  },