Merge release / update

client/src/components/accounting-payments-table/accounting-payments-table.component.jsx

@@ -8,14 +8,16 @@ import {logImEXEvent} from "../../firebase/firebase.utils";
 import {selectBodyshop} from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import {DateFormatter, DateTimeFormatter} from "../../utils/DateFormatter";
+import {pageLimit } from "../../utils/config";
 import {alphaSort, dateSort} from "../../utils/sorters";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
 import PaymentExportButton from "../payment-export-button/payment-export-button.component";
 import PaymentMarkSelectedExported from "../payment-mark-selected-exported/payment-mark-selected-exported.component";
 import PaymentsExportAllButton from "../payments-export-all-button/payments-export-all-button.component";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
-import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
@@ -75,7 +77,11 @@ export function AccountingPayablesTableComponent({
             dataIndex: "owner",
             key: "owner",
             ellipsis: true,
-            sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
+            sorter: (a, b) =>
+        alphaSort(
+          OwnerNameDisplayFunction(a.job),
+          OwnerNameDisplayFunction(b.job)
+        ),
             sortOrder:
                 state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
             render: (text, record) => {
@@ -94,7 +100,9 @@ export function AccountingPayablesTableComponent({
             title: t("payments.fields.amount"),
             dataIndex: "amount",
             key: "amount",
-            render: (text, record) => (
+            sorter: (a, b) => a.amount - b.amount,
+      sortOrder:
+        state.sortedInfo.columnKey === "amount" && state.sortedInfo.order,render: (text, record) => (
                 <CurrencyFormatter>{record.amount}</CurrencyFormatter>
             ),
         },
@@ -111,19 +119,21 @@ export function AccountingPayablesTableComponent({
         {
             title: t("payments.fields.created_at"),
             dataIndex: "created_at",
-            key: "created_at",
+            key: "created_at",sorter: (a, b) => dateSort(a.created_at, b.created_at),
+      sortOrder:
+        state.sortedInfo.columnKey === "created_at" && state.sortedInfo.order,
             render: (text, record) => (
                 <DateTimeFormatter>{record.created_at}</DateTimeFormatter>
             ),
         },
-        {
-            title: t("payments.fields.exportedat"),
-            dataIndex: "exportedat",
-            key: "exportedat",
-            render: (text, record) => (
-                <DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
-            ),
-        },
+        //{
+          //  title: t("payments.fields.exportedat"),
+          //  dataIndex: "exportedat",
+          //  key: "exportedat",
+          //  render: (text, record) => (
+            //    <DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
+          //  ),
+        //},
         {
             title: t("exportlogs.labels.attempts"),
             dataIndex: "attempts",
@@ -137,7 +147,7 @@ export function AccountingPayablesTableComponent({
             title: t("general.labels.actions"),
             dataIndex: "actions",
             key: "actions",
-            sorter: (a, b) => a.clm_total - b.clm_total,
+
 
             render: (text, record) => (
                 <PaymentExportButton