From f2c409fc3553b54dc751ff132021517f1edce61e Mon Sep 17 00:00:00 2001
From: Firman Ramdhani <33869609+firmanramdhani@users.noreply.github.com>
Date: Wed, 9 Oct 2024 15:58:13 +0700
Subject: [PATCH] feat: adjustment default sorting on report income per item
 and report per item master

---
 .../configs/income-per-item-master.ts                | 12 ++++++++++--
 .../transaction-report/configs/income-per-item.ts    | 11 +++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git 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
index 4ab0948..201bb1e 100644
--- 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
@@ -33,8 +33,16 @@ export default <ReportConfigEntity>{
       values: [false],
     },
   ],
-  defaultOrderBy: [`to_char(main.payment_date, 'DD-MM-YYYY') DESC`],
-  lowLevelOrderBy: [`tr_item.id DESC`, `tr_item_bundling.id DESC`],
+  defaultOrderBy: [
+    `main.updated_at DESC`,
+    `to_char(main.payment_date, 'DD-MM-YYYY') DESC`,
+  ],
+  lowLevelOrderBy: [
+    `main.updated_at DESC`,
+    `to_char(main.payment_date, 'DD-MM-YYYY') DESC`,
+    `tr_item.id DESC`,
+    `tr_item_bundling.id DESC`,
+  ],
   filter_period_config: {
     hidden: true,
   },
diff --git 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
index f37e508..45c6ff7 100644
--- 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
@@ -32,8 +32,15 @@ export default <ReportConfigEntity>{
       values: [false],
     },
   ],
-  defaultOrderBy: [`to_char(main.payment_date, 'DD-MM-YYYY') DESC`],
-  lowLevelOrderBy: [`tr_item.id DESC`],
+  defaultOrderBy: [
+    `main.updated_at DESC`,
+    `to_char(main.payment_date, 'DD-MM-YYYY') DESC`,
+  ],
+  lowLevelOrderBy: [
+    `main.updated_at DESC`,
+    `to_char(main.payment_date, 'DD-MM-YYYY') DESC`,
+    `tr_item.id DESC`,
+  ],
   filter_period_config: {
     hidden: true,
   },