Merge release / update

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

@@ -4,17 +4,19 @@ import {useTranslation} from "react-i18next";
 import {Link} from "react-router-dom";
 import {logImEXEvent} from "../../firebase/firebase.utils";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import {alphaSort, dateSort} from "../../utils/sorters";
+import {alphaSort, dateSort, statusSort } from "../../utils/sorters";
 import JobExportButton from "../jobs-close-export-button/jobs-close-export-button.component";
 import JobsExportAllButton from "../jobs-export-all-button/jobs-export-all-button.component";
 
 import {connect} from "react-redux";
 import {createStructuredSelector} from "reselect";
 import {selectBodyshop} from "../../redux/user/user.selectors";
-import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 import {DateFormatter} from "../../utils/DateFormatter";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
+import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
@@ -63,7 +65,7 @@ export function AccountingReceivablesTableComponent({
             title: t("jobs.fields.status"),
             dataIndex: "status",
             key: "status",
-            sorter: (a, b) => a.status - b.status,
+            sorter: (a, b) => statusSort(a, b, bodyshop.md_ro_statuses.statuses),
             sortOrder:
                 state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
         },
@@ -83,7 +85,8 @@ export function AccountingReceivablesTableComponent({
             title: t("jobs.fields.owner"),
             dataIndex: "owner",
             key: "owner",
-            sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+            sorter: (a, b) =>
+        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
             sortOrder:
                 state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
             render: (text, record) => {
@@ -103,7 +106,15 @@ export function AccountingReceivablesTableComponent({
             dataIndex: "vehicle",
             key: "vehicle",
             ellipsis: true,
-            render: (text, record) => {
+            sorter: (a, b) =>
+        alphaSort(
+          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
+            a.v_model_desc || ""
+          }`,
+          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
+        ),
+      sortOrder:
+        state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,render: (text, record) => {
                 return record.vehicleid ? (
                     <Link to={"/manage/vehicles/" + record.vehicleid}>
                         {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${