IO-2776 Re-disable make fields.

IO-2776 Remove ref file.
Fortellis cleanup.
2025-11-14 11:00:08 -08:00 · 2025-11-14 10:58:37 -08:00 · 2025-11-14 10:55:47 -08:00 · 2025-11-14 08:36:42 -08:00 · 2025-11-13 14:27:43 -08:00 · 2025-11-05 13:23:24 -08:00
156 changed files with 4713 additions and 4443 deletions
--- a/Notes.md
+++ b/Notes.md
@@ -0,0 +1,346 @@
+Fortellis Notes
+
+Subscription ID
+
+- Appears to give us a list of all dealerships we have access to, and `apiDmsInfo` contains the integrations that are enabled for that dealership.
+- Will likely need to filter based on the DMS ID or something?
+- Should store the whole subscription object. Contains department information needed in subsequent calls.
+
+Department ID
+
+- May have multiple departments. Appears that financial stuff goes to Accounting, History will go to Service.
+- TODO: How do we handle the multiple departments that may come up.
+
+###Internal Questions
+
+* Overview of the redis storing mechanism to cache this data. 
+* 
+
+# GL Wip Posting
+
+## Org Helper Return Data
+
+```json
+[
+  {
+    "acctgLgnID": "DEVWB-A",
+    "applCode": "V",
+    "coID": "77",
+    "companyName": "TEST SYS C187092 DEVWB",
+    "lgnDesc": "DEV WRITE BACK VMS",
+    "logon": "DEVWB-V"
+  },
+  {
+    "acctgLgnID": "DEVWB-A",
+    "applCode": "F",
+    "coID": "77",
+    "companyName": "TEST SYS C187092 DEVWB",
+    "lgnDesc": "DEV WRITE BACK F&I SALES",
+    "logon": "DEVWB-FI"
+  },
+  {
+    "acctgLgnID": "DEVWB-A",
+    "applCode": "CS",
+    "coID": "77",
+    "companyName": "TEST SYS C187092 DEVWB",
+    "lgnDesc": "DEV WRITE BACK SERVICE",
+    "logon": "DEVWB-S"
+  },
+  {
+    "acctgLgnID": "DEVWB-A",
+    "applCode": "A",
+    "coID": "77",
+    "companyName": "TEST SYS C187092 DEVWB",
+    "lgnDesc": "DEV WRITE BACK ACCTG",
+    "logon": "DEVWB-A"
+  },
+  {
+    "acctgLgnID": "DEVWB-A",
+    "applCode": "SL",
+    "coID": "77",
+    "companyName": "TEST SYS C187092 DEVWB",
+    "lgnDesc": "DEV WRTIE BACK SLS MGMT",
+    "logon": "DEVWB-SL"
+  },
+  {
+    "acctgLgnID": "DEVWB-A",
+    "applCode": "O",
+    "coID": "77",
+    "companyName": "TEST SYS C187092 DEVWB",
+    "lgnDesc": "DEV WRITE BACK PARTS",
+    "logon": "DEVWB-I"
+  }
+]
+```
+
+## Journal Helper Return Data
+
+```json
+[
+  {
+    "companyNo": "77",
+    "jrnlID": "32",
+    "jrnlName": "PARTS SALES",
+    "jrnlType": "S",
+    "intercoFlag": "0",
+    "defaultDocType": "4",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "92",
+    "jrnlName": "YTD ADJUSTMENTS",
+    "jrnlType": "Y",
+    "intercoFlag": "0",
+    "defaultDocType": "3",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "12",
+    "jrnlName": "FLEET SALES",
+    "jrnlType": "S",
+    "intercoFlag": "0",
+    "defaultDocType": "9",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "57",
+    "jrnlName": "CASH RECEIPTS (OPEN-ITEM)",
+    "jrnlType": "R",
+    "intercoFlag": "0",
+    "defaultDocType": "1",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "93",
+    "jrnlName": "SET UP HISTORY",
+    "jrnlType": "H",
+    "intercoFlag": "0",
+    "defaultDocType": "10",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "88",
+    "jrnlName": "F/S STATISCAL DATA",
+    "jrnlType": "F",
+    "intercoFlag": "0",
+    "defaultDocType": "10",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "58",
+    "jrnlName": "WARRANTY CREDITS",
+    "jrnlType": "G",
+    "intercoFlag": "0",
+    "defaultDocType": "3",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "FC",
+    "jrnlName": "FINANCE CHARGE",
+    "jrnlType": "A",
+    "intercoFlag": "0",
+    "defaultDocType": "12",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "94",
+    "jrnlName": "SET UP SCHEDULES",
+    "jrnlType": "C",
+    "intercoFlag": "0",
+    "defaultDocType": "3",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "95",
+    "jrnlName": "SET UP GENERAL LEDGER",
+    "jrnlType": "B",
+    "intercoFlag": "0",
+    "defaultDocType": "3",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "20",
+    "jrnlName": "USED VEHICLE SALES",
+    "jrnlType": "S",
+    "intercoFlag": "0",
+    "defaultDocType": "9",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "60",
+    "jrnlName": "CASH DISBURSEMENTS",
+    "jrnlType": "G",
+    "intercoFlag": "0",
+    "defaultDocType": "2",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "30",
+    "jrnlName": "SERVICE SALES",
+    "jrnlType": "S",
+    "intercoFlag": "0",
+    "defaultDocType": "7",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "40",
+    "jrnlName": "PAYROLL",
+    "jrnlType": "G",
+    "intercoFlag": "0",
+    "defaultDocType": "11",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "15",
+    "jrnlName": "DEALER TRADES",
+    "jrnlType": "S",
+    "intercoFlag": "0",
+    "defaultDocType": "9",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "70",
+    "jrnlName": "NEW VEHICLE PURCHASES",
+    "jrnlType": "G",
+    "intercoFlag": "0",
+    "defaultDocType": "8",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "25",
+    "jrnlName": "USED WHOLESALE",
+    "jrnlType": "S",
+    "intercoFlag": "0",
+    "defaultDocType": "9",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "75",
+    "jrnlName": "GENERAL PURCHASES",
+    "jrnlType": "G",
+    "intercoFlag": "0",
+    "defaultDocType": "5",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "10",
+    "jrnlName": "NEW VEHICLE SALES",
+    "jrnlType": "S",
+    "intercoFlag": "0",
+    "defaultDocType": "9",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "80",
+    "jrnlName": "GENERAL JOURNAL",
+    "jrnlType": "G",
+    "intercoFlag": "0",
+    "defaultDocType": "3",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "11",
+    "jrnlName": "WORK IN PROGRESS",
+    "jrnlType": "G",
+    "intercoFlag": "0",
+    "defaultDocType": "10",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "56",
+    "jrnlName": "CASH RECEIPTS (BALANCE FWD)",
+    "jrnlType": "G",
+    "intercoFlag": "0",
+    "defaultDocType": "1",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "81",
+    "jrnlName": "STANDARD ENTRIES",
+    "jrnlType": "G",
+    "intercoFlag": "0",
+    "defaultDocType": "6",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "51",
+    "jrnlName": "CASH RECEIPTS JOURNAL - EFT",
+    "jrnlType": "G",
+    "intercoFlag": "0",
+    "defaultDocType": "10",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "61",
+    "jrnlName": "CASH DISBURSMENTS -EFT",
+    "jrnlType": "G",
+    "intercoFlag": "0",
+    "defaultDocType": "10",
+    "errCode": "",
+    "errMsg": ""
+  },
+  {
+    "companyNo": "77",
+    "jrnlID": "71",
+    "jrnlName": "USED VEHICLE PURCHASES",
+    "jrnlType": "G",
+    "intercoFlag": "0",
+    "defaultDocType": "8",
+    "errCode": "",
+    "errMsg": ""
+  }
+]
+```
+
+# Feedback
+
+- Receiving bad request errors, with no details. API errors page doesn't indicate what's wrong for certain types of error codes.
+- API Error page works on a several minute delay.
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -2620,431 +2620,6 @@
      "dev": true,
      "license": "MIT"
    },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz",
-      "integrity": "sha512-OaGtL73Jck6pBKjNIe24BnFE6agGl+6KxDtTfHhy1HmhthfKouEcOhqpSL64K4/0WCtbKFLOdzD/44cJ4k9opA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.9.tgz",
-      "integrity": "sha512-5WNI1DaMtxQ7t7B6xa572XMXpHAaI/9Hnhk8lcxF4zVN4xstUgTlvuGDorBguKEnZO70qwEcLpfifMLoxiPqHQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.9.tgz",
-      "integrity": "sha512-IDrddSmpSv51ftWslJMvl3Q2ZT98fUSL2/rlUXuVqRXHCs5EUF1/f+jbjF5+NG9UffUDMCiTyh8iec7u8RlTLg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.9.tgz",
-      "integrity": "sha512-I853iMZ1hWZdNllhVZKm34f4wErd4lMyeV7BLzEExGEIZYsOzqDWDf+y082izYUE8gtJnYHdeDpN/6tUdwvfiw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.9.tgz",
-      "integrity": "sha512-XIpIDMAjOELi/9PB30vEbVMs3GV1v2zkkPnuyRRURbhqjyzIINwj+nbQATh4H9GxUgH1kFsEyQMxwiLFKUS6Rg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.9.tgz",
-      "integrity": "sha512-jhHfBzjYTA1IQu8VyrjCX4ApJDnH+ez+IYVEoJHeqJm9VhG9Dh2BYaJritkYK3vMaXrf7Ogr/0MQ8/MeIefsPQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.9.tgz",
-      "integrity": "sha512-z93DmbnY6fX9+KdD4Ue/H6sYs+bhFQJNCPZsi4XWJoYblUqT06MQUdBCpcSfuiN72AbqeBFu5LVQTjfXDE2A6Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.9.tgz",
-      "integrity": "sha512-mrKX6H/vOyo5v71YfXWJxLVxgy1kyt1MQaD8wZJgJfG4gq4DpQGpgTB74e5yBeQdyMTbgxp0YtNj7NuHN0PoZg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.9.tgz",
-      "integrity": "sha512-HBU2Xv78SMgaydBmdor38lg8YDnFKSARg1Q6AT0/y2ezUAKiZvc211RDFHlEZRFNRVhcMamiToo7bDx3VEOYQw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.9.tgz",
-      "integrity": "sha512-BlB7bIcLT3G26urh5Dmse7fiLmLXnRlopw4s8DalgZ8ef79Jj4aUcYbk90g8iCa2467HX8SAIidbL7gsqXHdRw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.9.tgz",
-      "integrity": "sha512-e7S3MOJPZGp2QW6AK6+Ly81rC7oOSerQ+P8L0ta4FhVi+/j/v2yZzx5CqqDaWjtPFfYz21Vi1S0auHrap3Ma3A==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.9.tgz",
-      "integrity": "sha512-Sbe10Bnn0oUAB2AalYztvGcK+o6YFFA/9829PhOCUS9vkJElXGdphz0A3DbMdP8gmKkqPmPcMJmJOrI3VYB1JQ==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.9.tgz",
-      "integrity": "sha512-YcM5br0mVyZw2jcQeLIkhWtKPeVfAerES5PvOzaDxVtIyZ2NUBZKNLjC5z3/fUlDgT6w89VsxP2qzNipOaaDyA==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.9.tgz",
-      "integrity": "sha512-++0HQvasdo20JytyDpFvQtNrEsAgNG2CY1CLMwGXfFTKGBGQT3bOeLSYE2l1fYdvML5KUuwn9Z8L1EWe2tzs1w==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.9.tgz",
-      "integrity": "sha512-uNIBa279Y3fkjV+2cUjx36xkx7eSjb8IvnL01eXUKXez/CBHNRw5ekCGMPM0BcmqBxBcdgUWuUXmVWwm4CH9kg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.9.tgz",
-      "integrity": "sha512-Mfiphvp3MjC/lctb+7D287Xw1DGzqJPb/J2aHHcHxflUo+8tmN/6d4k6I2yFR7BVo5/g7x2Monq4+Yew0EHRIA==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.9.tgz",
-      "integrity": "sha512-iSwByxzRe48YVkmpbgoxVzn76BXjlYFXC7NvLYq+b+kDjyyk30J0JY47DIn8z1MO3K0oSl9fZoRmZPQI4Hklzg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.9.tgz",
-      "integrity": "sha512-9jNJl6FqaUG+COdQMjSCGW4QiMHH88xWbvZ+kRVblZsWrkXlABuGdFJ1E9L7HK+T0Yqd4akKNa/lO0+jDxQD4Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.9.tgz",
-      "integrity": "sha512-RLLdkflmqRG8KanPGOU7Rpg829ZHu8nFy5Pqdi9U01VYtG9Y0zOG6Vr2z4/S+/3zIyOxiK6cCeYNWOFR9QP87g==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.9.tgz",
-      "integrity": "sha512-YaFBlPGeDasft5IIM+CQAhJAqS3St3nJzDEgsgFixcfZeyGPCd6eJBWzke5piZuZ7CtL656eOSYKk4Ls2C0FRQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.9.tgz",
-      "integrity": "sha512-1MkgTCuvMGWuqVtAvkpkXFmtL8XhWy+j4jaSO2wxfJtilVCi0ZE37b8uOdMItIHz4I6z1bWWtEX4CJwcKYLcuA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.9.tgz",
-      "integrity": "sha512-4Xd0xNiMVXKh6Fa7HEJQbrpP3m3DDn43jKxMjxLLRjWnRsfxjORYJlXPO4JNcXtOyfajXorRKY9NkOpTHptErg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openharmony"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.9.tgz",
-      "integrity": "sha512-WjH4s6hzo00nNezhp3wFIAfmGZ8U7KtrJNlFMRKxiI9mxEK1scOMAaa9i4crUtu+tBr+0IN6JCuAcSBJZfnphw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.9.tgz",
-      "integrity": "sha512-mGFrVJHmZiRqmP8xFOc6b84/7xa5y5YvR1x8djzXpJBSv/UsNK6aqec+6JDjConTgvvQefdGhFDAs2DLAds6gQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.9",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.9.tgz",
-      "integrity": "sha512-b33gLVU2k11nVx1OhX3C8QQP6UHQK4ZtN56oFWvVXvz2VkDoe6fbG8TOgHFxEvqeqohmRnIHe5A1+HADk4OQww==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
    "node_modules/@esbuild/win32-x64": {
      "version": "0.25.9",
      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.9.tgz",
@@ -3776,166 +3351,6 @@
        "@parcel/watcher-win32-x64": "2.5.1"
      }
    },
-    "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
-      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
-      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
-      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
-      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
-      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
-      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
-      "cpu": [
-        "arm"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
-      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
-      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
    "node_modules/@parcel/watcher-linux-x64-glibc": {
      "version": "2.5.1",
      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
@@ -3976,46 +3391,6 @@
        "url": "https://opencollective.com/parcel"
      }
    },
-    "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
-      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
-      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
    "node_modules/@parcel/watcher-win32-x64": {
      "version": "2.5.1",
      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
@@ -9260,9 +8635,9 @@
      "license": "ISC"
    },
    "node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
      "hasInstallScript": true,
      "license": "MIT",
      "optional": true,
@@ -13132,6 +12507,21 @@
        "node": ">=18"
      }
    },
+    "node_modules/playwright/node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
    "node_modules/possible-typed-array-names": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
@@ -17443,21 +16833,6 @@
        "sourcemap-codec": "^1.4.8"
      }
    },
-    "node_modules/vite/node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
    "node_modules/vite/node_modules/postcss": {
      "version": "8.5.6",
      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
--- a/client/src/App/App.jsx
+++ b/client/src/App/App.jsx
@@ -138,7 +138,7 @@ export function App({
    );
  }

-  if (!isPartsEntry && currentEula && !currentUser.eulaIsAccepted) {
+  if (currentEula && !currentUser.eulaIsAccepted) {
    return <Eula />;
  }

--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -26,7 +26,6 @@ import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
 import { handleUpload as handleUploadToImageProxy } from "../documents-upload-imgproxy/documents-upload-imgproxy.utility";
-import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";

 const mapStateToProps = createStructuredSelector({
  billEnterModal: selectBillEnterModal,
@@ -451,9 +450,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
          setEnterAgain(false);
        }}
      >
-        <RbacWrapper action="bills:enter">
-          <BillFormContainer form={form} disableInvNumber={billEnterModal.context.disableInvNumber} />
-        </RbacWrapper>
+        <BillFormContainer form={form} disableInvNumber={billEnterModal.context.disableInvNumber} />
      </Form>
    </Modal>
  );
--- a/client/src/components/chat-affix/chat-affix.container.jsx
+++ b/client/src/components/chat-affix/chat-affix.container.jsx
@@ -2,6 +2,7 @@ import { useApolloClient } from "@apollo/client";
 import { getToken } from "@firebase/messaging";
 import axios from "axios";
 import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
 import { messaging, requestForToken } from "../../firebase/firebase.utils";
 import ChatPopupComponent from "../chat-popup/chat-popup.component";
 import "./chat-affix.styles.scss";
@@ -9,14 +10,14 @@ import { registerMessagingHandlers, unregisterMessagingHandlers } from "./regist
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";

 export function ChatAffixContainer({ bodyshop, chatVisible, currentUser }) {
+  const { t } = useTranslation();
  const client = useApolloClient();
  const { socket } = useSocket();

-  // 1) FCM subscription (independent of socket handler registration)
  useEffect(() => {
    if (!bodyshop?.messagingservicesid) return;

-    async function subscribeToTopicForFCMNotification() {
+    async function SubscribeToTopicForFCMNotification() {
      try {
        await requestForToken();
        await axios.post("/notifications/subscribe", {
@@ -31,35 +32,17 @@ export function ChatAffixContainer({ bodyshop, chatVisible, currentUser }) {
      }
    }

-    subscribeToTopicForFCMNotification();
-  }, [bodyshop?.messagingservicesid, bodyshop?.imexshopid]);
+    SubscribeToTopicForFCMNotification();

-  // 2) Register socket handlers as soon as socket is connected (regardless of chatVisible)
-  useEffect(() => {
-    if (!socket) return;
-    if (!bodyshop?.messagingservicesid) return;
-    if (!bodyshop?.id) return;
+    // Register WebSocket handlers
+    if (socket?.connected) {
+      registerMessagingHandlers({ socket, client, currentUser, bodyshop, t });

-    // If socket isn't connected yet, ensure no stale handlers remain.
-    if (!socket.connected) {
-      unregisterMessagingHandlers({ socket });
-      return;
+      return () => {
+        unregisterMessagingHandlers({ socket });
+      };
    }
-
-    // Prevent duplicate listeners if this effect runs more than once.
-    unregisterMessagingHandlers({ socket });
-
-    registerMessagingHandlers({
-      socket,
-      client,
-      currentUser,
-      bodyshop
-    });
-
-    return () => {
-      unregisterMessagingHandlers({ socket });
-    };
-  }, [socket, socket?.connected, bodyshop?.id, bodyshop?.messagingservicesid, client, currentUser?.email]);
+  }, [bodyshop, socket, t, client]);

  if (!bodyshop?.messagingservicesid) return <></>;

--- a/client/src/components/chat-affix/registerMessagingSocketHandlers.js
+++ b/client/src/components/chat-affix/registerMessagingSocketHandlers.js
@@ -13,241 +13,68 @@ const logLocal = (message, ...args) => {
  }
 };

-const safeIsoNow = () => new Date().toISOString();
-const isSystemMsid = (msid) => typeof msid === "string" && msid.startsWith("SYS_");
-
-const normalizeConversationForList = (raw, { isoutbound, isSystem } = {}) => {
-  const c = raw || {};
-  const id = c.id;
-
-  return {
-    __typename: "conversations",
-    id,
-    phone_num: c.phone_num ?? null,
-    updated_at: c.updated_at ?? safeIsoNow(),
-    unreadcnt: typeof c.unreadcnt === "number" ? c.unreadcnt : 0,
-    archived: c.archived ?? false,
-    label: c.label ?? null,
-
-    job_conversations: Array.isArray(c.job_conversations)
-      ? c.job_conversations.map((jc) => {
-          const job = jc?.job || {};
-          const jobId = jc?.jobid ?? job?.id ?? null;
-
-          return {
-            __typename: "job_conversations",
-            jobid: jobId,
-            conversationid: jc?.conversationid ?? id ?? null,
-            job: {
-              __typename: "jobs",
-              id: jobId,
-              ro_number: job?.ro_number ?? null,
-              ownr_fn: job?.ownr_fn ?? null,
-              ownr_ln: job?.ownr_ln ?? null,
-              ownr_co_nm: job?.ownr_co_nm ?? null
-            }
-          };
-        })
-      : [],
-
-    messages_aggregate: c.messages_aggregate || {
-      __typename: "messages_aggregate",
-      aggregate: {
-        __typename: "messages_aggregate_fields",
-        count: isoutbound || isSystem ? 0 : 1
-      }
-    }
-  };
-};
-
-const CONVERSATION_LIST_ITEM_FRAGMENT = gql`
-  fragment _ConversationListItem on conversations {
-    id
-    phone_num
-    updated_at
-    unreadcnt
-    archived
-    label
-    job_conversations {
-      jobid
-      conversationid
-      job {
-        id
-        ro_number
-        ownr_fn
-        ownr_ln
-        ownr_co_nm
-      }
-    }
-    messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false }, is_system: { _eq: false } }) {
-      aggregate {
-        count
-      }
-    }
-  }
-`;
-
-const normalizeMessageForCache = (raw, fallbackConversationId) => {
-  const m = raw || {};
-
-  return {
-    __typename: "messages",
-    id: m.id,
-    conversationid: m.conversationid ?? m.conversation?.id ?? fallbackConversationId,
-
-    status: m.status ?? null,
-    text: m.text ?? "",
-    is_system: typeof m.is_system === "boolean" ? m.is_system : false,
-    isoutbound: typeof m.isoutbound === "boolean" ? m.isoutbound : false,
-    image: typeof m.image === "boolean" ? m.image : false,
-    image_path: m.image_path ?? null,
-    userid: m.userid ?? null,
-    created_at: m.created_at ?? safeIsoNow(),
-    read: typeof m.read === "boolean" ? m.read : false
-  };
-};
-
-const isConversationDetailsCached = (client, conversationId) => {
-  try {
-    return !!client.cache.readQuery({
-      query: GET_CONVERSATION_DETAILS,
-      variables: { conversationId }
-    })?.conversations_by_pk;
-  } catch {
-    return false;
-  }
-};
-
-const conversationDetailsCached = (client, conversationId) => {
-  try {
-    const res = client.cache.readQuery({
-      query: GET_CONVERSATION_DETAILS,
-      variables: { conversationId }
-    });
-    return !!res?.conversations_by_pk;
-  } catch {
-    return false;
-  }
-};
-
-const messageEntityCached = (client, messageId) => {
-  const cacheId = client.cache.identify({ __typename: "messages", id: messageId });
-  if (!cacheId) return false;
-
-  try {
-    client.cache.readFragment({
-      id: cacheId,
-      fragment: gql`
-        fragment _MsgExists on messages {
-          id
-        }
-      `
-    });
-    return true;
-  } catch {
-    return false;
-  }
-};
-
-const enrichConversation = (conversation, { isoutbound, isSystem }) => ({
+// Utility function to enrich conversation data
+const enrichConversation = (conversation, isOutbound) => ({
  ...conversation,
-  updated_at: conversation.updated_at || safeIsoNow(),
-  unreadcnt: typeof conversation.unreadcnt === "number" ? conversation.unreadcnt : 0,
-  archived: conversation.archived ?? false,
-  label: conversation.label ?? null,
+  updated_at: conversation.updated_at || new Date().toISOString(),
+  unreadcnt: conversation.unreadcnt || 0,
+  archived: conversation.archived || false,
+  label: conversation.label || null,
  job_conversations: conversation.job_conversations || [],
  messages_aggregate: conversation.messages_aggregate || {
    __typename: "messages_aggregate",
    aggregate: {
      __typename: "messages_aggregate_fields",
-      count: isoutbound || isSystem ? 0 : 1
+      count: isOutbound ? 0 : 1
    }
  },
  __typename: "conversations"
 });

-const upsertConversationIntoOffsetZeroList = (client, conversationObj, { isoutbound, isSystem } = {}) => {
-  const normalized = normalizeConversationForList(conversationObj, { isoutbound, isSystem });
-  if (!normalized?.id) return;
-
-  const convCacheId = client.cache.identify(normalized);
-  if (!convCacheId) return;
-
-  client.cache.writeFragment({
-    id: convCacheId,
-    fragment: CONVERSATION_LIST_ITEM_FRAGMENT,
-    data: normalized
-  });
-
-  client.cache.modify({
-    id: "ROOT_QUERY",
-    fields: {
-      conversations(existing = [], { args, readField }) {
-        if (!args || args.offset !== 0) return existing;
-
-        const archivedEq = args?.where?.archived?._eq;
-        if (archivedEq === true) return existing;
-
-        const without = existing.filter((c) => readField("id", c) !== normalized.id);
-        return [{ __ref: convCacheId }, ...without];
-      }
-    }
-  });
-};
+// Can be uncommonted to test the playback of the notification sound
+// window.testTone = () => {
+//   const notificationSound = new Audio(newMessageSound);
+//   notificationSound.play().catch((error) => {
+//     console.error("Error playing notification sound:", error);
+//   });
+// };

 export const registerMessagingHandlers = ({ socket, client, currentUser, bodyshop }) => {
  if (!(socket && client)) return;

-  // Coalesce unread refetches (avoid spamming during bursts)
-  let unreadRefetchInFlight = null;
-  const refetchUnreadCount = () => {
-    if (unreadRefetchInFlight) return;
-
-    unreadRefetchInFlight = client
-      .refetchQueries({
-        include: ["UNREAD_CONVERSATION_COUNT"]
-      })
-      .catch(() => {
-        // best-effort
-      })
-      .finally(() => {
-        unreadRefetchInFlight = null;
-      });
-  };
-
  const handleNewMessageSummary = async (message) => {
-    const { conversationId, newConversation, existingConversation, isoutbound, msid, updated_at } = message;
-    const isSystem = isSystemMsid(msid);
+    const { conversationId, newConversation, existingConversation, isoutbound } = message;

-    const isNewMessageSoundEnabled = (clientInstance) => {
+    // True only when DB value is strictly true; falls back to true on cache miss
+    const isNewMessageSoundEnabled = (client) => {
      try {
        const email = currentUser?.email;
-        if (!email) return true;
-        const res = clientInstance.readQuery({
+        if (!email) return true; // default allow if we can't resolve user
+        const res = client.readQuery({
          query: QUERY_ACTIVE_ASSOCIATION_SOUND,
          variables: { email }
        });
        const flag = res?.associations?.[0]?.new_message_sound;
-        return flag === true;
+        return flag === true; // strictly true => enabled
      } catch {
+        // If the query hasn't been seeded in cache yet, default ON
        return true;
      }
    };

    logLocal("handleNewMessageSummary - Start", { message, isNew: !existingConversation });

+    const queryVariables = { offset: 0 };
+
    if (!isoutbound) {
+      // Play notification sound for new inbound message (scoped to bodyshop)
      if (isLeaderTab(bodyshop.id) && isNewMessageSoundEnabled(client)) {
        playNewMessageSound(bodyshop.id);
      }
-
-      // Real-time badge update for affix (best-effort, coalesced)
-      if (!isSystem) {
-        refetchUnreadCount();
-      }
    }

    if (!existingConversation && conversationId) {
+      // Attempt to read from the cache to determine if this is actually a new conversation
      try {
        const cachedConversation = client.cache.readFragment({
          id: client.cache.identify({ __typename: "conversations", id: conversationId }),
@@ -259,54 +86,75 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
        });

        if (cachedConversation) {
-          logLocal("handleNewMessageSummary - Existing Conversation inferred from cache", { conversationId });
-          return handleNewMessageSummary({ ...message, existingConversation: true });
+          logLocal("handleNewMessageSummary - Existing Conversation inferred from cache", {
+            conversationId
+          });
+          return handleNewMessageSummary({
+            ...message,
+            existingConversation: true
+          });
        }
      } catch {
-        // Cache miss is normal
+        logLocal("handleNewMessageSummary - Cache miss", { conversationId });
      }
    }

+    // Handle new conversation
    if (!existingConversation && newConversation?.phone_num) {
+      logLocal("handleNewMessageSummary - New Conversation", newConversation);
+
      try {
-        upsertConversationIntoOffsetZeroList(client, newConversation, { isoutbound, isSystem });
+        const queryResults = client.cache.readQuery({
+          query: CONVERSATION_LIST_QUERY,
+          variables: queryVariables
+        });
+
+        const existingConversations = queryResults?.conversations || [];
+        const enrichedConversation = enrichConversation(newConversation, isoutbound);
+
+        if (!existingConversations.some((conv) => conv.id === enrichedConversation.id)) {
+          client.cache.modify({
+            id: "ROOT_QUERY",
+            fields: {
+              conversations(existingConversations = []) {
+                return [enrichedConversation, ...existingConversations];
+              }
+            }
+          });
+        }
      } catch (error) {
        console.error("Error updating cache for new conversation:", error);
      }
      return;
    }

-    if (existingConversation && conversationId) {
+    // Handle existing conversation
+    if (existingConversation) {
      try {
        client.cache.modify({
          id: client.cache.identify({ __typename: "conversations", id: conversationId }),
          fields: {
-            updated_at: () => updated_at || safeIsoNow(),
+            updated_at: () => new Date().toISOString(),
            archived: () => false,
-
-            messages_aggregate(cached = null) {
-              if (isoutbound || isSystem) return cached;
-
-              const currentCount = cached?.aggregate?.count ?? 0;
-              return {
-                __typename: "messages_aggregate",
-                aggregate: {
-                  __typename: "messages_aggregate_fields",
-                  count: currentCount + 1
-                }
-              };
-            },
-
-            unreadcnt(cached) {
-              if (isoutbound || isSystem) return cached;
-              const n = typeof cached === "number" ? cached : 0;
-              return n + 1;
+            messages_aggregate(cached = { aggregate: { count: 0 } }) {
+              const currentCount = cached.aggregate?.count || 0;
+              if (!isoutbound) {
+                return {
+                  __typename: "messages_aggregate",
+                  aggregate: {
+                    __typename: "messages_aggregate_fields",
+                    count: currentCount + 1
+                  }
+                };
+              }
+              return cached;
            }
          }
        });
      } catch (error) {
        console.error("Error updating cache for existing conversation:", error);
      }
+
      return;
    }

@@ -318,78 +166,88 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho

    logLocal("handleNewMessageDetailed - Start", message);

-    if (!conversationId || !isConversationDetailsCached(client, conversationId)) return;
-
    try {
-      const normalized = normalizeMessageForCache(newMessage, conversationId);
+      // Check if the conversation exists in the cache
+      const queryResults = client.cache.readQuery({
+        query: GET_CONVERSATION_DETAILS,
+        variables: { conversationId }
+      });

-      const messageCacheId = client.cache.identify(normalized);
-      if (!messageCacheId) {
-        console.warn("handleNewMessageDetailed - Could not identify message for cache", {
-          conversationId,
-          newMessageId: newMessage?.id
-        });
+      if (!queryResults?.conversations_by_pk) {
+        console.warn("Conversation not found in cache:", { conversationId });
        return;
      }

-      client.cache.writeFragment({
-        id: messageCacheId,
-        fragment: gql`
-          fragment _IncomingMessage on messages {
-            id
-            conversationid
-            status
-            text
-            is_system
-            isoutbound
-            image
-            image_path
-            userid
-            created_at
-            read
-          }
-        `,
-        data: normalized
-      });
-
+      // Append the new message to the conversation's message list using cache.modify
      client.cache.modify({
        id: client.cache.identify({ __typename: "conversations", id: conversationId }),
        fields: {
-          messages(existing = [], { readField }) {
-            const already = existing.some((ref) => readField("id", ref) === normalized.id);
-            if (already) return existing;
-            return [...existing, { __ref: messageCacheId }];
-          },
-          updated_at() {
-            return normalized.created_at || safeIsoNow();
+          messages(existingMessages = []) {
+            return [...existingMessages, newMessage];
          }
        }
      });

-      logLocal("handleNewMessageDetailed - Message appended successfully", { conversationId });
+      logLocal("handleNewMessageDetailed - Message appended successfully", {
+        conversationId,
+        newMessage
+      });
    } catch (error) {
      console.error("Error updating conversation messages in cache:", error);
    }
  };

  const handleMessageChanged = (message) => {
-    if (!message?.id) return;
+    if (!message) {
+      logLocal("handleMessageChanged - No message provided", message);
+      return;
+    }

    logLocal("handleMessageChanged - Start", message);

-    if (!messageEntityCached(client, message.id)) return;
-
    try {
-      const msgCacheId = client.cache.identify({ __typename: "messages", id: message.id });
-
      client.cache.modify({
-        id: msgCacheId,
+        id: client.cache.identify({ __typename: "conversations", id: message.conversationid }),
        fields: {
-          status(existing) {
-            return message.type === "status-changed" ? (message.status ?? existing) : existing;
-          },
-          text(existing) {
-            return message.type === "text-updated" ? (message.text ?? existing) : existing;
+          messages(existingMessages = [], { readField }) {
+            return existingMessages.map((messageRef) => {
+              // Check if this is the message to update
+              if (readField("id", messageRef) === message.id) {
+                const currentStatus = readField("status", messageRef);
+
+                // Handle known types of message changes
+                switch (message.type) {
+                  case "status-changed":
+                    // Prevent overwriting if the current status is already "delivered"
+                    if (currentStatus === "delivered") {
+                      logLocal("handleMessageChanged - Status already delivered, skipping update", {
+                        messageId: message.id
+                      });
+                      return messageRef;
+                    }
+
+                    // Update the status field
+                    return {
+                      ...messageRef,
+                      status: message.status
+                    };
+
+                  case "text-updated":
+                    // Handle changes to the message text
+                    return {
+                      ...messageRef,
+                      text: message.text
+                    };
+
+                  default:
+                    // Log a warning for unhandled message types
+                    logLocal("handleMessageChanged - Unhandled message type", { type: message.type });
+                    return messageRef;
+                }
+              }
+
+              return messageRef;
+            });
          }
        }
      });
@@ -404,140 +262,149 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
  };

  const handleConversationChanged = async (data) => {
-    if (!data?.conversationId) return;
-
-    const {
-      conversationId,
-      type,
-      job_conversations,
-      messageIds,
-      messageIdsMarkedRead,
-      lastUnreadMessageId,
-      unreadCount,
-      ...fields
-    } = data;
+    if (!data) {
+      logLocal("handleConversationChanged - No data provided", data);
+      return;
+    }

+    const { conversationId, type, job_conversations, messageIds, ...fields } = data;
    logLocal("handleConversationChanged - Start", data);

-    const updatedAt = safeIsoNow();
-    const detailsCached = conversationDetailsCached(client, conversationId);
+    const updatedAt = new Date().toISOString();

+    const updateConversationList = (newConversation) => {
+      try {
+        const existingList = client.cache.readQuery({
+          query: CONVERSATION_LIST_QUERY,
+          variables: { offset: 0 }
+        });
+
+        const updatedList = existingList?.conversations
+          ? [newConversation, ...existingList.conversations.filter((conv) => conv.id !== newConversation.id)]
+          : [newConversation]; // Prevent duplicates
+
+        client.cache.writeQuery({
+          query: CONVERSATION_LIST_QUERY,
+          variables: { offset: 0 },
+          data: {
+            conversations: updatedList
+          }
+        });
+
+        logLocal("handleConversationChanged - Conversation list updated successfully", newConversation);
+      } catch (error) {
+        console.error("Error updating conversation list in the cache:", error);
+      }
+    };
+
+    // Handle specific types
    try {
      switch (type) {
-        case "conversation-marked-read": {
-          refetchUnreadCount();
-
-          if (detailsCached && Array.isArray(messageIds)) {
-            messageIds.forEach((id) => {
-              if (!messageEntityCached(client, id)) return;
-              client.cache.modify({
-                id: client.cache.identify({ __typename: "messages", id }),
-                fields: { read: () => true }
-              });
+        case "conversation-marked-read":
+          if (conversationId && messageIds?.length > 0) {
+            client.cache.modify({
+              id: client.cache.identify({ __typename: "conversations", id: conversationId }),
+              fields: {
+                messages(existingMessages = [], { readField }) {
+                  return existingMessages.map((message) => {
+                    if (messageIds.includes(readField("id", message))) {
+                      return { ...message, read: true };
+                    }
+                    return message;
+                  });
+                },
+                messages_aggregate: () => ({
+                  __typename: "messages_aggregate",
+                  aggregate: { __typename: "messages_aggregate_fields", count: 0 }
+                })
+              }
            });
          }
-
-          client.cache.modify({
-            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-            fields: {
-              messages_aggregate: () => ({
-                __typename: "messages_aggregate",
-                aggregate: { __typename: "messages_aggregate_fields", count: 0 }
-              }),
-              unreadcnt: () => 0,
-              updated_at: () => updatedAt
-            }
-          });
-
          break;
-        }
-
-        case "conversation-marked-unread": {
-          refetchUnreadCount();
-
-          const safeUnreadCount = typeof unreadCount === "number" ? unreadCount : 1;
-          const idsMarkedRead = Array.isArray(messageIdsMarkedRead) ? messageIdsMarkedRead : [];
-
-          if (detailsCached) {
-            idsMarkedRead.forEach((id) => {
-              if (!messageEntityCached(client, id)) return;
-              client.cache.modify({
-                id: client.cache.identify({ __typename: "messages", id }),
-                fields: { read: () => true }
-              });
-            });
-
-            if (lastUnreadMessageId && messageEntityCached(client, lastUnreadMessageId)) {
-              client.cache.modify({
-                id: client.cache.identify({ __typename: "messages", id: lastUnreadMessageId }),
-                fields: { read: () => false }
-              });
-            }
-          }
-
-          client.cache.modify({
-            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-            fields: {
-              updated_at: () => updatedAt,
-              messages_aggregate: () => ({
-                __typename: "messages_aggregate",
-                aggregate: {
-                  __typename: "messages_aggregate_fields",
-                  count: safeUnreadCount
-                }
-              }),
-              unreadcnt: () => safeUnreadCount
-            }
-          });

+        case "conversation-created":
+          updateConversationList({ ...fields, job_conversations, updated_at: updatedAt });
          break;
-        }
-
-        case "conversation-created": {
-          // New conversation likely implies new unread inbound message(s)
-          refetchUnreadCount();
-
-          const conv = enrichConversation(
-            { id: conversationId, job_conversations, ...fields, updated_at: updatedAt },
-            { isoutbound: false, isSystem: false }
-          );
-          upsertConversationIntoOffsetZeroList(client, conv);
-          break;
-        }

        case "conversation-unarchived":
-        case "conversation-archived": {
-          // Keep unread badge correct even if archiving affects counts
-          refetchUnreadCount();
+        case "conversation-archived":
+          try {
+            const listQueryVariables = { offset: 0 };
+            const detailsQueryVariables = { conversationId };

-          await client.refetchQueries({
-            include: [CONVERSATION_LIST_QUERY, GET_CONVERSATION_DETAILS]
-          });
+            // Check if conversation details exist in the cache
+            const detailsExist = !!client.cache.readQuery({
+              query: GET_CONVERSATION_DETAILS,
+              variables: detailsQueryVariables
+            });
+
+            // Refetch conversation list
+            await client.refetchQueries({
+              include: [CONVERSATION_LIST_QUERY, ...(detailsExist ? [GET_CONVERSATION_DETAILS] : [])],
+              variables: [
+                { query: CONVERSATION_LIST_QUERY, variables: listQueryVariables },
+                ...(detailsExist
+                  ? [
+                      {
+                        query: GET_CONVERSATION_DETAILS,
+                        variables: detailsQueryVariables
+                      }
+                    ]
+                  : [])
+              ]
+            });
+
+            logLocal("handleConversationChanged - Refetched queries after state change", {
+              conversationId,
+              type
+            });
+          } catch (error) {
+            console.error("Error refetching queries after conversation state change:", error);
+          }
          break;
-        }

        case "tag-added": {
-          const formattedJobConversations = (job_conversations || []).map((jc) => ({
+          // Ensure `job_conversations` is properly formatted
+          const formattedJobConversations = job_conversations.map((jc) => ({
            __typename: "job_conversations",
            jobid: jc.jobid || jc.job?.id,
            conversationid: conversationId,
-            job: {
+            job: jc.job || {
              __typename: "jobs",
-              id: jc.job?.id,
-              ro_number: jc.job?.ro_number,
-              ownr_co_nm: jc.job?.ownr_co_nm,
-              ownr_fn: jc.job?.ownr_fn,
-              ownr_ln: jc.job?.ownr_ln
+              id: data.selectedJob.id,
+              ro_number: data.selectedJob.ro_number,
+              ownr_co_nm: data.selectedJob.ownr_co_nm,
+              ownr_fn: data.selectedJob.ownr_fn,
+              ownr_ln: data.selectedJob.ownr_ln
            }
          }));

          client.cache.modify({
            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
            fields: {
-              job_conversations(existing = [], { readField }) {
-                const seen = new Set(existing.map((x) => readField("jobid", x)).filter(Boolean));
-                const incoming = formattedJobConversations.filter((x) => x.jobid && !seen.has(x.jobid));
-                return [...existing, ...incoming];
+              job_conversations: (existing = []) => {
+                // Ensure no duplicates based on both `conversationid` and `jobid`
+                const existingLinks = new Set(
+                  existing.map((jc) => {
+                    const jobId = client.cache.readFragment({
+                      id: client.cache.identify(jc),
+                      fragment: gql`
+                        fragment JobConversationLinkAdded on job_conversations {
+                          jobid
+                          conversationid
+                        }
+                      `
+                    })?.jobid;
+                    return `${jobId}:${conversationId}`; // Unique identifier for a job-conversation link
+                  })
+                );
+
+                const newItems = formattedJobConversations.filter((jc) => {
+                  const uniqueLink = `${jc.jobid}:${jc.conversationid}`;
+                  return !existingLinks.has(uniqueLink);
+                });
+
+                return [...existing, ...newItems];
              }
            }
          });
@@ -545,31 +412,46 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
          break;
        }

-        case "tag-removed": {
-          const conversationCacheId = client.cache.identify({ __typename: "conversations", id: conversationId });
+        case "tag-removed":
+          try {
+            const conversationCacheId = client.cache.identify({ __typename: "conversations", id: conversationId });
+
+            // Evict the specific cache entry for job_conversations
+            client.cache.evict({
+              id: conversationCacheId,
+              fieldName: "job_conversations"
+            });
+
+            // Garbage collect evicted entries
+            client.cache.gc();
+
+            logLocal("handleConversationChanged - tag removed - Refetched conversation list after state change", {
+              conversationId,
+              type
+            });
+          } catch (error) {
+            console.error("Error refetching queries after conversation state change: (Tag Removed)", error);
+          }

-          client.cache.evict({
-            id: conversationCacheId,
-            fieldName: "job_conversations"
-          });
-          client.cache.gc();
          break;
-        }

-        default: {
+        default:
+          logLocal("handleConversationChanged - Unhandled type", { type });
          client.cache.modify({
            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-            fields: Object.fromEntries(
-              Object.entries(fields).map(([key, value]) => [key, (cached) => (value !== undefined ? value : cached)])
-            )
+            fields: {
+              ...Object.fromEntries(
+                Object.entries(fields).map(([key, value]) => [key, (cached) => (value !== undefined ? value : cached)])
+              )
+            }
          });
-        }
      }
    } catch (error) {
      console.error("Error handling conversation changes:", { type, error });
    }
  };

+  // Existing handler for phone number opt-out
  const handlePhoneNumberOptedOut = async (data) => {
    const { bodyshopid, phone_number } = data;
    logLocal("handlePhoneNumberOptedOut - Start", data);
@@ -579,18 +461,22 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
        id: "ROOT_QUERY",
        fields: {
          phone_number_opt_out(existing = [], { readField }) {
-            const exists = existing.some(
+            const phoneNumberExists = existing.some(
              (ref) => readField("phone_number", ref) === phone_number && readField("bodyshopid", ref) === bodyshopid
            );
-            if (exists) return existing;
+
+            if (phoneNumberExists) {
+              logLocal("handlePhoneNumberOptedOut - Phone number already in cache", { phone_number, bodyshopid });
+              return existing;
+            }

            const newOptOut = {
              __typename: "phone_number_opt_out",
              id: `temporary-${phone_number}-${Date.now()}`,
              bodyshopid,
              phone_number,
-              created_at: safeIsoNow(),
-              updated_at: safeIsoNow()
+              created_at: new Date().toISOString(),
+              updated_at: new Date().toISOString()
            };

            return [...existing, newOptOut];
@@ -605,36 +491,46 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
        args: { bodyshopid, search: phone_number }
      });
      client.cache.gc();
+
+      logLocal("handlePhoneNumberOptedOut - Cache updated successfully", data);
    } catch (error) {
      console.error("Error updating cache for phone number opt-out:", error);
+      logLocal("handlePhoneNumberOptedOut - Error", { error: error.message });
    }
  };

+  // New handler for phone number opt-in
  const handlePhoneNumberOptedIn = async (data) => {
    const { bodyshopid, phone_number } = data;
    logLocal("handlePhoneNumberOptedIn - Start", data);

    try {
+      // Update the Apollo cache for GET_PHONE_NUMBER_OPT_OUTS by removing the phone number
      client.cache.modify({
        id: "ROOT_QUERY",
        fields: {
          phone_number_opt_out(existing = [], { readField }) {
+            // Filter out the phone number from the opt-out list
            return existing.filter(
              (ref) => !(readField("phone_number", ref) === phone_number && readField("bodyshopid", ref) === bodyshopid)
            );
          }
        },
-        broadcast: true
+        broadcast: true // Trigger UI updates
      });

+      // Evict the cache entry to force a refetch on next query
      client.cache.evict({
        id: "ROOT_QUERY",
        fieldName: "phone_number_opt_out",
        args: { bodyshopid, search: phone_number }
      });
      client.cache.gc();
+
+      logLocal("handlePhoneNumberOptedIn - Cache updated successfully", data);
    } catch (error) {
      console.error("Error updating cache for phone number opt-in:", error);
+      logLocal("handlePhoneNumberOptedIn - Error", { error: error.message });
    }
  };

--- a/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx
+++ b/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx
@@ -12,7 +12,7 @@ import _ from "lodash";
 import { ExclamationCircleOutlined } from "@ant-design/icons";
 import "./chat-conversation-list.styles.scss";
 import { useQuery } from "@apollo/client";
-import { GET_PHONE_NUMBER_OPT_OUTS_BY_NUMBERS } from "../../graphql/phone-number-opt-out.queries.js";
+import { GET_PHONE_NUMBER_OPT_OUTS } from "../../graphql/phone-number-opt-out.queries.js";
 import { phone } from "phone";
 import { useTranslation } from "react-i18next";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -29,26 +29,13 @@ const mapDispatchToProps = (dispatch) => ({
 function ChatConversationListComponent({ conversationList, selectedConversation, setSelectedConversation, bodyshop }) {
  const { t } = useTranslation();
  const [, forceUpdate] = useState(false);
-
-  const phoneNumbers = useMemo(() => {
-    return (conversationList || [])
-      .map((item) => {
-        try {
-          const p = phone(item.phone_num, "CA")?.phoneNumber;
-          return p ? p.replace(/^\+1/, "") : null;
-        } catch {
-          return null;
-        }
-      })
-      .filter(Boolean);
-  }, [conversationList]);
-
-  const { data: optOutData } = useQuery(GET_PHONE_NUMBER_OPT_OUTS_BY_NUMBERS, {
+  const phoneNumbers = conversationList.map((item) => phone(item.phone_num, "CA").phoneNumber.replace(/^\+1/, ""));
+  const { data: optOutData } = useQuery(GET_PHONE_NUMBER_OPT_OUTS, {
    variables: {
-      bodyshopid: bodyshop?.id,
+      bodyshopid: bodyshop.id,
      phone_numbers: phoneNumbers
    },
-    skip: !bodyshop?.id || phoneNumbers.length === 0,
+    skip: !conversationList.length,
    fetchPolicy: "cache-and-network"
  });

@@ -71,25 +58,15 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
    return _.orderBy(conversationList, ["updated_at"], ["desc"]);
  }, [conversationList]);

-  const renderConversation = (index) => {
+  const renderConversation = (index, t) => {
    const item = sortedConversationList[index];
-
-    const normalizedPhone = (() => {
-      try {
-        return phone(item.phone_num, "CA")?.phoneNumber?.replace(/^\+1/, "") || "";
-      } catch {
-        return "";
-      }
-    })();
-
-    const hasOptOutEntry = normalizedPhone ? optOutMap.has(normalizedPhone) : false;
-
+    const normalizedPhone = phone(item.phone_num, "CA").phoneNumber.replace(/^\+1/, "");
+    const hasOptOutEntry = optOutMap.has(normalizedPhone);
    const cardContentRight = <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>;
    const cardContentLeft =
      item.job_conversations.length > 0
        ? item.job_conversations.map((j, idx) => <Tag key={idx}>{j.job.ro_number}</Tag>)
        : null;
-
    const names = <>{_.uniq(item.job_conversations.map((j) => OwnerNameDisplayFunction(j.job)))}</>;
    const cardTitle = (
      <>
@@ -103,10 +80,9 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
        )}
      </>
    );
-
    const cardExtra = (
      <>
-        <Badge count={item.messages_aggregate?.aggregate?.count || 0} />
+        <Badge count={item.messages_aggregate.aggregate.count} />
        {hasOptOutEntry && (
          <Tooltip title={t("consent.text_body")}>
            <Tag color="red" icon={<ExclamationCircleOutlined />}>
@@ -116,7 +92,6 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
        )}
      </>
    );
-
    const getCardStyle = () =>
      item.id === selectedConversation
        ? { backgroundColor: "var(--card-selected-bg)" }
@@ -129,8 +104,24 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
        className={`chat-list-item ${item.id === selectedConversation ? "chat-list-selected-conversation" : ""}`}
      >
        <Card style={getCardStyle()} variant={true} size="small" extra={cardExtra} title={cardTitle}>
-          <div style={{ display: "inline-block", width: "70%", textAlign: "left" }}>{cardContentLeft}</div>
-          <div style={{ display: "inline-block", width: "30%", textAlign: "right" }}>{cardContentRight}</div>
+          <div
+            style={{
+              display: "inline-block",
+              width: "70%",
+              textAlign: "left"
+            }}
+          >
+            {cardContentLeft}
+          </div>
+          <div
+            style={{
+              display: "inline-block",
+              width: "30%",
+              textAlign: "right"
+            }}
+          >
+            {cardContentRight}
+          </div>
        </Card>
      </List.Item>
    );
@@ -140,7 +131,7 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
    <div className="chat-list-container">
      <Virtuoso
        data={sortedConversationList}
-        itemContent={(index) => renderConversation(index)}
+        itemContent={(index) => renderConversation(index, t)}
        style={{ height: "100%", width: "100%" }}
      />
    </div>
--- a/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx
+++ b/client/src/components/chat-conversation-title/chat-conversation-title.component.jsx
@@ -5,24 +5,24 @@ import ChatConversationTitleTags from "../chat-conversation-title-tags/chat-conv
 import ChatLabelComponent from "../chat-label/chat-label.component";
 import ChatPrintButton from "../chat-print-button/chat-print-button.component";
 import ChatTagRoContainer from "../chat-tag-ro/chat-tag-ro.container";
-import ChatMarkUnreadButton from "../chat-mark-unread-button/chat-mark-unread-button.component";
+import { createStructuredSelector } from "reselect";
+import { connect } from "react-redux";

-export function ChatConversationTitle({ conversation, onMarkUnread, markUnreadDisabled, markUnreadLoading }) {
+const mapStateToProps = createStructuredSelector({});
+
+const mapDispatchToProps = () => ({});
+
+export function ChatConversationTitle({ conversation }) {
  return (
    <Space className="chat-title" wrap>
      <PhoneNumberFormatter>{conversation?.phone_num}</PhoneNumberFormatter>
-
      <ChatLabelComponent conversation={conversation} />
      <ChatPrintButton conversation={conversation} />
-
      <ChatConversationTitleTags jobConversations={conversation?.job_conversations || []} />
      <ChatTagRoContainer conversation={conversation || []} />
-
-      <ChatMarkUnreadButton disabled={markUnreadDisabled} loading={markUnreadLoading} onMarkUnread={onMarkUnread} />
-
      <ChatArchiveButton conversation={conversation} />
    </Space>
  );
 }

-export default ChatConversationTitle;
+export default connect(mapStateToProps, mapDispatchToProps)(ChatConversationTitle);
--- a/client/src/components/chat-conversation/chat-conversation.component.jsx
+++ b/client/src/components/chat-conversation/chat-conversation.component.jsx
@@ -19,9 +19,7 @@ export function ChatConversationComponent({
  conversation,
  messages,
  handleMarkConversationAsRead,
-  handleMarkLastMessageAsUnread,
-  markingAsUnreadInProgress,
-  canMarkUnread
+  bodyshop
 }) {
  const [loading, error] = subState;

@@ -35,12 +33,7 @@ export function ChatConversationComponent({
      onMouseDown={handleMarkConversationAsRead}
      onKeyDown={handleMarkConversationAsRead}
    >
-      <ChatConversationTitle
-        conversation={conversation}
-        onMarkUnread={handleMarkLastMessageAsUnread}
-        markUnreadDisabled={!canMarkUnread}
-        markUnreadLoading={markingAsUnreadInProgress}
-      />
+      <ChatConversationTitle conversation={conversation} bodyshop={bodyshop} />
      <ChatMessageListComponent messages={messages} />
      <ChatSendMessage conversation={conversation} />
    </div>
--- a/client/src/components/chat-conversation/chat-conversation.container.jsx
+++ b/client/src/components/chat-conversation/chat-conversation.container.jsx
@@ -1,6 +1,6 @@
 import { gql, useApolloClient, useQuery, useSubscription } from "@apollo/client";
 import axios from "axios";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { CONVERSATION_SUBSCRIPTION_BY_PK, GET_CONVERSATION_DETAILS } from "../../graphql/conversations.queries";
@@ -18,8 +18,8 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
  const client = useApolloClient();
  const { socket } = useSocket();
  const [markingAsReadInProgress, setMarkingAsReadInProgress] = useState(false);
-  const [markingAsUnreadInProgress, setMarkingAsUnreadInProgress] = useState(false);

+  // Fetch conversation details
  const {
    loading: convoLoading,
    error: convoError,
@@ -27,23 +27,24 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
  } = useQuery(GET_CONVERSATION_DETAILS, {
    variables: { conversationId: selectedConversation },
    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only",
-    skip: !selectedConversation
+    nextFetchPolicy: "network-only"
  });

-  const conversation = convoData?.conversations_by_pk;
-
-  // Subscription for conversation updates (used when socket is NOT connected)
+  // Subscription for conversation updates
  useSubscription(CONVERSATION_SUBSCRIPTION_BY_PK, {
-    skip: socket?.connected || !selectedConversation,
+    skip: socket?.connected,
    variables: { conversationId: selectedConversation },
    onData: ({ data: subscriptionResult, client }) => {
+      // Extract the messages array from the result
      const messages = subscriptionResult?.data?.messages;
-      if (!messages || messages.length === 0) return;
+      if (!messages || messages.length === 0) {
+        console.warn("No messages found in subscription result.");
+        return;
+      }

      messages.forEach((message) => {
        const messageRef = client.cache.identify(message);
-
+        // Write the new message to the cache
        client.cache.writeFragment({
          id: messageRef,
          fragment: gql`
@@ -63,6 +64,7 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
          data: message
        });

+        // Update the conversation cache to include the new message
        client.cache.modify({
          id: client.cache.identify({ __typename: "conversations", id: selectedConversation }),
          fields: {
@@ -80,28 +82,6 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
    }
  });

-  /**
-   * Best-effort badge update:
-   * This assumes your list query uses messages_aggregate.aggregate.count as UNREAD inbound count.
-   * If it’s total messages, rename/create a dedicated unread aggregate in the list query and update that field instead.
-   */
-  const setConversationUnreadCountBestEffort = useCallback(
-    (conversationId, unreadCount) => {
-      if (!conversationId) return;
-
-      client.cache.modify({
-        id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-        fields: {
-          messages_aggregate(existing) {
-            if (!existing?.aggregate) return existing;
-            return { ...existing, aggregate: { ...existing.aggregate, count: unreadCount } };
-          }
-        }
-      });
-    },
-    [client.cache]
-  );
-
  const updateCacheWithReadMessages = useCallback(
    (conversationId, messageIds) => {
      if (!conversationId || !messageIds?.length) return;
@@ -109,34 +89,13 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
      messageIds.forEach((messageId) => {
        client.cache.modify({
          id: client.cache.identify({ __typename: "messages", id: messageId }),
-          fields: { read: () => true }
+          fields: {
+            read: () => true
+          }
        });
      });
-
-      setConversationUnreadCountBestEffort(conversationId, 0);
    },
-    [client.cache, setConversationUnreadCountBestEffort]
-  );
-
-  const applyUnreadStateWithMaxOneUnread = useCallback(
-    ({ conversationId, lastUnreadMessageId, messageIdsMarkedRead = [], unreadCount = 1 }) => {
-      if (!conversationId || !lastUnreadMessageId) return;
-
-      messageIdsMarkedRead.forEach((id) => {
-        client.cache.modify({
-          id: client.cache.identify({ __typename: "messages", id }),
-          fields: { read: () => true }
-        });
-      });
-
-      client.cache.modify({
-        id: client.cache.identify({ __typename: "messages", id: lastUnreadMessageId }),
-        fields: { read: () => false }
-      });
-
-      setConversationUnreadCountBestEffort(conversationId, unreadCount);
-    },
-    [client.cache, setConversationUnreadCountBestEffort]
+    [client.cache]
  );

  // WebSocket event handlers
@@ -144,25 +103,20 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
    if (!socket?.connected) return;

    const handleConversationChange = (data) => {
-      if (data?.type === "conversation-marked-read") {
-        updateCacheWithReadMessages(data.conversationId, data.messageIds);
-      }
-
-      if (data?.type === "conversation-marked-unread") {
-        applyUnreadStateWithMaxOneUnread({
-          conversationId: data.conversationId,
-          lastUnreadMessageId: data.lastUnreadMessageId,
-          messageIdsMarkedRead: data.messageIdsMarkedRead,
-          unreadCount: data.unreadCount
-        });
+      if (data.type === "conversation-marked-read") {
+        const { conversationId, messageIds } = data;
+        updateCacheWithReadMessages(conversationId, messageIds);
      }
    };

    socket.on("conversation-changed", handleConversationChange);
-    return () => socket.off("conversation-changed", handleConversationChange);
-  }, [socket, updateCacheWithReadMessages, applyUnreadStateWithMaxOneUnread]);

-  // Join/leave conversation via WebSocket
+    return () => {
+      socket.off("conversation-changed", handleConversationChange);
+    };
+  }, [socket, updateCacheWithReadMessages]);
+
+  // Join and leave conversation via WebSocket
  useEffect(() => {
    if (!socket?.connected || !selectedConversation || !bodyshop?.id) return;

@@ -179,21 +133,15 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
    };
  }, [socket, bodyshop, selectedConversation]);

-  const inboundNonSystemMessages = useMemo(() => {
-    const msgs = conversation?.messages || [];
-    return msgs
-      .filter((m) => m && !m.isoutbound && !m.is_system)
-      .slice()
-      .sort((a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime());
-  }, [conversation?.messages]);
-
-  const canMarkUnread = inboundNonSystemMessages.length > 0;
-
+  // Mark conversation as read
  const handleMarkConversationAsRead = async () => {
-    if (!conversation || markingAsReadInProgress) return;
+    if (!convoData || markingAsReadInProgress) return;
+
+    const conversation = convoData.conversations_by_pk;
+    if (!conversation) return;

    const unreadMessageIds = conversation.messages
-      ?.filter((message) => !message.read && !message.isoutbound && !message.is_system)
+      ?.filter((message) => !message.read && !message.isoutbound)
      .map((message) => message.id);

    if (unreadMessageIds?.length > 0) {
@@ -214,48 +162,12 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
    }
  };

-  const handleMarkLastMessageAsUnread = async () => {
-    if (!conversation || markingAsUnreadInProgress) return;
-    if (!bodyshop?.id || !bodyshop?.imexshopid) return;
-
-    const lastInbound = inboundNonSystemMessages[inboundNonSystemMessages.length - 1];
-    if (!lastInbound?.id) return;
-
-    setMarkingAsUnreadInProgress(true);
-    try {
-      const res = await axios.post("/sms/markLastMessageUnread", {
-        conversationId: conversation.id,
-        imexshopid: bodyshop.imexshopid,
-        bodyshopid: bodyshop.id
-      });
-
-      const payload = res?.data || {};
-      if (payload.lastUnreadMessageId) {
-        applyUnreadStateWithMaxOneUnread({
-          conversationId: conversation.id,
-          lastUnreadMessageId: payload.lastUnreadMessageId,
-          messageIdsMarkedRead: payload.messageIdsMarkedRead || [],
-          unreadCount: typeof payload.unreadCount === "number" ? payload.unreadCount : 1
-        });
-      } else {
-        setConversationUnreadCountBestEffort(conversation.id, 0);
-      }
-    } catch (error) {
-      console.error("Error marking last message unread:", error.message);
-    } finally {
-      setMarkingAsUnreadInProgress(false);
-    }
-  };
-
  return (
    <ChatConversationComponent
      subState={[convoLoading, convoError]}
-      conversation={conversation || {}}
-      messages={conversation?.messages || []}
+      conversation={convoData?.conversations_by_pk || {}}
+      messages={convoData?.conversations_by_pk?.messages || []}
      handleMarkConversationAsRead={handleMarkConversationAsRead}
-      handleMarkLastMessageAsUnread={handleMarkLastMessageAsUnread}
-      markingAsUnreadInProgress={markingAsUnreadInProgress}
-      canMarkUnread={canMarkUnread}
    />
  );
 }
--- a/client/src/components/chat-mark-unread-button/chat-mark-unread-button.component.jsx
+++ b/client/src/components/chat-mark-unread-button/chat-mark-unread-button.component.jsx
@@ -1,24 +0,0 @@
-import { Button, Tooltip } from "antd";
-import { useTranslation } from "react-i18next";
-
-export default function ChatMarkUnreadButton({ disabled, loading, onMarkUnread }) {
-  const { t } = useTranslation();
-
-  return (
-    <Tooltip title={t("messaging.labels.mark_unread")}>
-      <Button
-        size="small"
-        className="unread-button"
-        type="primary"
-        children={t("messaging.labels.mark_unread")}
-        loading={loading}
-        disabled={disabled}
-        onMouseDown={(e) => e.stopPropagation()} // prevent parent mark-read handler
-        onClick={(e) => {
-          e.stopPropagation();
-          onMarkUnread?.();
-        }}
-      />
-    </Tooltip>
-  );
-}
--- a/client/src/components/chat-messages-list/chat-message-list.styles.scss
+++ b/client/src/components/chat-messages-list/chat-message-list.styles.scss
@@ -10,11 +10,6 @@
  border-radius: 4px;
 }

-.unread-button {
-  height: 20px;
-  border-radius: 4px;
-}
-
 .chat-title {
  margin-bottom: 5px;
 }
--- a/client/src/components/chat-open-button/chat-open-button.component.jsx
+++ b/client/src/components/chat-open-button/chat-open-button.component.jsx
@@ -19,35 +19,30 @@ const mapDispatchToProps = (dispatch) => ({
  openChatByPhone: (phone) => dispatch(openChatByPhone(phone))
 });

-export function ChatOpenButton({ bodyshop, searchingForConversation, phone, type, jobid, openChatByPhone }) {
+export function ChatOpenButton({ bodyshop, searchingForConversation, phone, jobid, openChatByPhone }) {
  const { t } = useTranslation();
  const { socket } = useSocket();
  const notification = useNotification();

  if (!phone) return <></>;

-  if (!bodyshop.messagingservicesid) {
-    return <PhoneNumberFormatter type={type}>{phone}</PhoneNumberFormatter>;
-  }
+  if (!bodyshop.messagingservicesid) return <PhoneNumberFormatter>{phone}</PhoneNumberFormatter>;

  return (
    <a
      href="# "
      onClick={(e) => {
-        e.preventDefault();
        e.stopPropagation();
-
-        if (searchingForConversation) return; // Prevent finding the same thing twice.
-
        const p = parsePhoneNumber(phone, "CA");
+        if (searchingForConversation) return; //This is to prevent finding the same thing twice.
        if (p && p.isValid()) {
-          openChatByPhone({ phone_num: p.formatInternational(), jobid, socket });
+          openChatByPhone({ phone_num: p.formatInternational(), jobid: jobid, socket });
        } else {
          notification["error"]({ message: t("messaging.error.invalidphone") });
        }
      }}
    >
-      <PhoneNumberFormatter type={type}>{phone}</PhoneNumberFormatter>
+      <PhoneNumberFormatter>{phone}</PhoneNumberFormatter>
    </a>
  );
 }
--- a/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx
+++ b/client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx
@@ -133,9 +133,6 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
      ownr_ln: contract.job.owner.ownr_ln,
      ownr_co_nm: contract.job.owner.ownr_co_nm,
      ownr_ph1: contract.job.owner.ownr_ph1,
-      ownr_ph2: contract.job.owner.ownr_ph2,
-      ownr_ph1_ty: contract.job.owner.ownr_ph1_ty,
-      ownr_ph2_ty: contract.job.owner.ownr_ph2_ty,
      ownr_ea: contract.job.owner.ownr_ea,
      v_model_desc: contract.job.vehicle && contract.job.vehicle.v_model_desc,
      v_model_yr: contract.job.vehicle && contract.job.vehicle.v_model_yr,
@@ -256,10 +253,6 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
      }
    };

-    if (currentUser?.email) {
-      newJob.created_user_email = currentUser.email;
-    }
-
    //Calcualte the new job totals.

    const newTotals = (
--- a/client/src/components/dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx
+++ b/client/src/components/dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx
@@ -142,37 +142,17 @@ export default function JobLifecycleDashboardComponent({ data, bodyshop, ...card
            title={t("job_lifecycle.content.legend_title")}
            style={{ marginTop: "10px" }}
          >
-            <div
-              style={{
-                display: "flex",
-                flexWrap: "wrap",
-                gap: 8
-              }}
-            >
+            <div>
              {lifecycleData.summations.map((key) => (
-                <Tag
-                  key={key.status}
-                  color={key.color}
-                  style={{
-                    // IMPORTANT: let the tag grow with its content
-                    width: "auto",
-                    padding: 0,
-                    margin: 0,
-                    display: "inline-flex",
-                    alignItems: "center",
-                    justifyContent: "center",
-                    boxSizing: "border-box"
-                  }}
-                >
+                <Tag key={key.status} color={key.color} style={{ width: "13vh", padding: "4px", margin: "4px" }}>
                  <div
                    aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                    title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                    style={{
                      backgroundColor: "var(--tag-wrapper-bg)",
                      color: "var(--tag-wrapper-text)",
-                      padding: "4px 8px",
-                      textAlign: "center",
-                      whiteSpace: "nowrap" // keep it on one line while letting the pill expand
+                      padding: "4px",
+                      textAlign: "center"
                    }}
                  >
                    {key.status} [{lifecycleData.statusCounts[key.status]}] ({key.roundedPercentage})
--- a/client/src/components/dashboard-components/scheduled-delivery-today/scheduled-delivery-today.component.jsx
+++ b/client/src/components/dashboard-components/scheduled-delivery-today/scheduled-delivery-today.component.jsx
@@ -256,9 +256,9 @@ export default function DashboardScheduledDeliveryToday({ data, ...cardProps })
      responsive: ["md"],
      render: (text, record) => (
        <Space size="small" wrap>
-          <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.jobid} />
+          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />

-          <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.jobid} />
+          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
        </Space>
      )
    },
@@ -397,8 +397,6 @@ export const DashboardScheduledDeliveryTodayGql = `
      ownr_ln
      ownr_ph1
      ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
      production_vars
      ro_number
      scheduled_delivery
--- a/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx
+++ b/client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx
@@ -48,8 +48,6 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
        ownr_ln: item.job.ownr_ln,
        ownr_ph1: item.job.ownr_ph1,
        ownr_ph2: item.job.ownr_ph2,
-        ownr_ph1_ty: item.job.ownr_ph1_ty,
-        ownr_ph2_ty: item.job.ownr_ph2_ty,
        production_vars: item.job.production_vars,
        ro_number: item.job.ro_number,
        suspended: item.job.suspended,
@@ -266,8 +264,8 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
      responsive: ["md"],
      render: (text, record) => (
        <Space size="small" wrap>
-          <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.jobid} />
-          <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.jobid} />
+          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
+          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
        </Space>
      )
    },
@@ -402,8 +400,6 @@ export const DashboardScheduledInTodayGql = `
      ownr_ln
      ownr_ph1
      ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
      production_vars
      ro_number
      suspended
--- a/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx
+++ b/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx
@@ -256,9 +256,9 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
      responsive: ["md"],
      render: (text, record) => (
        <Space size="small" wrap>
-          <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.jobid} />
+          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />

-          <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.jobid} />
+          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
        </Space>
      )
    },
@@ -397,8 +397,6 @@ export const DashboardScheduledOutTodayGql = `
      ownr_ln
      ownr_ph1
      ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
      production_vars
      ro_number
      scheduled_completion
--- a/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx
+++ b/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx
@@ -7,6 +7,8 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import Dinero from "dinero.js";
 import { SyncOutlined } from "@ant-design/icons";
 import { pageLimit } from "../../utils/config";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
+import { useSocket } from "../../contexts/SocketIO/useSocket";

 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
@@ -22,13 +24,28 @@ export default connect(mapStateToProps, mapDispatchToProps)(DmsAllocationsSummar
 export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
  const { t } = useTranslation();
  const [allocationsSummary, setAllocationsSummary] = useState([]);
+  const {
+    treatments: { Fortellis }
+  } = useSplitTreatments({
+    attributes: {},
+    names: ["Fortellis"],
+    splitKey: bodyshop.imexshopid
+  });
+  const { socket: wsssocket } = useSocket();

  useEffect(() => {
-    if (socket.connected) {
-      socket.emit("cdk-calculate-allocations", jobId, (ack) => {
+    if (Fortellis.treatment === "on") {
+      wsssocket.emit("fortellis-calculate-allocations", jobId, (ack) => {
        setAllocationsSummary(ack);
        socket.allocationsSummary = ack;
      });
+    } else {
+      if (socket.connected) {
+        socket.emit("cdk-calculate-allocations", jobId, (ack) => {
+          setAllocationsSummary(ack);
+          socket.allocationsSummary = ack;
+        });
+      }
    }
  }, [socket, socket.connected, jobId]);

@@ -76,8 +93,12 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
      extra={
        <Button
          onClick={() => {
-            socket.emit("cdk-calculate-allocations", jobId, (ack) => setAllocationsSummary(ack));
-          }}
+            if (Fortellis.treatment === "on") {
+              socket.emit("fortellis-calculate-allocations", jobId, (ack) => setAllocationsSummary(ack));
+            } else {
+              socket.emit("cdk-calculate-allocations", jobId, (ack) => setAllocationsSummary(ack));
+            }
+          }} 
        >
          <SyncOutlined />
        </Button>
--- a/client/src/components/dms-cdk-makes/dms-cdk-makes.refetch.component.jsx
+++ b/client/src/components/dms-cdk-makes/dms-cdk-makes.refetch.component.jsx
@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";

 const mapStateToProps = createStructuredSelector({
  currentUser: selectCurrentUser,
@@ -18,15 +19,26 @@ export default connect(mapStateToProps, mapDispatchToProps)(DmsCdkMakesRefetch);
 export function DmsCdkMakesRefetch({ currentUser, bodyshop }) {
  const [loading, setLoading] = useState(false);
  const { t } = useTranslation();
+  const {
+    treatments: { Fortellis }
+  } = useSplitTreatments({
+    attributes: {},
+    names: ["Fortellis"],
+    splitKey: bodyshop.imexshopid
+  });

  if (!currentUser.email.includes("@imex.")) return null;

  const handleRefetch = async () => {
-    setLoading(true);
-    await axios.post("/cdk/getvehicles", {
-      cdk_dealerid: bodyshop.cdk_dealerid,
-      bodyshopid: bodyshop.id
-    });
+    try {
+      setLoading(true);
+      await axios.post(`cdk${Fortellis.treatment === "on" ? "/fortellis" : ""}/getvehicles`, {
+        cdk_dealerid: bodyshop.cdk_dealerid,
+        bodyshopid: bodyshop.id
+      });
+    } catch (error) {
+      console.error(error);
+    }

    setLoading(false);
  };
--- a/client/src/components/dms-customer-selector/dms-customer-selector.component.jsx
+++ b/client/src/components/dms-customer-selector/dms-customer-selector.component.jsx
@@ -1,8 +1,10 @@
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Button, Checkbox, Col, Table } from "antd";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { useSocket } from "../../contexts/SocketIO/useSocket";
 import { socket } from "../../pages/dms/dms.container";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { alphaSort } from "../../utils/sorters";
@@ -15,42 +17,125 @@ const mapDispatchToProps = () => ({
 });
 export default connect(mapStateToProps, mapDispatchToProps)(DmsCustomerSelector);

-export function DmsCustomerSelector({ bodyshop }) {
+export function DmsCustomerSelector({ bodyshop, jobid }) {
  const { t } = useTranslation();
  const [customerList, setcustomerList] = useState([]);
  const [open, setOpen] = useState(false);
  const [selectedCustomer, setSelectedCustomer] = useState(null);
  const [dmsType, setDmsType] = useState("cdk");

-  socket.on("cdk-select-customer", (customerList) => {
-    setOpen(true);
-    setDmsType("cdk");
-    setcustomerList(customerList);
-  });
-  socket.on("pbs-select-customer", (customerList) => {
-    setOpen(true);
-    setDmsType("pbs");
-    setcustomerList(customerList);
+  const {
+    treatments: { Fortellis }
+  } = useSplitTreatments({
+    attributes: {},
+    names: ["Fortellis"],
+    splitKey: bodyshop.imexshopid
  });

+  const { socket: wsssocket } = useSocket();
+
+  useEffect(() => {
+    if (Fortellis.treatment === "on") {
+      const handleFortellisSelectCustomer = (customerList) => {
+        setOpen(true);
+        setDmsType("cdk");
+        setcustomerList(customerList);
+      };
+      wsssocket.on("fortellis-select-customer", handleFortellisSelectCustomer);
+      return () => {
+        wsssocket.off("fortellis-select-customer", handleFortellisSelectCustomer);
+      };
+    } else {
+      const handleCdkSelectCustomer = (customerList) => {
+        setOpen(true);
+        setDmsType("cdk");
+        setcustomerList(customerList);
+      };
+      const handlePbsSelectCustomer = (customerList) => {
+        setOpen(true);
+        setDmsType("pbs");
+        setcustomerList(customerList);
+      };
+      socket.on("cdk-select-customer", handleCdkSelectCustomer);
+      socket.on("pbs-select-customer", handlePbsSelectCustomer);
+      return () => {
+        socket.off("cdk-select-customer", handleCdkSelectCustomer);
+        socket.off("pbs-select-customer", handlePbsSelectCustomer);
+      };
+    }
+  }, []);
+
  const onUseSelected = () => {
    setOpen(false);
-    socket.emit(`${dmsType}-selected-customer`, selectedCustomer);
+    if (Fortellis.treatment === "on") {
+      wsssocket.emit(`fortellis-selected-customer`, { selectedCustomerId: selectedCustomer, jobid });
+    } else {
+      socket.emit(`${dmsType}-selected-customer`, selectedCustomer);
+    }
    setSelectedCustomer(null);
  };

  const onUseGeneric = () => {
    setOpen(false);
-    socket.emit(`${dmsType}-selected-customer`, bodyshop.cdk_configuration.generic_customer_number);
+
+    if (Fortellis.treatment === "on") {
+      wsssocket.emit(`fortellis-selected-customer`, {
+        selectedCustomerId: bodyshop.cdk_configuration.generic_customer_number,
+        jobid
+      });
+    } else {
+      socket.emit(`${dmsType}-selected-customer`, bodyshop.cdk_configuration.generic_customer_number);
+    }
    setSelectedCustomer(null);
  };

  const onCreateNew = () => {
    setOpen(false);
-    socket.emit(`${dmsType}-selected-customer`, null);
+
+    if (Fortellis.treatment === "on") {
+      wsssocket.emit(`fortellis-selected-customer`, { selectedCustomerId: null, jobid });
+    } else {
+      socket.emit(`${dmsType}-selected-customer`, null);
+    }
    setSelectedCustomer(null);
  };

+  const fortellisColumns = [
+    {
+      title: t("jobs.fields.dms.id"),
+      dataIndex: "customerId",
+      key: "id"
+    },
+    {
+      title: t("jobs.fields.dms.vinowner"),
+      dataIndex: "vinOwner",
+      key: "vinOwner",
+      render: (text, record) => <Checkbox disabled checked={record.vinOwner} />
+    },
+    {
+      title: t("jobs.fields.dms.name1"),
+      dataIndex: ["customerName", "firstName"],
+      key: "firstName",
+      sorter: (a, b) => alphaSort(a.customerName?.firstName, b.customerName?.firstName)
+    },
+    {
+      title: t("jobs.fields.dms.name1"),
+      dataIndex: ["customerName", "lastName"],
+      key: "lastName",
+      sorter: (a, b) => alphaSort(a.customerName?.lastName, b.customerName?.lastName)
+    },
+    {
+      title: t("jobs.fields.dms.address"),
+
+      key: "address",
+      render: (record) =>
+        `${record.postalAddress?.addressLine1} ${record.postalAddress?.addressLine2 ? `, ${record.postalAddress?.addressLine2}` : ""},
+        ${record.postalAddress?.city} ${record.postalAddress?.state} ${record.postalAddress?.postalCode} ${
+          record.postalAddress?.country
+        }`
+    }
+  ];
+
  const cdkColumns = [
    {
      title: t("jobs.fields.dms.id"),
@@ -117,13 +202,13 @@ export function DmsCustomerSelector({ bodyshop }) {
          </div>
        )}
        pagination={{ position: "top" }}
-        columns={dmsType === "cdk" ? cdkColumns : pbsColumns}
-        rowKey={(record) => (dmsType === "cdk" ? record.id.value : record.ContactId)}
+        columns={dmsType === "cdk" ? (Fortellis.treatment === "on" ? fortellisColumns : cdkColumns) : pbsColumns}
+        rowKey={(record) => (dmsType === "cdk" ? record.id?.value || record.customerId : record.ContactId)}
        dataSource={customerList}
        //onChange={handleTableChange}
        rowSelection={{
          onSelect: (record) => {
-            setSelectedCustomer(dmsType === "cdk" ? record.id.value : record.ContactId);
+            setSelectedCustomer(dmsType === "cdk" ? record.id?.value || record.customerId : record.ContactId);
          },
          type: "radio",
          selectedRowKeys: [selectedCustomer]
--- a/client/src/components/dms-post-form/dms-post-form.component.jsx
+++ b/client/src/components/dms-post-form/dms-post-form.component.jsx
@@ -26,6 +26,8 @@ import DmsCdkMakesRefetch from "../dms-cdk-makes/dms-cdk-makes.refetch.component
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import { useSocket } from "../../contexts/SocketIO/useSocket";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -36,8 +38,17 @@ const mapDispatchToProps = () => ({
 export default connect(mapStateToProps, mapDispatchToProps)(DmsPostForm);

 export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
+  const {
+    treatments: { Fortellis }
+  } = useSplitTreatments({
+    attributes: {},
+    names: ["Fortellis"],
+    splitKey: bodyshop.imexshopid
+  });
+
  const [form] = Form.useForm();
  const { t } = useTranslation();
+  const { socket: wsssocket } = useSocket();

  const handlePayerSelect = (value, index) => {
    form.setFieldsValue({
@@ -58,13 +69,22 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
  };

  const handleFinish = (values) => {
-    socket.emit(`${determineDmsType(bodyshop)}-export-job`, {
-      jobid: job.id,
-      txEnvelope: values
-    });
-    console.log(logsRef);
+    if (Fortellis.treatment === "on") {
+      wsssocket.emit("fortellis-export-job", {
+        jobid: job.id,
+        txEnvelope: {
+          ...values,
+          SubscriptionID: bodyshop.cdk_dealerid
+        }
+      });
+    } else {
+      socket.emit(`${determineDmsType(bodyshop)}-export-job`, {
+        jobid: job.id,
+        txEnvelope: values
+      });
+    }
+
    if (logsRef) {
-      console.log("executing", logsRef);
      logsRef.curent &&
        logsRef.current.scrollIntoView({
          behavior: "smooth"
@@ -169,7 +189,7 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
              </Form.Item>
            </LayoutFormRow>
            <Space>
-              <DmsCdkMakes form={form} socket={socket} job={job} />
+              <DmsCdkMakes form={form} job={job} />
              <DmsCdkMakesRefetch />
              <Form.Item name="dms_unsold" label={t("jobs.fields.dms.dms_unsold")} initialValue={false}>
                <Switch />
--- a/client/src/components/document-editor/document-editor-local.component.jsx
+++ b/client/src/components/document-editor/document-editor-local.component.jsx
@@ -1,166 +0,0 @@
-import axios from "axios";
-import { Result } from "antd";
-import * as markerjs2 from "markerjs2";
-import { useCallback, useEffect, useRef, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
-import { handleUpload } from "../documents-local-upload/documents-local-upload.utility";
-import LoadingSpinner from "../loading-spinner/loading-spinner.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-
-const mapStateToProps = createStructuredSelector({
-  currentUser: selectCurrentUser,
-  bodyshop: selectBodyshop
-});
-const mapDispatchToProps = () => ({});
-
-export function DocumentEditorLocalComponent({ imageUrl, filename, jobid }) {
-  const imgRef = useRef(null);
-  const [loading, setLoading] = useState(false);
-  const [uploaded, setuploaded] = useState(false);
-  const [loadedImageUrl, setLoadedImageUrl] = useState(null);
-  const [imageLoaded, setImageLoaded] = useState(false);
-  const [imageLoading, setImageLoading] = useState(true);
-  const markerArea = useRef(null);
-  const { t } = useTranslation();
-  const notification = useNotification();
-  const [uploading, setUploading] = useState(false);
-
-  const triggerUpload = useCallback(
-    async (dataUrl) => {
-      if (uploading) return;
-      setUploading(true);
-      const blob = await b64toBlob(dataUrl);
-      const nameWithoutExt = filename.split(".").slice(0, -1).join(".").trim();
-      const parts = nameWithoutExt.split("-");
-      const baseParts = [];
-      for (let i = 0; i < parts.length; i++) {
-        if (/^\d+$/.test(parts[i])) {
-          break;
-        }
-        baseParts.push(parts[i]);
-      }
-      const adjustedBase = baseParts.length > 0 ? baseParts.join("-") : "edited";
-      const adjustedFilename = `${adjustedBase}.jpg`;
-      const file = new File([blob], adjustedFilename, { type: "image/jpeg" });
-
-      handleUpload({
-        ev: {
-          file: file,
-          filename: adjustedFilename,
-          onSuccess: () => {
-            setUploading(false);
-            setLoading(false);
-            setuploaded(true);
-          },
-          onError: () => {
-            setUploading(false);
-            setLoading(false);
-          }
-        },
-        context: {
-          jobid: jobid,
-          callback: () => {} // Optional callback
-        },
-        notification
-      });
-    },
-    [filename, jobid, notification, uploading]
-  );
-
-  useEffect(() => {
-    if (imgRef.current !== null && imageLoaded && !markerArea.current) {
-      // create a marker.js MarkerArea
-      markerArea.current = new markerjs2.MarkerArea(imgRef.current);
-
-      // attach an event handler to assign annotated image back to our image element
-      markerArea.current.addEventListener("close", () => {
-        // NO OP
-      });
-
-      markerArea.current.addEventListener("render", (event) => {
-        const dataUrl = event.dataUrl;
-        imgRef.current.src = dataUrl;
-        markerArea.current.close();
-        triggerUpload(dataUrl);
-      });
-      // launch marker.js
-
-      markerArea.current.renderAtNaturalSize = true;
-      markerArea.current.renderImageType = "image/jpeg";
-      markerArea.current.renderImageQuality = 1;
-      //markerArea.current.settings.displayMode = "inline";
-      markerArea.current.show();
-    }
-  }, [triggerUpload, imageLoaded]);
-
-  useEffect(() => {
-    if (!imageUrl) return;
-    const controller = new AbortController();
-
-    const loadImage = async () => {
-      setImageLoaded(false);
-      setImageLoading(true);
-      try {
-        const response = await axios.get(imageUrl, { responseType: "blob", signal: controller.signal });
-        const blobUrl = URL.createObjectURL(response.data);
-        setLoadedImageUrl((prevUrl) => {
-          if (prevUrl) URL.revokeObjectURL(prevUrl);
-          return blobUrl;
-        });
-      } catch (error) {
-        if (axios.isCancel?.(error) || error.name === "CanceledError") {
-          // request was aborted — safe to ignore
-          return;
-        }
-        console.error("Failed to fetch image blob", error);
-      } finally {
-        if (!controller.signal.aborted) {
-          setImageLoading(false);
-        }
-      }
-    };
-    loadImage();
-    return () => {
-      controller.abort();
-    };
-  }, [imageUrl]);
-
-  useEffect(() => {
-    return () => {
-      if (loadedImageUrl) {
-        URL.revokeObjectURL(loadedImageUrl);
-      }
-    };
-  }, [loadedImageUrl]);
-
-  async function b64toBlob(url) {
-    const res = await fetch(url);
-    return await res.blob();
-  }
-
-  return (
-    <div>
-      {!loading && !uploaded && loadedImageUrl && (
-        <img
-          ref={imgRef}
-          src={loadedImageUrl}
-          alt="sample"
-          onLoad={() => setImageLoaded(true)}
-          onError={(error) => {
-            console.error("Failed to load image", error);
-          }}
-          style={{ maxWidth: "90vw", maxHeight: "90vh" }}
-        />
-      )}
-      {(loading || imageLoading || !imageLoaded) && !uploaded && (
-        <LoadingSpinner message={t("documents.labels.uploading")} />
-      )}
-      {uploaded && <Result status="success" title={t("documents.successes.edituploaded")} />}
-    </div>
-  );
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(DocumentEditorLocalComponent);
--- a/client/src/components/document-editor/document-editor.component.jsx
+++ b/client/src/components/document-editor/document-editor.component.jsx
@@ -1,5 +1,4 @@
 //import "tui-image-editor/dist/tui-image-editor.css";
-import axios from "axios";
 import { Result } from "antd";
 import * as markerjs2 from "markerjs2";
 import { useCallback, useEffect, useRef, useState } from "react";
@@ -7,7 +6,8 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
-import { handleUpload } from "../documents-upload-imgproxy/documents-upload-imgproxy.utility.js";
+import { handleUpload } from "../documents-upload/documents-upload.utility";
+import { GenerateSrcUrl } from "../jobs-documents-gallery/job-documents.utility";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";

@@ -23,9 +23,6 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
  const imgRef = useRef(null);
  const [loading, setLoading] = useState(false);
  const [uploaded, setuploaded] = useState(false);
-  const [imageUrl, setImageUrl] = useState(null);
-  const [imageLoaded, setImageLoaded] = useState(false);
-  const [imageLoading, setImageLoading] = useState(true);
  const markerArea = useRef(null);
  const { t } = useTranslation();
  const notification = useNotification();
@@ -58,7 +55,7 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
  );

  useEffect(() => {
-    if (imgRef.current !== null && imageLoaded && !markerArea.current) {
+    if (imgRef.current !== null) {
      // create a marker.js MarkerArea
      markerArea.current = new markerjs2.MarkerArea(imgRef.current);

@@ -81,52 +78,7 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
      //markerArea.current.settings.displayMode = "inline";
      markerArea.current.show();
    }
-  }, [triggerUpload, imageLoaded]);
-
-  useEffect(() => {
-    if (!document?.id) return;
-    const controller = new AbortController();
-
-    const loadImage = async () => {
-      setImageLoaded(false);
-      setImageLoading(true);
-      try {
-        const response = await axios.post(
-          "/media/imgproxy/original",
-          { documentId: document.id },
-          {
-            responseType: "blob",
-            signal: controller.signal
-          }
-        );
-        const blobUrl = URL.createObjectURL(response.data);
-        setImageUrl((prevUrl) => {
-          if (prevUrl) URL.revokeObjectURL(prevUrl);
-          return blobUrl;
-        });
-      } catch (error) {
-        if (axios.isCancel?.(error) || error.name === "CanceledError") {
-          // request was aborted — safe to ignore
-          return;
-        }
-        console.error("Failed to fetch original image blob", error);
-      } finally {
-        setImageLoading(false);
-      }
-    };
-    loadImage();
-    return () => {
-      controller.abort();
-    };
-  }, [document]);
-
-  useEffect(() => {
-    return () => {
-      if (imageUrl) {
-        URL.revokeObjectURL(imageUrl);
-      }
-    };
-  }, [imageUrl]);
+  }, [triggerUpload]);

  async function b64toBlob(url) {
    const res = await fetch(url);
@@ -135,21 +87,16 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {

  return (
    <div>
-      {!loading && !uploaded && imageUrl && (
+      {!loading && !uploaded && (
        <img
          ref={imgRef}
-          src={imageUrl}
+          src={GenerateSrcUrl(document)}
          alt="sample"
-          onLoad={() => setImageLoaded(true)}
-          onError={(error) => {
-            console.error("Failed to load original image", error);
-          }}
+          crossOrigin="anonymous"
          style={{ maxWidth: "90vw", maxHeight: "90vh" }}
        />
      )}
-      {(loading || imageLoading || !imageLoaded) && !uploaded && (
-        <LoadingSpinner message={t("documents.labels.uploading")} />
-      )}
+      {loading && <LoadingSpinner message={t("documents.labels.uploading")} />}
      {uploaded && <Result status="success" title={t("documents.successes.edituploaded")} />}
    </div>
  );
--- a/client/src/components/document-editor/document-editor.container.jsx
+++ b/client/src/components/document-editor/document-editor.container.jsx
@@ -11,7 +11,6 @@ import { setBodyshop } from "../../redux/user/user.actions";
 import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import DocumentEditor from "./document-editor.component";
-import { DocumentEditorLocalComponent } from "./document-editor-local.component";

 const mapDispatchToProps = (dispatch) => ({
  setBodyshop: (bs) => dispatch(setBodyshop(bs))
@@ -22,7 +21,7 @@ export default connect(null, mapDispatchToProps)(DocumentEditorContainer);
 export function DocumentEditorContainer({ setBodyshop }) {
  //Get the image details for the image to be saved.
  //Get the document id from the search string.
-  const { documentId, imageUrl, filename, jobid } = queryString.parse(useLocation().search);
+  const { documentId } = queryString.parse(useLocation().search);
  const { t } = useTranslation();
  const {
    loading: loadingShop,
@@ -33,45 +32,24 @@ export function DocumentEditorContainer({ setBodyshop }) {
    nextFetchPolicy: "network-only"
  });

-  const isLocalMedia = !!dataShop?.bodyshops?.[0]?.uselocalmediaserver;
-
-  const {
-    loading: loadingDoc,
-    error: errorDoc,
-    data: dataDoc
-  } = useQuery(GET_DOCUMENT_BY_PK, {
-    variables: { documentId },
-    skip: !documentId || isLocalMedia,
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only"
-  });
-
  useEffect(() => {
    if (dataShop) setBodyshop(dataShop.bodyshops[0]);
  }, [dataShop, setBodyshop]);

-  if (loadingShop) return <LoadingSpinner />;
-  if (errorShop) return <AlertComponent message={errorShop.message} type="error" />;
+  const { loading, error, data } = useQuery(GET_DOCUMENT_BY_PK, {
+    variables: { documentId },
+    skip: !documentId,
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only"
+  });

-  if (isLocalMedia) {
-    if (imageUrl && filename && jobid) {
-      return (
-        <div>
-          <DocumentEditorLocalComponent imageUrl={imageUrl} filename={filename} jobid={jobid} />
-        </div>
-      );
-    } else {
-      return <Result status="404" title={t("general.errors.notfound")} />;
-    }
-  }
+  if (loading || loadingShop) return <LoadingSpinner />;
+  if (error || errorShop) return <AlertComponent message={error.message || errorShop.message} type="error" />;

-  if (loadingDoc) return <LoadingSpinner />;
-  if (errorDoc) return <AlertComponent message={errorDoc.message} type="error" />;
-
-  if (!dataDoc || !dataDoc.documents_by_pk) return <Result status="404" title={t("general.errors.notfound")} />;
+  if (!data || !data.documents_by_pk) return <Result status="404" title={t("general.errors.notfound")} />;
  return (
    <div>
-      <DocumentEditor document={dataDoc ? dataDoc.documents_by_pk : null} />
+      <DocumentEditor document={data ? data.documents_by_pk : null} />
    </div>
  );
 }
--- a/client/src/components/eula/eula.component.jsx
+++ b/client/src/components/eula/eula.component.jsx
@@ -55,8 +55,7 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
    const useremail = currentUser.email;

    try {
-      // eslint-disable-next-line no-unused-vars
-      const { accepted_terms, ...otherFormValues } = formValues;
+      const { ...otherFormValues } = formValues;

      // Trim the values of the fields before submitting
      const trimmedFormValues = Object.entries(otherFormValues).reduce((acc, [key, value]) => {
--- a/client/src/components/global-search/global-search-os.component.jsx
+++ b/client/src/components/global-search/global-search-os.component.jsx
@@ -73,8 +73,8 @@ export default function GlobalSearchOs() {
                      <span>
                        <OwnerNameDisplay ownerObject={owner} />
                      </span>
-                      <PhoneNumberFormatter type={owner?.ownr_ph1_ty}>{owner.ownr_ph1}</PhoneNumberFormatter>
-                      <PhoneNumberFormatter type={owner?.ownr_ph2_ty}>{owner.ownr_ph2}</PhoneNumberFormatter>
+                      <PhoneNumberFormatter>{owner.ownr_ph1}</PhoneNumberFormatter>
+                      <PhoneNumberFormatter>{owner.ownr_ph2}</PhoneNumberFormatter>
                    </Space>
                  </Link>
                )
--- a/client/src/components/global-search/global-search.component.jsx
+++ b/client/src/components/global-search/global-search.component.jsx
@@ -63,8 +63,8 @@ export default function GlobalSearch() {
                    <span>
                      <OwnerNameDisplay ownerObject={owner} />
                    </span>
-                    <PhoneNumberFormatter type={owner.ownr_ph1_ty}>{owner.ownr_ph1}</PhoneNumberFormatter>
-                    <PhoneNumberFormatter type={owner.ownr_ph2_ty}>{owner.ownr_ph2}</PhoneNumberFormatter>
+                    <PhoneNumberFormatter>{owner.ownr_ph1}</PhoneNumberFormatter>
+                    <PhoneNumberFormatter>{owner.ownr_ph2}</PhoneNumberFormatter>
                  </Space>
                </Link>
              )
--- a/client/src/components/job-at-change/schedule-event.component.jsx
+++ b/client/src/components/job-at-change/schedule-event.component.jsx
@@ -220,10 +220,10 @@ export function ScheduleEventComponent({
          </DataLabel>
          <DataLabel label={t("jobs.fields.ownr_ea")}>{(event.job && event.job.ownr_ea) || ""}</DataLabel>
          <DataLabel label={t("jobs.fields.ownr_ph1")}>
-            <ChatOpenButton phone={event?.job?.ownr_ph1} type={event?.job?.ownr_ph1_ty} jobid={event.job.id} />
+            <ChatOpenButton phone={event.job && event.job.ownr_ph1} jobid={event.job.id} />
          </DataLabel>
          <DataLabel label={t("jobs.fields.ownr_ph2")}>
-            <ChatOpenButton phone={event?.job?.ownr_ph2} type={event?.job?.ownr_ph2_ty} jobid={event.job.id} />
+            <ChatOpenButton phone={event.job && event.job.ownr_ph2} jobid={event.job.id} />
          </DataLabel>
          <DataLabel hideIfNull label={t("jobs.fields.loss_of_use")}>
            {(event.job && event.job.loss_of_use) || ""}
--- a/client/src/components/job-create-iou/job-create-iou.component.jsx
+++ b/client/src/components/job-create-iou/job-create-iou.component.jsx
@@ -43,18 +43,16 @@ export function JobCreateIOU({ bodyshop, currentUser, job, selectedJobLines, tec
  const handleCreateIou = async () => {
    setLoading(true);
    //Query all of the job details to recreate.
-    const iouId = await CreateIouForJob({
-      apolloClient: client,
-      jobLinesToKeep: selectedJobLines,
-      jobId: job.id,
-      config: {
+    const iouId = await CreateIouForJob(
+      client,
+      job.id,
+      {
        status: bodyshop.md_ro_statuses.default_open,
        bodyshopid: bodyshop.id,
        useremail: currentUser.email
      },
-      currentUser
-    });
-
+      selectedJobLines
+    );
    notification.open({
      type: "success",
      message: t("jobs.successes.ioucreated"),
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -9,10 +9,10 @@ import {
  WarningFilled
 } from "@ant-design/icons";
 import { PageHeader } from "@ant-design/pro-layout";
-import { gql, useMutation } from "@apollo/client";
-import { Button, Dropdown, Input, Modal, Select, Space, Table, Tag, Typography } from "antd";
+import { useMutation } from "@apollo/client";
+import { Button, Dropdown, Input, Space, Table, Tag } from "antd";
 import axios from "axios";
-import { useMemo, useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -47,19 +47,6 @@ import JobLinesExpander from "./job-lines-expander.component";
 import JobLinesPartPriceChange from "./job-lines-part-price-change.component";
 import JobLinesExpanderSimple from "./jobs-lines-expander-simple.component";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-
-const UPDATE_JOB_LINES_LOCATION_BULK = gql`
-  mutation UPDATE_JOB_LINES_LOCATION_BULK($ids: [uuid!]!, $location: String!) {
-    update_joblines(where: { id: { _in: $ids } }, _set: { location: $location }) {
-      affected_rows
-      returning {
-        id
-        location
-      }
-    }
-  }
-`;

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -96,9 +83,6 @@ export function JobLinesComponent({
  isPartsEntry
 }) {
  const [deleteJobLine] = useMutation(DELETE_JOB_LINE_BY_PK);
-  const [bulkUpdateLocations] = useMutation(UPDATE_JOB_LINES_LOCATION_BULK);
-  const notification = useNotification();
-
  const {
    treatments: { Enhanced_Payroll }
  } = useSplitTreatments({
@@ -119,83 +103,9 @@ export function JobLinesComponent({
    }
  });

-  // Bulk location modal state
-  const [bulkLocationOpen, setBulkLocationOpen] = useState(false);
-  const [bulkLocation, setBulkLocation] = useState(null);
-  const [bulkLocationSaving, setBulkLocationSaving] = useState(false);
-
  const { t } = useTranslation();
  const jobIsPrivate = bodyshop.md_ins_cos.find((c) => c.name === job.ins_co_nm)?.private;

-  const selectedLineIds = useMemo(() => selectedLines.map((l) => l?.id).filter(Boolean), [selectedLines]);
-
-  const commonSelectedLocation = useMemo(() => {
-    const locs = selectedLines
-      .map((l) => (typeof l?.location === "string" ? l.location : ""))
-      .map((x) => x.trim())
-      .filter(Boolean);
-
-    if (locs.length === 0) return null;
-
-    const uniq = _.uniq(locs);
-    return uniq.length === 1 ? uniq[0] : null;
-  }, [selectedLines]);
-
-  const openBulkLocationModal = () => {
-    setBulkLocation(commonSelectedLocation);
-    setBulkLocationOpen(true);
-    logImEXEvent("joblines_bulk_location_open", { count: selectedLineIds.length });
-  };
-
-  const closeBulkLocationModal = () => {
-    setBulkLocationOpen(false);
-    setBulkLocation(null);
-  };
-
-  const saveBulkLocation = async () => {
-    if (selectedLineIds.length === 0) return;
-
-    setBulkLocationSaving(true);
-
-    try {
-      const locationToSave = (bulkLocation ?? "").toString();
-
-      const result = await bulkUpdateLocations({
-        variables: {
-          ids: selectedLineIds,
-          location: locationToSave
-        }
-      });
-
-      if (!result?.errors) {
-        // Keep UI selection consistent without waiting for refetch
-        setSelectedLines((prev) =>
-          prev.map((l) => (l && selectedLineIds.includes(l.id) ? { ...l, location: locationToSave } : l))
-        );
-
-        notification["success"]({ message: t("joblines.successes.saved") });
-
-        logImEXEvent("joblines_bulk_location_saved", {
-          count: selectedLineIds.length,
-          location: locationToSave
-        });
-
-        closeBulkLocationModal();
-        if (refetch) refetch();
-      } else {
-        notification["error"]({
-          message: t("joblines.errors.saving", { error: JSON.stringify(result.errors) })
-        });
-      }
-    } catch (error) {
-      notification["error"]({
-        message: t("joblines.errors.saving", { error: error?.message || String(error) })
-      });
-    } finally {
-      setBulkLocationSaving(false);
-    }
-  };
-
  const columns = [
    {
      title: "#",
@@ -261,16 +171,46 @@ export function JobLinesComponent({
            ? ["PAN", "PAC", "PAR", "PAL", "PAA", "PAM", "PAP", "PAS", "PASL", "PAG", "PAO"]
            : ["PAN", "PAC", "PAR", "PAL", "PAA", "PAM", "PAP", "PAS", "PASL", "PAG"]
        },
-        { text: t("joblines.fields.part_types.PAN"), value: ["PAN"] },
-        { text: t("joblines.fields.part_types.PAP"), value: ["PAP"] },
-        { text: t("joblines.fields.part_types.PAL"), value: ["PAL"] },
-        { text: t("joblines.fields.part_types.PAA"), value: ["PAA"] },
-        { text: t("joblines.fields.part_types.PAG"), value: ["PAG"] },
-        { text: t("joblines.fields.part_types.PAS"), value: ["PAS"] },
-        { text: t("joblines.fields.part_types.PASL"), value: ["PASL"] },
-        { text: t("joblines.fields.part_types.PAC"), value: ["PAC"] },
-        { text: t("joblines.fields.part_types.PAR"), value: ["PAR"] },
-        { text: t("joblines.fields.part_types.PAM"), value: ["PAM"] },
+        {
+          text: t("joblines.fields.part_types.PAN"),
+          value: ["PAN"]
+        },
+        {
+          text: t("joblines.fields.part_types.PAP"),
+          value: ["PAP"]
+        },
+        {
+          text: t("joblines.fields.part_types.PAL"),
+          value: ["PAL"]
+        },
+        {
+          text: t("joblines.fields.part_types.PAA"),
+          value: ["PAA"]
+        },
+        {
+          text: t("joblines.fields.part_types.PAG"),
+          value: ["PAG"]
+        },
+        {
+          text: t("joblines.fields.part_types.PAS"),
+          value: ["PAS"]
+        },
+        {
+          text: t("joblines.fields.part_types.PASL"),
+          value: ["PASL"]
+        },
+        {
+          text: t("joblines.fields.part_types.PAC"),
+          value: ["PAC"]
+        },
+        {
+          text: t("joblines.fields.part_types.PAR"),
+          value: ["PAR"]
+        },
+        {
+          text: t("joblines.fields.part_types.PAM"),
+          value: ["PAM"]
+        },
        ...(isPartsEntry
          ? [
              {
@@ -280,6 +220,7 @@ export function JobLinesComponent({
            ]
          : [])
      ],
+
      onFilter: (value, record) => value.includes(record.part_type),
      render: (text, record) => (record.part_type ? t(`joblines.fields.part_types.${record.part_type}`) : null)
    },
@@ -305,6 +246,7 @@ export function JobLinesComponent({
            title: t("joblines.fields.mod_lbr_ty"),
            dataIndex: "mod_lbr_ty",
            key: "mod_lbr_ty",
+
            sorter: (a, b) => alphaSort(a.mod_lbr_ty, b.mod_lbr_ty),
            sortOrder: state.sortedInfo.columnKey === "mod_lbr_ty" && state.sortedInfo.order,
            render: (text, record) => (record.mod_lbr_ty ? t(`joblines.fields.lbr_types.${record.mod_lbr_ty}`) : null)
@@ -313,6 +255,7 @@ export function JobLinesComponent({
            title: t("joblines.fields.mod_lb_hrs"),
            dataIndex: "mod_lb_hrs",
            key: "mod_lb_hrs",
+
            sorter: (a, b) => a.mod_lb_hrs - b.mod_lb_hrs,
            sortOrder: state.sortedInfo.columnKey === "mod_lb_hrs" && state.sortedInfo.order
          },
@@ -367,12 +310,18 @@ export function JobLinesComponent({
      sorter: (a, b) => alphaSort(a.status, b.status),
      sortOrder: state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
      filteredValue: state.filteredInfo.status || null,
+
      filters:
        (jobLines &&
          jobLines
            .map((l) => l.status)
            .filter(onlyUnique)
-            .map((s) => ({ text: s || t("dashboard.errors.status"), value: [s] }))) ||
+            .map((s) => {
+              return {
+                text: s || t("dashboard.errors.status"),
+                value: [s]
+              };
+            })) ||
        [],
      onFilter: (value, record) => value.includes(record.status),
      render: (text, record) => <JobLineStatusPopup jobline={record} disabled={jobRO} />
@@ -427,7 +376,9 @@ export function JobLinesComponent({
                          });
                        }
                      });
-                      await axios.post("/job/totalsssu", { id: job.id });
+                      await axios.post("/job/totalsssu", {
+                        id: job.id
+                      });
                      if (refetch) refetch();
                    }}
                  >
@@ -497,36 +448,6 @@ export function JobLinesComponent({
  return (
    <div>
      <PartsOrderModalContainer />
-
-      <Modal
-        open={bulkLocationOpen}
-        title={t("joblines.actions.updatelocation")}
-        onCancel={closeBulkLocationModal}
-        onOk={saveBulkLocation}
-        okButtonProps={{
-          disabled: jobRO || technician || selectedLineIds.length === 0,
-          loading: bulkLocationSaving
-        }}
-        destroyOnHidden
-      >
-        <Space direction="vertical" style={{ width: "100%" }}>
-          <Typography.Text type="secondary">
-            {t("general.labels.selected")}: {selectedLineIds.length}
-          </Typography.Text>
-
-          <Select
-            allowClear
-            placeholder={t("joblines.fields.location")}
-            value={bulkLocation}
-            style={{ width: "100%" }}
-            popupMatchSelectWidth={false}
-            onChange={(val) => setBulkLocation(val ?? null)}
-            options={(bodyshop?.md_parts_locations || []).map((loc) => ({ label: loc, value: loc }))}
-          />
-          <Typography.Text type="secondary">{t("joblines.labels.bulk_location_help")}</Typography.Text>
-        </Space>
-      </Modal>
-
      {!technician && (
        <PartsOrderDrawer
          job={job}
@@ -536,7 +457,6 @@ export function JobLinesComponent({
          setTaskUpsertContext={setTaskUpsertContext}
        />
      )}
-
      <PageHeader
        title={t("jobs.labels.estimatelines")}
        extra={
@@ -545,16 +465,6 @@ export function JobLinesComponent({
              <SyncOutlined />
            </Button>

-            {/* Bulk Update Location */}
-            <Button
-              id="job-lines-bulk-update-location-button"
-              disabled={jobRO || technician || selectedLineIds.length === 0}
-              onClick={openBulkLocationModal}
-            >
-              {t("joblines.actions.updatelocation")}
-              {selectedLineIds.length > 0 && ` (${selectedLineIds.length})`}
-            </Button>
-
            {job.special_coverage_policy && (
              <Tag color="tomato">
                <Space>
@@ -563,7 +473,6 @@ export function JobLinesComponent({
                </Space>
              </Tag>
            )}
-
            {!isPartsEntry && (
              <JobLineDispatchButton
                selectedLines={selectedLines}
@@ -572,11 +481,9 @@ export function JobLinesComponent({
                disabled={technician}
              />
            )}
-
            {Enhanced_Payroll.treatment === "on" && (
              <JobLineBulkAssignComponent selectedLines={selectedLines} setSelectedLines={setSelectedLines} job={job} />
            )}
-
            {!isPartsEntry && (
              <Button
                disabled={(job && !job.converted) || (selectedLines.length > 0 ? false : true) || jobRO || technician}
@@ -592,20 +499,27 @@ export function JobLinesComponent({
                        isinhouse: true,
                        date: dayjs(),
                        total: 0,
-                        billlines: selectedLines.map((p) => ({
-                          joblineid: p.id,
-                          actual_price: p.act_price,
-                          actual_cost: 0,
-                          line_desc: p.line_desc,
-                          line_remarks: p.line_remarks,
-                          part_type: p.part_type,
-                          quantity: p.quantity || 1,
-                          applicable_taxes: { local: false, state: false, federal: false }
-                        }))
+                        billlines: selectedLines.map((p) => {
+                          return {
+                            joblineid: p.id,
+                            actual_price: p.act_price,
+                            actual_cost: 0, //p.act_price,
+                            line_desc: p.line_desc,
+                            line_remarks: p.line_remarks,
+                            part_type: p.part_type,
+                            quantity: p.quantity || 1,
+                            applicable_taxes: {
+                              local: false,
+                              state: false,
+                              federal: false
+                            }
+                          };
+                        })
                      }
                    }
                  });

+                  //Clear out the selected lines. IO-785
                  setSelectedLines([]);
                }}
              >
@@ -614,7 +528,6 @@ export function JobLinesComponent({
                {selectedLines.length > 0 && ` (${selectedLines.length})`}
              </Button>
            )}
-
            <Button
              id="job-lines-order-parts-button"
              disabled={(job && !job.converted) || (selectedLines.length > 0 ? false : true) || jobRO || technician}
@@ -631,13 +544,13 @@ export function JobLinesComponent({
                  }
                });

+                //Clear out the selected lines. IO-785
                setSelectedLines([]);
              }}
            >
              {t("parts.actions.order")}
              {selectedLines.length > 0 && ` (${selectedLines.length})`}
            </Button>
-
            {!isPartsEntry && (
              <Button
                id="job-lines-filter-parts-only-button"
@@ -654,11 +567,9 @@ export function JobLinesComponent({
                <FilterFilled /> {t("jobs.actions.filterpartsonly")}
              </Button>
            )}
-
            <Dropdown menu={markMenu} trigger={["click"]}>
              <Button id="repair-data-mark-button">{t("jobs.actions.mark")}</Button>
            </Dropdown>
-
            {!isPartsEntry && (
              <Button
                disabled={jobRO || technician}
@@ -672,12 +583,9 @@ export function JobLinesComponent({
                {t("joblines.actions.new")}
              </Button>
            )}
-
            {!isPartsEntry &&
              InstanceRenderManager({ rome: <JobSendPartPriceChangeComponent job={job} disabled={technician} /> })}
-
            <JobCreateIOU job={job} selectedJobLines={selectedLines} />
-
            <Input.Search
              placeholder={t("general.labels.search")}
              onChange={(e) => {
@@ -688,7 +596,6 @@ export function JobLinesComponent({
          </Space>
        }
      />
-
      <Table
        columns={columns}
        rowKey="id"
@@ -696,7 +603,9 @@ export function JobLinesComponent({
        pagination={false}
        dataSource={jobLines}
        onChange={handleTableChange}
-        scroll={{ x: true }}
+        scroll={{
+          x: true
+        }}
        expandable={{
          expandedRowRender: (record) =>
            isPartsEntry ? (
@@ -705,6 +614,7 @@ export function JobLinesComponent({
              <JobLinesExpander jobline={record} jobid={job.id} />
            ),
          rowExpandable: () => true,
+          //expandRowByClick: true,
          expandIcon: ({ expanded, onExpand, record }) =>
            expanded ? (
              <MinusCircleTwoTone onClick={(e) => onExpand(record, e)} />
@@ -717,15 +627,17 @@ export function JobLinesComponent({
              />
            )
        }}
-        onRow={(record) => ({
-          onDoubleClick: () => {
-            logImEXEvent("joblines_double_click_select", {});
-            const notMatchingLines = selectedLines.filter((i) => i.id !== record.id);
-            notMatchingLines.length !== selectedLines.length
-              ? setSelectedLines(notMatchingLines)
-              : setSelectedLines([...selectedLines, record]);
-          }
-        })}
+        onRow={(record) => {
+          return {
+            onDoubleClick: () => {
+              logImEXEvent("joblines_double_click_select", {});
+              const notMatchingLines = selectedLines.filter((i) => i.id !== record.id);
+              notMatchingLines.length !== selectedLines.length
+                ? setSelectedLines(notMatchingLines)
+                : setSelectedLines([...selectedLines, record]);
+            } // double click row
+          };
+        }}
        rowSelection={{
          selectedRowKeys: selectedLines.map((item) => item && item.id),
          onSelectAll: (selected, selectedRows) => {
--- a/client/src/components/job-lifecycle/job-lifecycle.component.jsx
+++ b/client/src/components/job-lifecycle/job-lifecycle.component.jsx
@@ -222,37 +222,17 @@ export function JobLifecycleComponent({ bodyshop, job, statuses }) {
                </div>
              </BlurWrapperComponent>
              <Card type="inner" title={t("job_lifecycle.content.legend_title")} style={{ marginTop: "10px" }}>
-                <div
-                  style={{
-                    display: "flex",
-                    flexWrap: "wrap",
-                    gap: 8
-                  }}
-                >
+                <div>
                  {lifecycleData.durations.summations.map((key) => (
-                    <Tag
-                      key={key.status}
-                      color={key.color}
-                      style={{
-                        // let the tag grow with its content
-                        width: "auto",
-                        padding: 0,
-                        margin: 0,
-                        display: "inline-flex",
-                        alignItems: "center",
-                        justifyContent: "center",
-                        boxSizing: "border-box"
-                      }}
-                    >
+                    <Tag key={key.status} color={key.color} style={{ width: "13vh", padding: "4px", margin: "4px" }}>
                      <div
                        aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                        title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                        style={{
                          backgroundColor: "var(--tag-wrapper-bg)",
                          color: "var(--tag-wrapper-text)",
-                          padding: "4px 8px",
-                          textAlign: "center",
-                          whiteSpace: "nowrap" // single line; tag gets wider instead of text escaping
+                          padding: "4px",
+                          textAlign: "center"
                        }}
                      >
                        {key.status} (
--- a/client/src/components/job-line-location-popup/job-line-location-popup.component.jsx
+++ b/client/src/components/job-line-location-popup/job-line-location-popup.component.jsx
@@ -1,23 +1,25 @@
 import { useMutation } from "@apollo/client";
-import { Select, Space, Tag } from "antd";
-import { useEffect, useMemo, useState } from "react";
+import { Select, Space } from "antd";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";

 const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
  bodyshop: selectBodyshop
 });
-const mapDispatchToProps = () => ({});
-
-const CLEAR_VALUE = "__CLEAR_LOCATION__";
+const mapDispatchToProps = () => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});

 export function JobLineLocationPopup({ bodyshop, jobline, disabled }) {
  const [editing, setEditing] = useState(false);
-  const [saving, setSaving] = useState(false);
+  const [loading, setLoading] = useState(false);
  const [location, setLocation] = useState(jobline.location);
  const [updateJob] = useMutation(UPDATE_JOB_LINE);
  const { t } = useTranslation();
@@ -27,78 +29,55 @@ export function JobLineLocationPopup({ bodyshop, jobline, disabled }) {
    if (editing) setLocation(jobline.location);
  }, [editing, jobline.location]);

-  const options = useMemo(() => {
-    const locs = bodyshop?.md_parts_locations || [];
-    return [
-      { label: t("general.labels.none", "No location"), value: CLEAR_VALUE },
-      ...locs.map((loc) => ({ label: loc, value: loc }))
-    ];
-  }, [bodyshop?.md_parts_locations, t]);
+  const handleChange = (e) => {
+    setLocation(e);
+  };

-  const saveLocation = async (nextLocation) => {
-    setSaving(true);
+  const handleSave = async () => {
+    setLoading(true);
+    const result = await updateJob({
+      variables: { lineId: jobline.id, line: { location: location || "" } }
+    });

-    try {
-      const result = await updateJob({
-        variables: { lineId: jobline.id, line: { location: nextLocation || "" } }
-      });
-
-      if (!result.errors) {
-        notification["success"]({ message: t("joblines.successes.saved") });
-      } else {
-        notification["error"]({
-          message: t("joblines.errors.saving", {
-            error: JSON.stringify(result.errors)
-          })
-        });
-      }
-    } catch (error) {
+    if (!result.errors) {
+      notification["success"]({ message: t("joblines.successes.saved") });
+    } else {
      notification["error"]({
-        message: t("joblines.errors.saving", { error: error?.message || String(error) })
+        message: t("joblines.errors.saving", {
+          error: JSON.stringify(result.errors)
+        })
      });
-    } finally {
-      setSaving(false);
-      setEditing(false);
    }
+    setLoading(false);
+    setEditing(false);
  };

-  const handleChange = async (value) => {
-    const next = value === CLEAR_VALUE ? null : value;
-    setLocation(next);
-    await saveLocation(next);
-  };
-
-  if (editing) {
+  if (editing)
    return (
-      <div style={{ width: "100%", display: "flex", alignItems: "center" }}>
-        <Select
-          autoFocus
-          size="small"
-          value={location ?? undefined}
-          loading={saving}
-          disabled={saving}
-          style={{ flex: 1, minWidth: 0 }}
-          popupMatchSelectWidth={false}
-          getPopupContainer={(triggerNode) => triggerNode.parentNode}
-          onChange={handleChange}
-          onBlur={() => !saving && setEditing(false)}
-          options={options}
-        />
+      <div>
+        <LoadingSpinner loading={loading}>
+          <Select
+            autoFocus
+            allowClear
+            popupMatchSelectWidth={100}
+            value={location}
+            onClear={() => setLocation(null)}
+            onSelect={handleChange}
+            onBlur={handleSave}
+          >
+            {bodyshop.md_parts_locations.map((loc, idx) => (
+              <Select.Option key={idx} value={loc}>
+                {loc}
+              </Select.Option>
+            ))}
+          </Select>
+        </LoadingSpinner>
      </div>
    );
-  }
-
  return (
-    <div
-      style={{ width: "100%", minHeight: "2rem", cursor: disabled ? "default" : "pointer" }}
-      onClick={() => !disabled && setEditing(true)}
-    >
+    <div style={{ width: "100%", minHeight: "2rem", cursor: "pointer" }} onClick={() => !disabled && setEditing(true)}>
      <Space wrap>
-        {jobline.location ? (
-          <Tag>{jobline.location}</Tag>
-        ) : (
-          <span style={{ opacity: 0.6 }}>{t("general.labels.none")}</span>
-        )}
+        {jobline.location}
        {jobline.parts_dispatch_lines?.length > 0 && "-Disp"}
      </Space>
    </div>
--- a/client/src/components/job-parts-received/job-parts-received.component.jsx
+++ b/client/src/components/job-parts-received/job-parts-received.component.jsx
@@ -1,105 +0,0 @@
-import { useCallback, useMemo, useState } from "react";
-import PropTypes from "prop-types";
-import { Popover } from "antd";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
-import { useTranslation } from "react-i18next";
-
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-
-/**
- * Displays "Parts Received" summary (modeled after the Production Board List column),
- * and on click shows a popover with the Parts Status grid (existing JobPartsQueueCount UI).
- * @param bodyshop
- * @param parts
- * @param displayMode
- * @param popoverPlacement
- * @returns {JSX.Element}
- * @constructor
- */
-export function JobPartsReceived({ bodyshop, parts, displayMode = "full", popoverPlacement = "top" }) {
-  const [open, setOpen] = useState(false);
-  const { t } = useTranslation();
-
-  const summary = useMemo(() => {
-    const receivedStatus = bodyshop?.md_order_statuses?.default_received;
-
-    if (!Array.isArray(parts) || parts.length === 0 || !receivedStatus) {
-      return { total: 0, received: 0, percentLabel: t("general.labels.na") };
-    }
-
-    // Keep consistent with JobPartsQueueCount: exclude PAS / PASL from parts math
-    const { total, received } = parts.reduce(
-      (acc, val) => {
-        if (val?.part_type === "PAS" || val?.part_type === "PASL") return acc;
-        const count = Number(val?.count || 0);
-        acc.total += count;
-
-        if (val?.status === receivedStatus) {
-          acc.received += count;
-        }
-        return acc;
-      },
-      { total: 0, received: 0 }
-    );
-
-    const percentLabel = total > 0 ? `${Math.round((received / total) * 100)}%` : t("general.labels.na");
-    return { total, received, percentLabel };
-  }, [parts, bodyshop?.md_order_statuses?.default_received]);
-
-  const canOpen = summary.total > 0;
-
-  const handleOpenChange = useCallback(
-    (nextOpen) => {
-      if (!canOpen) return;
-      setOpen(nextOpen);
-    },
-    [canOpen]
-  );
-
-  const displayText =
-    displayMode === "compact" ? summary.percentLabel : `${summary.percentLabel} (${summary.received}/${summary.total})`;
-
-  // Prevent row/cell click handlers (table selection, drawer selection, etc.)
-  const stop = (e) => e.stopPropagation();
-
-  return (
-    <Popover
-      open={open}
-      onOpenChange={handleOpenChange}
-      trigger={["click"]}
-      placement={popoverPlacement}
-      content={
-        <div onClick={stop} style={{ minWidth: 260 }}>
-          <JobPartsQueueCount parts={parts} />
-        </div>
-      }
-    >
-      <div
-        onClick={stop}
-        style={{
-          width: "100%",
-          height: "19px",
-          cursor: canOpen ? "pointer" : "default",
-          userSelect: "none"
-        }}
-        title={canOpen ? t("production.labels.click_for_statuses") : undefined}
-      >
-        {displayText}
-      </div>
-    </Popover>
-  );
-}
-
-JobPartsReceived.propTypes = {
-  bodyshop: PropTypes.object,
-  parts: PropTypes.array,
-  displayMode: PropTypes.oneOf(["full", "compact"]),
-  popoverPlacement: PropTypes.string
-};
-
-export default connect(mapStateToProps)(JobPartsReceived);
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -154,10 +154,6 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
        : {})
    };

-    if (currentUser?.email) {
-      newJob.created_user_email = currentUser.email;
-    }
-
    if (selectedOwner) {
      newJob.ownerid = selectedOwner;
      delete newJob.owner;
--- a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
+++ b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx
@@ -1,4 +1,4 @@
-import { Form, Input, Select } from "antd";
+import { Form, Input } from "antd";
 import { useContext } from "react";
 import { useTranslation } from "react-i18next";
 import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
@@ -7,11 +7,6 @@ import FormItemPhone, { PhoneItemFormatterValidation } from "../form-items-forma
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";

 export default function JobsCreateOwnerInfoNewComponent() {
-  const PHONE_TYPE_OPTIONS = [
-    { label: t("owners.labels.home"), value: "Home" },
-    { label: t("owners.labels.work"), value: "Work" },
-    { label: t("owners.labels.cell"), value: "Cell" }
-  ];
  const [state] = useContext(JobCreateContext);

  const { t } = useTranslation();
@@ -110,56 +105,26 @@ export default function JobsCreateOwnerInfoNewComponent() {
          ]}
          name={["owner", "data", "ownr_ea"]}
        >
-          <FormItemEmail disabled={!state.owner.new} />
+          <FormItemEmail
+            //email={form.getFieldValue("ownr_ea")}
+            disabled={!state.owner.new}
+          />
        </Form.Item>
-
-        {/* Phone 1 + Type */}
-        <Form.Item label={t("owners.fields.ownr_ph1")} style={{ marginBottom: 0 }}>
-          <div style={{ display: "flex", alignItems: "center", gap: 8 }}>
-            <Form.Item
-              name={["owner", "data", "ownr_ph1"]}
-              noStyle
-              rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph1")]}
-            >
-              <FormItemPhone disabled={!state.owner.new} style={{ flex: 1, minWidth: 150 }} />
-            </Form.Item>
-
-            <Form.Item name={["owner", "data", "ownr_ph1_ty"]} noStyle>
-              <Select
-                disabled={!state.owner.new}
-                allowClear
-                placeholder="Type"
-                options={PHONE_TYPE_OPTIONS}
-                style={{ width: 110 }}
-              />
-            </Form.Item>
-          </div>
+        <Form.Item
+          label={t("owners.fields.ownr_ph1")}
+          name={["owner", "data", "ownr_ph1"]}
+          rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph1")]}
+        >
+          <FormItemPhone disabled={!state.owner.new} />
        </Form.Item>
-
-        {/* Phone 2 + Type */}
-        <Form.Item label={t("owners.fields.ownr_ph2")} style={{ marginBottom: 0 }}>
-          <div style={{ display: "flex", alignItems: "center", gap: 8 }}>
-            <Form.Item
-              name={["owner", "data", "ownr_ph2"]}
-              noStyle
-              rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph2")]}
-            >
-              <FormItemPhone disabled={!state.owner.new} style={{ flex: 1, minWidth: 150 }} />
-            </Form.Item>
-
-            <Form.Item name={["owner", "data", "ownr_ph2_ty"]} noStyle>
-              <Select
-                disabled={!state.owner.new}
-                allowClear
-                placeholder="Type"
-                options={PHONE_TYPE_OPTIONS}
-                style={{ width: 110 }}
-              />
-            </Form.Item>
-          </div>
+        <Form.Item
+          label={t("owners.fields.ownr_ph2")}
+          name={["owner", "data", "ownr_ph2"]}
+          rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph2")]}
+        >
+          <FormItemPhone disabled={!state.owner.new} />
        </Form.Item>
      </LayoutFormRow>
-
      <LayoutFormRow grow>
        <Form.Item label={t("owners.fields.preferred_contact")} name={["owner", "data", "preferred_contact"]}>
          <Input disabled={!state.owner.new} />
--- a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx
+++ b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx
@@ -61,7 +61,7 @@ export default function JobsCreateOwnerInfoSearchComponent({ loading, owners })
      title: t("owners.fields.ownr_ph1"),
      dataIndex: "ownr_ph1",
      key: "ownr_ph1",
-      render: (text, record) => <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>,
+      render: (text, record) => <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>,
      sorter: (a, b) => alphaSort(a.ownr_ph1, b.ownr_ph1),
      sortOrder: tableState.sortedInfo.columnKey === "ownr_ph1" && tableState.sortedInfo.order
    },
@@ -69,7 +69,7 @@ export default function JobsCreateOwnerInfoSearchComponent({ loading, owners })
      title: t("owners.fields.ownr_ph2"),
      dataIndex: "ownr_ph2",
      key: "ownr_ph2",
-      render: (text, record) => <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>,
+      render: (text, record) => <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>,
      sorter: (a, b) => alphaSort(a.ownr_ph2, b.ownr_ph2),
      sortOrder: tableState.sortedInfo.columnKey === "ownr_ph2" && tableState.sortedInfo.order
    }
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
@@ -175,33 +175,25 @@ export function JobsDetailHeaderActions({
  };

  const handleDuplicate = () =>
-    DuplicateJob({
-      apolloClient: client,
-      jobId: job.id,
-      config: { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported },
-      completionCallback: (newJobId) => {
+    DuplicateJob(
+      client,
+      job.id,
+      { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported },
+      (newJobId) => {
        history(`/manage/jobs/${newJobId}`);
        notification.success({
          message: t("jobs.successes.duplicated")
        });
      },
-      keepJobLines: true,
-      currentUser
-    });
+      true
+    );

  const handleDuplicateConfirm = () =>
-    DuplicateJob({
-      apolloClient: client,
-      jobId: job.id,
-      config: { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported },
-      completionCallback: (newJobId) => {
-        history(`/manage/jobs/${newJobId}`);
-        notification.success({
-          message: t("jobs.successes.duplicated")
-        });
-      },
-      keepJobLines: false,
-      currentUser
+    DuplicateJob(client, job.id, { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported }, (newJobId) => {
+      history(`/manage/jobs/${newJobId}`);
+      notification.success({
+        message: t("jobs.successes.duplicated")
+      });
    });

  const handleFinish = async (values) => {
@@ -617,7 +609,7 @@ export function JobsDetailHeaderActions({
            <FormDateTimePickerComponent
              onBlur={() => {
                const start = form.getFieldValue("start");
-                form.setFieldsValue({ end: start?.add(30, "minutes") });
+                form.setFieldsValue({ end: start.add(30, "minutes") });
              }}
            />
          </Form.Item>
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js
@@ -5,14 +5,7 @@ import { INSERT_NEW_JOB, QUERY_JOB_FOR_DUPE } from "../../graphql/jobs.queries";
 import dayjs from "../../utils/day";
 import i18n from "i18next";

-export default async function DuplicateJob({
-  apolloClient,
-  jobId,
-  config,
-  completionCallback,
-  keepJobLines = false,
-  currentUser
-}) {
+export default async function DuplicateJob(apolloClient, jobId, config, completionCallback, keepJobLines = false) {
  logImEXEvent("job_duplicate");

  const { defaultOpenStatus } = config;
@@ -26,7 +19,6 @@ export default async function DuplicateJob({
  const existingJob = _.cloneDeep(jobs_by_pk);
  delete existingJob.__typename;
  delete existingJob.id;
-  delete existingJob.created_user_email;
  delete existingJob.createdat;
  delete existingJob.updatedat;
  delete existingJob.cieca_stl;
@@ -37,10 +29,6 @@ export default async function DuplicateJob({
    status: defaultOpenStatus
  };

-  if (currentUser?.email) {
-    newJob.created_user_email = currentUser.email;
-  }
-
  const _tempLines = _.cloneDeep(existingJob.joblines);
  _tempLines.forEach((line) => {
    delete line.id;
@@ -67,7 +55,7 @@ export default async function DuplicateJob({
  return;
 }

-export async function CreateIouForJob({ apolloClient, jobId, config, jobLinesToKeep, currentUser }) {
+export async function CreateIouForJob(apolloClient, jobId, config, jobLinesToKeep) {
  logImEXEvent("job_create_iou");

  const { status } = config;
@@ -121,9 +109,6 @@ export async function CreateIouForJob({ apolloClient, jobId, config, jobLinesToK
  delete newJob.joblines;
  newJob.joblines = { data: _tempLines };

-  if (currentUser?.email) {
-    newJob.created_user_email = currentUser.email;
-  }
  const res2 = await apolloClient.mutate({
    mutation: INSERT_NEW_JOB,
    variables: { job: [newJob] }
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -251,16 +251,16 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
            <div>
              <DataLabel key="2" label={t("jobs.fields.ownr_ph1")}>
                {disabled || isPartsEntry ? (
-                  <PhoneNumberFormatter type={job.ownr_ph1_ty}>{job.ownr_ph1}</PhoneNumberFormatter>
+                  <PhoneNumberFormatter>{job.ownr_ph1}</PhoneNumberFormatter>
                ) : (
-                  <ChatOpenButton type={job.ownr_ph1_ty} phone={job.ownr_ph1} jobid={job.id} />
+                  <ChatOpenButton phone={job.ownr_ph1} jobid={job.id} />
                )}
              </DataLabel>
              <DataLabel key="22" label={t("jobs.fields.ownr_ph2")}>
                {disabled || isPartsEntry ? (
-                  <PhoneNumberFormatter type={job.ownr_ph2_ty}>{job.ownr_ph2}</PhoneNumberFormatter>
+                  <PhoneNumberFormatter>{job.ownr_ph2}</PhoneNumberFormatter>
                ) : (
-                  <ChatOpenButton type={job.ownr_ph2_ty} phone={job.ownr_ph2} jobid={job.id} />
+                  <ChatOpenButton phone={job.ownr_ph2} jobid={job.id} />
                )}
              </DataLabel>
              <DataLabel key="3" label={t("owners.fields.address")}>
--- a/client/src/components/jobs-documents-imgproxy-gallery/jobs-document-imgproxy-gallery.download.component.jsx
+++ b/client/src/components/jobs-documents-imgproxy-gallery/jobs-document-imgproxy-gallery.download.component.jsx
@@ -35,14 +35,16 @@ export function JobsDocumentsImgproxyDownloadButton({ galleryImages, identifier,
    ...galleryImages.other.filter((image) => image.isSelected)
  ];

-  const downloadProgress = ({ loaded }) => {
-    setDownload((currentDownloadState) => ({
-      downloaded: loaded ?? 0,
-      speed: (loaded ?? 0) - (currentDownloadState?.downloaded ?? 0)
-    }));
-  };
+  function downloadProgress(progressEvent) {
+    setDownload((currentDownloadState) => {
+      return {
+        downloaded: progressEvent.loaded || 0,
+        speed: (progressEvent.loaded || 0) - ((currentDownloadState && currentDownloadState.downloaded) || 0)
+      };
+    });
+  }

-  const standardMediaDownload = (bufferData) => {
+  function standardMediaDownload(bufferData) {
    try {
      const a = document.createElement("a");
      const url = window.URL.createObjectURL(new Blob([bufferData]));
@@ -53,26 +55,29 @@ export function JobsDocumentsImgproxyDownloadButton({ galleryImages, identifier,
      setLoading(false);
      setDownload(null);
    }
-  };
+  }

  const handleDownload = async () => {
    logImEXEvent("jobs_documents_download");
    setLoading(true);
    try {
-      const { data } = await axios({
+      const response = await axios({
        url: "/media/imgproxy/download",
        method: "POST",
        responseType: "blob",
        data: { jobId, documentids: imagesToDownload.map((_) => _.id) },
        onDownloadProgress: downloadProgress
      });
-      // Use the response data (Blob) to trigger download
-      standardMediaDownload(data);
-    } catch {
-      // handle error (optional)
-    } finally {
+
      setLoading(false);
      setDownload(null);
+
+      // Use the response data (Blob) to trigger download
+      standardMediaDownload(response.data);
+    } catch {
+      setLoading(false);
+      setDownload(null);
+      // handle error (optional)
    }
  };

--- a/client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.component.jsx
+++ b/client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.component.jsx
@@ -76,14 +76,14 @@ function JobsDocumentsImgproxyComponent({
              <SyncOutlined />
            </Button>
            <JobsDocumentsGallerySelectAllComponent galleryImages={galleryImages} setGalleryImages={setGalleryImages} />
-            {!billId && (
-              <JobsDocumentsGalleryReassign galleryImages={galleryImages} callback={fetchThumbnails || refetch} />
-            )}
            <JobsDocumentsDownloadButton galleryImages={galleryImages} identifier={downloadIdentifier} jobId={jobId} />
            <JobsDocumentsDeleteButton
              galleryImages={galleryImages}
              deletionCallback={billsCallback || fetchThumbnails || refetch}
            />
+            {!billId && (
+              <JobsDocumentsGalleryReassign galleryImages={galleryImages} callback={fetchThumbnails || refetch} />
+            )}
          </Space>
        </Col>
        {!hasMediaAccess && (
--- a/client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.delete.component.jsx
+++ b/client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.delete.component.jsx
@@ -67,7 +67,7 @@ export default function JobsDocumentsImgproxyDeleteButton({ galleryImages, delet
      okButtonProps={{ danger: true }}
      cancelText={t("general.actions.cancel")}
    >
-      <Button danger disabled={imagesToDelete.length < 1} loading={loading}>
+      <Button disabled={imagesToDelete.length < 1} loading={loading}>
        {t("documents.actions.delete")}
      </Button>
    </Popconfirm>
--- a/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.container.jsx
+++ b/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.container.jsx
@@ -1,4 +1,4 @@
-import { EditFilled, FileExcelFilled, SyncOutlined } from "@ant-design/icons";
+import { FileExcelFilled, SyncOutlined } from "@ant-design/icons";
 import { Alert, Button, Card, Col, Row, Space } from "antd";
 import { useEffect, useState } from "react";
 import { Gallery } from "react-grid-gallery";
@@ -107,8 +107,8 @@ export function JobsDocumentsLocalGallery({
            <a href={CreateExplorerLinkForJob({ jobid: job.id })}>
              <Button>{t("documents.labels.openinexplorer")}</Button>
            </a>
-            <JobsDocumentsLocalGallerySelectAllComponent jobid={job.id} />
            <JobsDocumentsLocalGalleryReassign jobid={job.id} />
+            <JobsDocumentsLocalGallerySelectAllComponent jobid={job.id} />
            <JobsLocalGalleryDownloadButton job={job} />
            <JobsDocumentsLocalDeleteButton jobid={job.id} />
          </Space>
@@ -185,21 +185,6 @@ export function JobsDocumentsLocalGallery({
        </Col>
        {modalState.open && (
          <Lightbox
-            toolbarButtons={[
-              <EditFilled
-                key="edit"
-                onClick={() => {
-                  const newWindow = window.open(
-                    `${window.location.protocol}//${window.location.host}/edit?imageUrl=${
-                      jobMedia.images[modalState.index].fullsize
-                    }&filename=${jobMedia.images[modalState.index].filename}&jobid=${job.id}`,
-                    "_blank",
-                    "noopener,noreferrer"
-                  );
-                  if (newWindow) newWindow.opener = null;
-                }}
-              />
-            ]}
            mainSrc={jobMedia.images[modalState.index].fullsize}
            nextSrc={jobMedia.images[(modalState.index + 1) % jobMedia.images.length].fullsize}
            prevSrc={jobMedia.images[(modalState.index + jobMedia.images.length - 1) % jobMedia.images.length].fullsize}
--- a/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.delete.component.jsx
+++ b/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.delete.component.jsx
@@ -28,8 +28,6 @@ export function JobsDocumentsLocalDeleteButton({ bodyshop, getJobMedia, allMedia

  const [loading, setLoading] = useState(false);

-  const imagesToDelete = (allMedia?.[jobid] || []).filter((i) => i.isSelected);
-
  const handleDelete = async () => {
    logImEXEvent("job_documents_delete");
    setLoading(true);
@@ -38,7 +36,7 @@ export function JobsDocumentsLocalDeleteButton({ bodyshop, getJobMedia, allMedia
      `${bodyshop.localmediaserverhttp}/jobs/delete`,
      {
        jobid: jobid,
-        files: imagesToDelete.map((i) => i.filename)
+        files: (allMedia?.[jobid] || []).filter((i) => i.isSelected).map((i) => i.filename)
      },
      { headers: { ims_token: bodyshop.localmediatoken } }
    );
@@ -62,17 +60,14 @@ export function JobsDocumentsLocalDeleteButton({ bodyshop, getJobMedia, allMedia

  return (
    <Popconfirm
-      disabled={imagesToDelete.length < 1}
      icon={<QuestionCircleOutlined style={{ color: "red" }} />}
      onConfirm={handleDelete}
      title={t("documents.labels.confirmdelete")}
      okText={t("general.actions.delete")}
-      okButtonProps={{ danger: true }}
+      okButtonProps={{ type: "danger" }}
      cancelText={t("general.actions.cancel")}
    >
-      <Button danger disabled={imagesToDelete.length < 1} loading={loading}>
-        {t("documents.actions.delete")}
-      </Button>
+      <Button loading={loading}>{t("documents.actions.delete")}</Button>
    </Popconfirm>
  );
 }
--- a/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.download.jsx
+++ b/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.download.jsx
@@ -1,8 +1,8 @@
-import { Button, Space } from "antd";
+import { Button } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import cleanAxios from "../../utils/CleanAxios";
-import formatBytes from "../../utils/formatbytes";
+
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectAllMedia } from "../../redux/media/media.selectors";
@@ -19,63 +19,45 @@ export default connect(mapStateToProps, mapDispatchToProps)(JobsLocalGalleryDown

 export function JobsLocalGalleryDownloadButton({ bodyshop, allMedia, job }) {
  const { t } = useTranslation();
-  const [loading, setLoading] = useState(false);
-  const [download, setDownload] = useState(false);
+  const [download, setDownload] = useState(null);

-  const imagesToDownload = (allMedia?.[job.id] || []).filter((i) => i.isSelected);
-
-  const downloadProgress = ({ loaded }) => {
-    setDownload((currentDownloadState) => ({
-      downloaded: loaded || 0,
-      speed: (loaded || 0) - (currentDownloadState?.downloaded || 0)
-    }));
-  };
-
-  const standardMediaDownload = (bufferData, filename) => {
-    try {
-      const a = document.createElement("a");
-      const url = window.URL.createObjectURL(new Blob([bufferData]));
-      a.href = url;
-      a.download = `${filename}.zip`;
-      a.click();
-    } catch {
-      setLoading(false);
-      setDownload(null);
-    }
-  };
+  function downloadProgress(progressEvent) {
+    setDownload((currentDownloadState) => {
+      return {
+        downloaded: progressEvent.loaded || 0,
+        speed: (progressEvent.loaded || 0) - (currentDownloadState?.downloaded || 0)
+      };
+    });
+  }

  const handleDownload = async () => {
-    const { localmediaserverhttp, localmediatoken } = bodyshop;
-    const { id, ro_number } = job;
-    setLoading(true);
-    try {
-      const response = await cleanAxios.post(
-        `${localmediaserverhttp}/jobs/download`,
-        {
-          jobid: id,
-          files: imagesToDownload.map((i) => i.filename)
-        },
-        {
-          headers: { ims_token: localmediatoken },
-          responseType: "arraybuffer",
-          onDownloadProgress: downloadProgress
-        }
-      );
-      standardMediaDownload(response.data, ro_number);
-    } catch {
-      // handle error (optional)
-    } finally {
-      setLoading(false);
-      setDownload(null);
-    }
+    const theDownloadedZip = await cleanAxios.post(
+      `${bodyshop.localmediaserverhttp}/jobs/download`,
+      {
+        jobid: job.id,
+        files: (allMedia?.[job.id] || []).filter((i) => i.isSelected).map((i) => i.filename)
+      },
+      {
+        headers: { ims_token: bodyshop.localmediatoken },
+        responseType: "arraybuffer",
+        onDownloadProgress: downloadProgress
+      }
+    );
+    setDownload(null);
+    standardMediaDownload(theDownloadedZip.data, job.ro_number);
  };

  return (
-    <Button disabled={imagesToDownload < 1} loading={download || loading} onClick={handleDownload}>
-      <Space>
-        <span>{t("documents.actions.download")}</span>
-        {download && <span>{`(${formatBytes(download.downloaded)} @ ${formatBytes(download.speed)} / second)`}</span>}
-      </Space>
+    <Button loading={!!download} onClick={handleDownload}>
+      {t("documents.actions.download")}
    </Button>
  );
 }
+
+function standardMediaDownload(bufferData, filename) {
+  const a = document.createElement("a");
+  const url = window.URL.createObjectURL(new Blob([bufferData]));
+  a.href = url;
+  a.download = `${filename}.zip`;
+  a.click();
+}
--- a/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
+++ b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
@@ -64,11 +64,7 @@ export default function JobsFindModalComponent({
      width: "12%",
      ellipsis: true,
      render: (text, record) => {
-        return record.ownr_ph1 ? (
-          <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>
-        ) : (
-          t("general.labels.unknown")
-        );
+        return record.ownr_ph1 ? <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter> : t("general.labels.unknown");
      }
    },
    {
@@ -78,11 +74,7 @@ export default function JobsFindModalComponent({
      width: "12%",
      ellipsis: true,
      render: (text, record) => {
-        return record.ownr_ph2 ? (
-          <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>
-        ) : (
-          t("general.labels.unknown")
-        );
+        return record.ownr_ph2 ? <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter> : t("general.labels.unknown");
      }
    },
    {
@@ -253,11 +245,7 @@ export default function JobsFindModalComponent({
        >
          {t("jobs.labels.override_header")}
        </Checkbox>
-        <Checkbox
-          checked={partsQueueToggle}
-          onChange={(e) => setPartsQueueToggle(e.target.checked)}
-          id="parts_queue_toggle"
-        >
+        <Checkbox checked={partsQueueToggle} onChange={(e) => setPartsQueueToggle(e.target.checked)} id="parts_queue_toggle">
          {t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
        </Checkbox>
        <Checkbox
--- a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
+++ b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
@@ -72,14 +72,14 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      dataIndex: "ownr_ph1",
      key: "ownr_ph1",
      ellipsis: true,
-      render: (text, record) => <StartChatButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.id} />
+      render: (text, record) => <StartChatButton phone={record.ownr_ph1} jobid={record.id} />
    },
    {
      title: t("jobs.fields.ownr_ph2"),
      dataIndex: "ownr_ph2",
      key: "ownr_ph2",
      ellipsis: true,
-      render: (text, record) => <StartChatButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.id} />
+      render: (text, record) => <StartChatButton phone={record.ownr_ph2} jobid={record.id} />
    },
    {
      title: t("jobs.fields.status"),
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -139,7 +139,7 @@ export function JobsList({ bodyshop }) {
      key: "ownr_ph1",
      ellipsis: true,
      responsive: ["md"],
-      render: (text, record) => <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
    },
    {
      title: t("jobs.fields.ownr_ph2"),
@@ -147,7 +147,7 @@ export function JobsList({ bodyshop }) {
      key: "ownr_ph2",
      ellipsis: true,
      responsive: ["md"],
-      render: (text, record) => <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
    },

    {
--- a/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
+++ b/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
@@ -140,7 +140,7 @@ export function JobsReadyList({ bodyshop }) {
      key: "ownr_ph1",
      ellipsis: true,
      responsive: ["md"],
-      render: (text, record) => <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
    },
    {
      title: t("jobs.fields.ownr_ph2"),
@@ -148,7 +148,7 @@ export function JobsReadyList({ bodyshop }) {
      key: "ownr_ph2",
      ellipsis: true,
      responsive: ["md"],
-      render: (text, record) => <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
    },
    {
      title: t("jobs.fields.status"),
--- a/client/src/components/owner-detail-form/owner-detail-form.component.jsx
+++ b/client/src/components/owner-detail-form/owner-detail-form.component.jsx
@@ -1,4 +1,4 @@
-import { Form, Input, Select, Tooltip } from "antd";
+import { Form, Input, Tooltip } from "antd";
 import { CloseCircleFilled } from "@ant-design/icons";
 import { useTranslation } from "react-i18next";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
@@ -10,12 +10,6 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
  const { t } = useTranslation();
  const { getFieldValue } = form;

-  const PHONE_TYPE_OPTIONS = [
-    { label: t("owners.labels.home"), value: "Home" },
-    { label: t("owners.labels.work"), value: "Work" },
-    { label: t("owners.labels.cell"), value: "Cell" }
-  ];
-
  return (
    <div>
      <FormFieldsChanged form={form} />
@@ -36,7 +30,6 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
          <Input disabled />
        </Form.Item>
      </LayoutFormRow>
-
      <LayoutFormRow header={t("owners.forms.address")}>
        <Form.Item label={t("owners.fields.ownr_addr1")} name="ownr_addr1">
          <Input />
@@ -57,7 +50,6 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
          <Input />
        </Form.Item>
      </LayoutFormRow>
-
      <LayoutFormRow header={t("owners.forms.contact")}>
        <Form.Item
          label={t("owners.fields.ownr_ea")}
@@ -71,8 +63,6 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
        >
          <FormItemEmail email={getFieldValue("ownr_ea")} />
        </Form.Item>
-
-        {/* Phone 1 + Type + Opt-out icon */}
        <Form.Item label={t("owners.fields.ownr_ph1")} style={{ marginBottom: 0 }}>
          <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
            <Form.Item
@@ -82,11 +72,6 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
            >
              <Input style={{ flex: 1, minWidth: "150px" }} />
            </Form.Item>
-
-            <Form.Item name="ownr_ph1_ty" noStyle>
-              <Select allowClear placeholder="Type" options={PHONE_TYPE_OPTIONS} style={{ width: 110 }} />
-            </Form.Item>
-
            {isPhone1OptedOut && (
              <Tooltip title={t("consent.text_body")}>
                <CloseCircleFilled
@@ -103,8 +88,6 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
            )}
          </div>
        </Form.Item>
-
-        {/* Phone 2 + Type + Opt-out icon */}
        <Form.Item label={t("owners.fields.ownr_ph2")} style={{ marginBottom: 0 }}>
          <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
            <Form.Item
@@ -114,11 +97,6 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
            >
              <Input style={{ flex: 1, minWidth: "150px" }} />
            </Form.Item>
-
-            <Form.Item name="ownr_ph2_ty" noStyle>
-              <Select allowClear placeholder="Type" options={PHONE_TYPE_OPTIONS} style={{ width: 110 }} />
-            </Form.Item>
-
            {isPhone2OptedOut && (
              <Tooltip title={t("consent.text_body")}>
                <CloseCircleFilled
@@ -135,7 +113,6 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
            )}
          </div>
        </Form.Item>
-
        <Form.Item label={t("owners.fields.preferred_contact")} name="preferred_contact">
          <Input />
        </Form.Item>
@@ -143,7 +120,6 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
          <Input />
        </Form.Item>
      </LayoutFormRow>
-
      <Form.Item label={t("owners.fields.note")} name="note">
        <Input.TextArea rows={4} />
      </Form.Item>
--- a/client/src/components/owner-detail-update-jobs/owner-detail-update-jobs.component.jsx
+++ b/client/src/components/owner-detail-update-jobs/owner-detail-update-jobs.component.jsx
@@ -25,10 +25,8 @@ export default function OwnerDetailUpdateJobsComponent({ owner, selectedJobs, di
          ownr_ea: owner["ownr_ea"],
          ownr_fn: owner["ownr_fn"],
          ownr_ph1: owner["ownr_ph1"],
-          ownr_ph1_ty: owner["ownr_ph1_ty"],
          ownr_ln: owner["ownr_ln"],
          ownr_ph2: owner["ownr_ph2"],
-          ownr_ph2_ty: owner["ownr_ph2_ty"],
          ownr_st: owner["ownr_st"],
          ownr_title: owner["ownr_title"],
          ownr_zip: owner["ownr_zip"]
--- a/client/src/components/owner-find-modal/owner-find-modal.component.jsx
+++ b/client/src/components/owner-find-modal/owner-find-modal.component.jsx
@@ -47,13 +47,13 @@ export default function OwnerFindModalComponent({
      title: t("owners.fields.ownr_ph1"),
      dataIndex: "ownr_ph1",
      key: "ownr_ph1",
-      render: (text, record) => <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
    },
    {
      title: t("owners.fields.ownr_ph2"),
      dataIndex: "ownr_ph2",
      key: "ownr_ph2",
-      render: (text, record) => <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
    },
    {
      title: t("owners.fields.note"),
--- a/client/src/components/owner-tag-popover/owner-tag-popover.component.jsx
+++ b/client/src/components/owner-tag-popover/owner-tag-popover.component.jsx
@@ -15,10 +15,10 @@ export default function OwnerTagPopoverComponent({ job }) {
              <OwnerNameDisplay ownerObject={job} />
            </Descriptions.Item>
            <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph1")}>
-              <PhoneFormatter type={job.ownr_ph1_ty}>{job.ownr_ph1 || ""}</PhoneFormatter>
+              <PhoneFormatter>{job.ownr_ph1 || ""}</PhoneFormatter>
            </Descriptions.Item>
            <Descriptions.Item key="22" label={t("jobs.fields.ownr_ph2")}>
-              <PhoneFormatter type={job.ownr_ph2_ty}>{job.ownr_ph2 || ""}</PhoneFormatter>
+              <PhoneFormatter>{job.ownr_ph2 || ""}</PhoneFormatter>
            </Descriptions.Item>
            <Descriptions.Item key="3" label={t("owners.fields.address")}>
              {`${job.ownr_addr1 || ""} ${job.ownr_addr2 || ""} ${
@@ -36,10 +36,13 @@ export default function OwnerTagPopoverComponent({ job }) {
              <OwnerNameDisplay ownerObject={job.owner} />
            </Descriptions.Item>
            <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph1")}>
-              <PhoneFormatter type={job.owner.ownr_ph1_ty}>{job.owner.ownr_ph1 || ""}</PhoneFormatter>
+              <PhoneFormatter>{job.owner.ownr_ph1 || ""}</PhoneFormatter>
+            </Descriptions.Item>
+            <Descriptions.Item key="22" label={t("jobs.fields.ownr_ph2")}>
+              <PhoneFormatter>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
            </Descriptions.Item>
            <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph2")}>
-              <PhoneFormatter type={job.owner.ownr_ph2_ty}>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
+              <PhoneFormatter>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
            </Descriptions.Item>
            <Descriptions.Item key="3" label={t("owners.fields.address")}>
              {`${job.owner.ownr_addr1 || ""} ${job.owner.ownr_addr2 || ""} ${
--- a/client/src/components/owners-list/owners-list.component.jsx
+++ b/client/src/components/owners-list/owners-list.component.jsx
@@ -39,7 +39,7 @@ export default function OwnersListComponent({ loading, owners, total, refetch })
      dataIndex: "ownr_ph1",
      key: "ownr_ph1",
      render: (text, record) => {
-        return <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>;
+        return <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>;
      }
    },
    {
@@ -47,7 +47,7 @@ export default function OwnersListComponent({ loading, owners, total, refetch })
      dataIndex: "ownr_ph2",
      key: "ownr_ph2",
      render: (text, record) => {
-        return <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>;
+        return <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>;
      }
    },
    {
--- a/client/src/components/parts-queue-list/parts-queue.list.component.jsx
+++ b/client/src/components/parts-queue-list/parts-queue.list.component.jsx
@@ -16,11 +16,11 @@ import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import useLocalStorage from "../../utils/useLocalStorage";
 import AlertComponent from "../alert/alert.component";
+import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
 import JobRemoveFromPartsQueue from "../job-remove-from-parst-queue/job-remove-from-parts-queue.component";
 import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import JobPartsReceived from "../job-parts-received/job-parts-received.component";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -235,9 +235,7 @@ export function PartsQueueListComponent({ bodyshop }) {
      title: t("jobs.fields.partsstatus"),
      dataIndex: "partsstatus",
      key: "partsstatus",
-      render: (text, record) => (
-        <JobPartsReceived parts={record.joblines_status} displayMode="full" popoverPlacement="topLeft" />
-      )
+      render: (text, record) => <JobPartsQueueCount parts={record.joblines_status} />
    },
    {
      title: t("jobs.fields.comment"),
--- a/client/src/components/production-board-kanban/production-board-kanban-card.component.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban-card.component.jsx
@@ -19,7 +19,6 @@ import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.c
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 import { PiMicrosoftTeamsLogo } from "react-icons/pi";
-import ProductionListColumnPartsReceived from "../production-list-columns/production-list-columns.partsreceived.component";

 const cardColor = (ssbuckets, totalHrs) => {
  const bucket = ssbuckets.find((bucket) => bucket.gte <= totalHrs && (!bucket.lt || bucket.lt > totalHrs));
@@ -313,20 +312,6 @@ const TasksToolTip = ({ metadata, cardSettings, t }) =>
    </Col>
  );

-const PartsReceivedComponent = ({ metadata, cardSettings, card }) =>
-  cardSettings?.partsreceived && (
-    <Col span={24} style={{ textAlign: "center" }}>
-      <ProductionListColumnPartsReceived
-        displayMode="full"
-        popoverPlacement="topLeft"
-        record={{
-          ...metadata,
-          id: card?.id,
-          refetch: card?.refetch
-        }}
-      />
-    </Col>
-  );
 export default function ProductionBoardCard({ technician, card, bodyshop, cardSettings }) {
  const { t } = useTranslation();
  const { metadata } = card;
@@ -426,7 +411,6 @@ export default function ProductionBoardCard({ technician, card, bodyshop, cardSe
      <SubletsComponent metadata={metadata} cardSettings={cardSettings} />
      <ProductionNoteComponent metadata={metadata} cardSettings={cardSettings} card={card} />
      <PartsStatusComponent metadata={metadata} cardSettings={cardSettings} />
-      <PartsReceivedComponent metadata={metadata} cardSettings={cardSettings} card={card} />
    </Row>
  );

--- a/client/src/components/production-board-kanban/settings/InformationSettings.jsx
+++ b/client/src/components/production-board-kanban/settings/InformationSettings.jsx
@@ -18,8 +18,7 @@ const InformationSettings = ({ t }) => (
        "partsstatus",
        "estimator",
        "subtotal",
-        "tasks",
-        "partsreceived"
+        "tasks"
      ].map((item) => (
        <Col xs={24} sm={12} md={8} lg={6} key={item}>
          <Form.Item name={item} valuePropName="checked">
--- a/client/src/components/production-board-kanban/settings/defaultKanbanSettings.js
+++ b/client/src/components/production-board-kanban/settings/defaultKanbanSettings.js
@@ -74,7 +74,6 @@ const defaultKanbanSettings = {
  cardSize: "small",
  model_info: true,
  kiosk: false,
-  partsreceived: false,
  totalHrs: true,
  totalAmountInProduction: false,
  totalLAB: true,
--- a/client/src/components/production-list-columns/production-list-columns.data.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.data.jsx
@@ -161,6 +161,7 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
      dataIndex: "actual_in_time",
      key: "actual_in_time",
      ellipsis: true,
+
      render: (text, record) => <TimeFormatter>{record.actual_in}</TimeFormatter>
    },
    {
@@ -180,22 +181,6 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo

      render: (text, record) => <TimeFormatter>{record.scheduled_completion}</TimeFormatter>
    },
-    {
-      title: i18n.t("jobs.fields.actual_completion"),
-      dataIndex: "actual_completion",
-      key: "actual_completion",
-      ellipsis: true,
-      sorter: (a, b) => dateSort(a.actual_completion, b.actual_completion),
-      sortOrder: state.sortedInfo.columnKey === "actual_completion" && state.sortedInfo.order,
-      render: (text, record) => <ProductionListDate record={record} field="actual_completion" time />
-    },
-    {
-      title: i18n.t("jobs.fields.actual_completion") + " (HH:MM)",
-      dataIndex: "actual_completion_time",
-      key: "actual_completion_time",
-      ellipsis: true,
-      render: (text, record) => <TimeFormatter>{record.actual_completion}</TimeFormatter>
-    },
    {
      title: i18n.t("jobs.fields.date_last_contacted"),
      dataIndex: "date_last_contacted",
@@ -270,14 +255,14 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
      dataIndex: "ownr_ph1",
      key: "ownr_ph1",
      ellipsis: true,
-      render: (text, record) => <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
    },
    {
      title: i18n.t("jobs.fields.ownr_ph2"),
      dataIndex: "ownr_ph2",
      key: "ownr_ph2",
      ellipsis: true,
-      render: (text, record) => <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
    },
    {
      title: i18n.t("jobs.fields.specialcoveragepolicy"),
--- a/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx
@@ -144,7 +144,7 @@ export function ProductionListEmpAssignment({ insertAuditTrail, bodyshop, record
      <Spin spinning={loading}>
        {record[type] ? (
          <div>
-            <span>{`${theEmployee?.first_name || ""} ${theEmployee?.last_name || ""}`}</span>
+            <span>{`${theEmployee.first_name || ""} ${theEmployee.last_name || ""}`}</span>
            <DeleteFilled style={iconStyle} onClick={() => handleRemove(type)} />
          </div>
        ) : (
--- a/client/src/components/production-list-columns/production-list-columns.partsreceived.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.partsreceived.component.jsx
@@ -1,5 +1,33 @@
-import JobPartsReceived from "../job-parts-received/job-parts-received.component";
+import { useMemo } from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";

-export default function ProductionListColumnPartsReceived({ record }) {
-  return <JobPartsReceived parts={record.joblines_status} displayMode="full" popoverPlacement="topLeft" />;
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
+const mapDispatchToProps = () => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(ProductionListColumnPartsReceived);
+
+export function ProductionListColumnPartsReceived({ bodyshop, record }) {
+  const amount = useMemo(() => {
+    const amount = record.joblines_status.reduce(
+      (acc, val) => {
+        acc.total += val.count;
+        acc.received =
+          val.status === bodyshop.md_order_statuses.default_received ? acc.received + val.count : acc.received;
+        return acc;
+      },
+      { total: 0, received: 0 }
+    );
+
+    return {
+      ...amount,
+      percent: amount.total !== 0 ? ((amount.received / amount.total) * 100).toFixed(0) + "%" : "N/A"
+    };
+  }, [record, bodyshop.md_order_statuses]);
+
+  return `${amount.percent} (${amount.received}/${amount.total})`;
 }
--- a/client/src/components/production-list-detail/production-list-detail.component.jsx
+++ b/client/src/components/production-list-detail/production-list-detail.component.jsx
@@ -154,25 +154,13 @@ export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, te
                <OwnerNameDisplay ownerObject={theJob} />
                {!technician ? (
                  <>
-                    <StartChatButton
-                      type={data.jobs_by_pk.ownr_ph1_ty}
-                      phone={data.jobs_by_pk.ownr_ph1}
-                      jobid={data.jobs_by_pk.id}
-                    />
-                    <StartChatButton
-                      type={data.jobs_by_pk.ownr_ph2_ty}
-                      phone={data.jobs_by_pk.ownr_ph2}
-                      jobid={data.jobs_by_pk.id}
-                    />
+                    <StartChatButton phone={data.jobs_by_pk.ownr_ph1} jobid={data.jobs_by_pk.id} />
+                    <StartChatButton phone={data.jobs_by_pk.ownr_ph2} jobid={data.jobs_by_pk.id} />
                  </>
                ) : (
                  <>
-                    <PhoneNumberFormatter type={data.jobs_by_pk.ownr_ph1_ty}>
-                      {data.jobs_by_pk.ownr_ph1}
-                    </PhoneNumberFormatter>
-                    <PhoneNumberFormatter type={data.jobs_by_pk.ownr_ph2_ty}>
-                      {data.jobs_by_pk.ownr_ph2}
-                    </PhoneNumberFormatter>
+                    <PhoneNumberFormatter>{data.jobs_by_pk.ownr_ph1}</PhoneNumberFormatter>
+                    <PhoneNumberFormatter>{data.jobs_by_pk.ownr_ph2}</PhoneNumberFormatter>
                  </>
                )}
              </Space>
--- a/client/src/components/report-center-modal/report-center-modal.component.jsx
+++ b/client/src/components/report-center-modal/report-center-modal.component.jsx
@@ -143,7 +143,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {

  //TODO: Find a way to filter out / blur on demand.
  return (
-    <div className="report-center-modal">
+    <div>
      <Form onFinish={handleFinish} autoComplete={"off"} layout="vertical" form={form}>
        <Input.Search onChange={(e) => setSearch(e.target.value)} value={search} />
        <Form.Item name="defaultSorters" hidden />
@@ -163,14 +163,13 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
              {Object.keys(grouped)
                //.filter((key) => !groupExcludeKeyFilter.includes(key))
                .map((key) => (
-                  <Col xs={24} sm={12} md={Object.keys(grouped).length === 1 ? 24 : 8} key={key}>
+                  <Col md={8} sm={12} key={key}>
                    <Card.Grid
                      style={{
                        width: "100%",
                        height: "100%",
                        maxHeight: "33vh",
-                        overflowY: "scroll",
-                        minWidth: "200px"
+                        overflowY: "scroll"
                      }}
                    >
                      <Typography.Title level={4}>{t(`reportcenter.labels.groups.${key}`)}</Typography.Title>
@@ -178,7 +177,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
                        <BlurWrapperComponent
                          featureName={groupExcludeKeyFilter.find((g) => g.key === key).featureName}
                        >
-                          <ul style={{ listStyleType: "none", columns: grouped[key].length > 4 ? "2 auto" : "1", padding: 0, margin: 0 }}>
+                          <ul style={{ listStyleType: "none", columns: "2 auto" }}>
                            {grouped[key].map((item) => (
                              <li key={item.key}>
                                <Radio key={item.key} value={item.key}>
@@ -189,7 +188,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
                          </ul>
                        </BlurWrapperComponent>
                      ) : (
-                        <ul style={{ listStyleType: "none", columns: grouped[key].length > 4 ? "2 auto" : "1", padding: 0, margin: 0 }}>
+                        <ul style={{ listStyleType: "none", columns: "2 auto" }}>
                          {grouped[key].map((item) =>
                            item.featureNameRestricted ? (
                              <li key={item.key}>
--- a/client/src/components/report-center-modal/report-center-modal.styles.scss
+++ b/client/src/components/report-center-modal/report-center-modal.styles.scss
@@ -11,38 +11,3 @@
    }
  }
 }
-
-// Report center modal fixes for column layout
-.report-center-modal {
-  .ant-form-item .ant-radio-group {
-    width: 100%;
-    
-    .ant-card-grid {
-      padding: 16px;
-      box-sizing: border-box;
-      
-      ul {
-        width: 100%;
-        
-        li {
-          margin-bottom: 8px;
-          break-inside: avoid;
-          page-break-inside: avoid;
-          
-          .ant-radio-wrapper {
-            display: flex;
-            align-items: flex-start;
-            width: 100%;
-            
-            span:not(.ant-radio) {
-              word-break: break-word;
-              overflow-wrap: break-word;
-              hyphens: auto;
-              flex: 1;
-            }
-          }
-        }
-      }
-    }
-  }
-}
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -1,9 +1,12 @@
 import { DeleteFilled } from "@ant-design/icons";
-import { Button, Form, Input, InputNumber, Select, Space, Switch } from "antd";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
+import { Button, DatePicker, Form, Input, InputNumber, Radio, Select, Space, Switch } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import DatePickerRanges from "../../utils/DatePickerRanges";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import FeatureWrapper, { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
@@ -23,6 +26,14 @@ export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoGeneral);
 export function ShopInfoGeneral({ form, bodyshop }) {
  const { t } = useTranslation();

+  const {
+    treatments: { ClosingPeriod, ADPPayroll }
+  } = useSplitTreatments({
+    attributes: {},
+    names: ["ClosingPeriod", "ADPPayroll"],
+    splitKey: bodyshop?.imexshopid
+  });
+
  return (
    <div>
      <LayoutFormRow header={t("bodyshop.labels.businessinformation")} id="businessinformation">
@@ -132,6 +143,299 @@ export function ShopInfoGeneral({ form, bodyshop }) {
          <InputNumber min={0} />
        </Form.Item>
      </LayoutFormRow>
+      <LayoutFormRow header={t("bodyshop.labels.accountingsetup")} id="accountingsetup">
+        {[
+          ...(HasFeatureAccess({ featureName: "export", bodyshop })
+            ? [
+                <Form.Item
+                  key="qbo"
+                  label={t("bodyshop.labels.qbo")}
+                  valuePropName="checked"
+                  name={["accountingconfig", "qbo"]}
+                >
+                  <Switch />
+                </Form.Item>,
+                InstanceRenderManager({
+                  imex: (
+                    <Form.Item key="qbo_usa_wrapper" shouldUpdate noStyle>
+                      {() => (
+                        <Form.Item
+                          label={t("bodyshop.labels.qbo_usa")}
+                          shouldUpdate
+                          valuePropName="checked"
+                          name={["accountingconfig", "qbo_usa"]}
+                        >
+                          <Switch disabled={!form.getFieldValue(["accountingconfig", "qbo"])} />
+                        </Form.Item>
+                      )}
+                    </Form.Item>
+                  )
+                }),
+                <Form.Item
+                  key="qbo_departmentid"
+                  label={t("bodyshop.labels.qbo_departmentid")}
+                  name={["accountingconfig", "qbo_departmentid"]}
+                >
+                  <Input />
+                </Form.Item>,
+                <Form.Item
+                  key="accountingtiers"
+                  label={t("bodyshop.labels.accountingtiers")}
+                  rules={[
+                    {
+                      required: true
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                  name={["accountingconfig", "tiers"]}
+                >
+                  <Radio.Group>
+                    <Radio value={2}>2</Radio>
+                    <Radio value={3}>3</Radio>
+                  </Radio.Group>
+                </Form.Item>,
+                <Form.Item key="twotierpref_wrapper" shouldUpdate>
+                  {() => {
+                    return (
+                      <Form.Item
+                        label={t("bodyshop.labels.2tiersetup")}
+                        shouldUpdate
+                        rules={[
+                          {
+                            required: form.getFieldValue(["accountingconfig", "tiers"]) === 2
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                        name={["accountingconfig", "twotierpref"]}
+                      >
+                        <Radio.Group disabled={form.getFieldValue(["accountingconfig", "tiers"]) === 3}>
+                          <Radio value="name">{t("bodyshop.labels.2tiername")}</Radio>
+                          <Radio value="source">{t("bodyshop.labels.2tiersource")}</Radio>
+                        </Radio.Group>
+                      </Form.Item>
+                    );
+                  }}
+                </Form.Item>,
+                <Form.Item
+                  key="printlater"
+                  label={t("bodyshop.labels.printlater")}
+                  valuePropName="checked"
+                  name={["accountingconfig", "printlater"]}
+                >
+                  <Switch />
+                </Form.Item>,
+                <Form.Item
+                  key="emaillater"
+                  label={t("bodyshop.labels.emaillater")}
+                  valuePropName="checked"
+                  name={["accountingconfig", "emaillater"]}
+                >
+                  <Switch />
+                </Form.Item>
+              ]
+            : []),
+          <Form.Item
+            key="inhousevendorid"
+            label={t("bodyshop.fields.inhousevendorid")}
+            name={"inhousevendorid"}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+          >
+            <Input />
+          </Form.Item>,
+          <Form.Item
+            key="default_adjustment_rate"
+            label={t("bodyshop.fields.default_adjustment_rate")}
+            name={"default_adjustment_rate"}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+          >
+            <InputNumber min={0} precision={2} />
+          </Form.Item>,
+          InstanceRenderManager({
+            imex: (
+              <Form.Item key="federal_tax_id" label={t("bodyshop.fields.federal_tax_id")} name="federal_tax_id">
+                <Input />
+              </Form.Item>
+            )
+          }),
+          <Form.Item key="state_tax_id" label={t("bodyshop.fields.state_tax_id")} name="state_tax_id">
+            <Input />
+          </Form.Item>,
+          ...(HasFeatureAccess({ featureName: "bills", bodyshop })
+            ? [
+                InstanceRenderManager({
+                  imex: (
+                    <Form.Item
+                      key="invoice_federal_tax_rate"
+                      label={t("bodyshop.fields.invoice_federal_tax_rate")}
+                      name={["bill_tax_rates", "federal_tax_rate"]}
+                      rules={[
+                        {
+                          required: true
+                          //message: t("general.validation.required"),
+                        }
+                      ]}
+                    >
+                      <InputNumber />
+                    </Form.Item>
+                  )
+                }),
+                <Form.Item
+                  key="invoice_state_tax_rate"
+                  label={t("bodyshop.fields.invoice_state_tax_rate")}
+                  name={["bill_tax_rates", "state_tax_rate"]}
+                  rules={[
+                    {
+                      required: true
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber />
+                </Form.Item>,
+                <Form.Item
+                  key="invoice_local_tax_rate"
+                  label={t("bodyshop.fields.invoice_local_tax_rate")}
+                  name={["bill_tax_rates", "local_tax_rate"]}
+                  rules={[
+                    {
+                      required: true
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <InputNumber />
+                </Form.Item>
+              ]
+            : []),
+          <Form.Item
+            key="md_payment_types"
+            name={["md_payment_types"]}
+            label={t("bodyshop.fields.md_payment_types")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+                type: "array"
+              }
+            ]}
+          >
+            <Select mode="tags" />
+          </Form.Item>,
+          <Form.Item
+            key="md_categories"
+            name={["md_categories"]}
+            label={t("bodyshop.fields.md_categories")}
+            rules={[
+              {
+                //message: t("general.validation.required"),
+                type: "array"
+              }
+            ]}
+          >
+            <Select mode="tags" />
+          </Form.Item>,
+          ...(HasFeatureAccess({ featureName: "export", bodyshop })
+            ? [
+                <Form.Item
+                  key="ReceivableCustomField1"
+                  name={["accountingconfig", "ReceivableCustomField1"]}
+                  label={t("bodyshop.fields.ReceivableCustomField", { number: 1 })}
+                >
+                  {ReceivableCustomFieldSelect}
+                </Form.Item>,
+                <Form.Item
+                  key="ReceivableCustomField2"
+                  name={["accountingconfig", "ReceivableCustomField2"]}
+                  label={t("bodyshop.fields.ReceivableCustomField", { number: 2 })}
+                >
+                  {ReceivableCustomFieldSelect}
+                </Form.Item>,
+                <Form.Item
+                  key="ReceivableCustomField3"
+                  name={["accountingconfig", "ReceivableCustomField3"]}
+                  label={t("bodyshop.fields.ReceivableCustomField", { number: 3 })}
+                >
+                  {ReceivableCustomFieldSelect}
+                </Form.Item>,
+                <Form.Item
+                  key="md_classes"
+                  name={["md_classes"]}
+                  label={t("bodyshop.fields.md_classes")}
+                  rules={[
+                    ({ getFieldValue }) => {
+                      return {
+                        required: getFieldValue("enforce_class"),
+                        //message: t("general.validation.required"),
+                        type: "array"
+                      };
+                    }
+                  ]}
+                >
+                  <Select mode="tags" />
+                </Form.Item>,
+                <Form.Item
+                  key="enforce_class"
+                  name={["enforce_class"]}
+                  label={t("bodyshop.fields.enforce_class")}
+                  valuePropName="checked"
+                >
+                  <Switch />
+                </Form.Item>,
+                ...(ClosingPeriod.treatment === "on"
+                  ? [
+                      <Form.Item
+                        key="ClosingPeriod"
+                        name={["accountingconfig", "ClosingPeriod"]}
+                        label={t("bodyshop.fields.closingperiod")} //{t("reportcenter.labels.dates")}
+                      >
+                        <DatePicker.RangePicker format="MM/DD/YYYY" presets={DatePickerRanges} />
+                      </Form.Item>
+                    ]
+                  : []),
+                ...(ADPPayroll.treatment === "on"
+                  ? [
+                      <Form.Item
+                        key="companyCode"
+                        name={["accountingconfig", "companyCode"]}
+                        label={t("bodyshop.fields.companycode")}
+                      >
+                        <Input />
+                      </Form.Item>
+                    ]
+                  : []),
+                ...(ADPPayroll.treatment === "on"
+                  ? [
+                      <Form.Item
+                        key="batchID"
+                        name={["accountingconfig", "batchID"]}
+                        label={t("bodyshop.fields.batchid")}
+                      >
+                        <Input />
+                      </Form.Item>
+                    ]
+                  : [])
+              ]
+            : []),
+          <Form.Item
+            key="accumulatePayableLines"
+            name={["accountingconfig", "accumulatePayableLines"]}
+            label={t("bodyshop.fields.accumulatePayableLines")}
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+        ]}
+      </LayoutFormRow>
      <FeatureWrapper featureName="scoreboard" noauth={() => null}>
        <LayoutFormRow header={t("bodyshop.labels.scoreboardsetup")} id="scoreboardsetup">
          <Form.Item
@@ -195,19 +499,6 @@ export function ShopInfoGeneral({ form, bodyshop }) {
      </FeatureWrapper>
      <LayoutFormRow header={t("bodyshop.labels.systemsettings")} id="systemsettings">
        {[
-          <Form.Item
-            key="md_categories"
-            name={["md_categories"]}
-            label={t("bodyshop.fields.md_categories")}
-            rules={[
-              {
-                //message: t("general.validation.required"),
-                type: "array"
-              }
-            ]}
-          >
-            <Select mode="tags" />
-          </Form.Item>,
          <Form.Item
            key="md_referral_sources"
            name={["md_referral_sources"]}
@@ -643,8 +934,6 @@ export function ShopInfoGeneral({ form, bodyshop }) {
          }}
        </Form.List>
      </LayoutFormRow>
-
-      {/*Start Insurance Provider Row */}
      <LayoutFormRow
        grow
        header={<span id="insurancecos-header">{t("bodyshop.labels.insurancecos")}</span>}
@@ -661,31 +950,11 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                        label={t("bodyshop.fields.md_ins_co.name")}
                        key={`${index}name`}
                        name={[field.name, "name"]}
-                        dependencies={[["md_ins_cos"]]}
                        rules={[
                          {
                            required: true
                            //message: t("general.validation.required"),
-                          },
-                          ({ getFieldValue }) => ({
-                            validator: async (_, value) => {
-                              const normalizedValue = (value ?? "").toString().trim().toLowerCase();
-                              if (!normalizedValue) return Promise.resolve(); // handled by required
-
-                              const list = getFieldValue(["md_ins_cos"]) || [];
-                              const normalizedNames = list
-                                .map((c) => (c?.name ?? "").toString().trim().toLowerCase())
-                                .filter(Boolean);
-
-                              const count = normalizedNames.filter((n) => n === normalizedValue).length;
-
-                              if (count > 1) {
-                                throw new Error(t("bodyshop.errors.duplicate_insurance_company"));
-                              }
-
-                              return Promise.resolve();
-                            }
-                          })
+                          }
                        ]}
                      >
                        <Input />
@@ -762,8 +1031,6 @@ export function ShopInfoGeneral({ form, bodyshop }) {
          }}
        </Form.List>
      </LayoutFormRow>
-      {/*End Insurance Provider Row */}
-
      <LayoutFormRow grow header={t("bodyshop.labels.estimators")} id="estimators">
        <Form.List name={["md_estimators"]}>
          {(fields, { add, remove, move }) => {
@@ -1301,3 +1568,11 @@ export function ShopInfoGeneral({ form, bodyshop }) {
    </div>
  );
 }
+
+const ReceivableCustomFieldSelect = (
+  <Select allowClear>
+    <Select.Option value="v_vin">VIN</Select.Option>
+    <Select.Option value="clm_no">Claim No.</Select.Option>
+    <Select.Option value="ded_amt">Deductible Amount</Select.Option>
+  </Select>
+);
--- a/client/src/components/shop-info/shop-info.notifications-autoadd.component.jsx
+++ b/client/src/components/shop-info/shop-info.notifications-autoadd.component.jsx
@@ -16,7 +16,6 @@ export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
      <Text type="secondary">{t("bodyshop.labels.notifications.followers")}</Text>
      {employeeOptions.length > 0 ? (
        <Form.Item
-          normalize={(value) => (value || []).filter((id) => typeof id === "string" && id.trim() !== "")}
          name="notification_followers"
          rules={[
            {
@@ -43,6 +42,11 @@ export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
            options={employeeOptions}
            placeholder={t("bodyshop.fields.notifications.placeholder")}
            showEmail={true}
+            onChange={(value) => {
+              // Filter out null or invalid values before passing to Form
+              const cleanedValue = value?.filter((id) => id != null && typeof id === "string" && id.trim() !== "");
+              return cleanedValue;
+            }}
          />
        </Form.Item>
      ) : (
--- a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
+++ b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
@@ -1,6 +1,6 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { Button, DatePicker, Form, Input, InputNumber, Radio, Select, Space, Switch } from "antd";
+import { Button, Form, Input, InputNumber, Select, Space, Switch } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -14,7 +14,6 @@ import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.c
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 import ShopInfoResponsibilitycentersTaxesComponent from "./shop-info.responsibilitycenters.taxes.component";
-import DatePickerRanges from "../../utils/DatePickerRanges";

 const SelectorDiv = styled.div`
  .ant-form-item .ant-select {
@@ -35,11 +34,11 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
  const { t } = useTranslation();

  const {
-    treatments: { ClosingPeriod, ADPPayroll, Qb_Multi_Ar, DmsAp }
+    treatments: { Qb_Multi_Ar, DmsAp }
  } = useSplitTreatments({
    attributes: {},
-    names: ["ClosingPeriod", "ADPPayroll", "Qb_Multi_Ar", "DmsAp"],
-    splitKey: bodyshop?.imexshopid
+    names: ["Qb_Multi_Ar", "DmsAp"],
+    splitKey: bodyshop && bodyshop.imexshopid
  });

  const [costOptions, setCostOptions] = useState([
@@ -59,14 +58,6 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
    setProfitOptions([...(form.getFieldValue(["md_responsibility_centers", "profits"]).map((i) => i && i.name) || [])]);
  };

-  const ReceivableCustomFieldSelect = (
-    <Select allowClear>
-      <Select.Option value="v_vin">VIN</Select.Option>
-      <Select.Option value="clm_no">Claim No.</Select.Option>
-      <Select.Option value="ded_amt">Deductible Amount</Select.Option>
-    </Select>
-  );
-
  return (
    <div>
      <RbacWrapper action="shop:responsibilitycenter">
@@ -323,286 +314,6 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
            </DataLabel>
          </>
        )}
-        <LayoutFormRow header={t("bodyshop.labels.accountingsetup")} id="accountingsetup">
-          {[
-            ...(HasFeatureAccess({ featureName: "export", bodyshop })
-              ? [
-                  <Form.Item
-                    key="qbo"
-                    label={t("bodyshop.labels.qbo")}
-                    valuePropName="checked"
-                    name={["accountingconfig", "qbo"]}
-                  >
-                    <Switch />
-                  </Form.Item>,
-                  InstanceRenderManager({
-                    imex: (
-                      <Form.Item key="qbo_usa_wrapper" shouldUpdate noStyle>
-                        {() => (
-                          <Form.Item
-                            label={t("bodyshop.labels.qbo_usa")}
-                            shouldUpdate
-                            valuePropName="checked"
-                            name={["accountingconfig", "qbo_usa"]}
-                          >
-                            <Switch disabled={!form.getFieldValue(["accountingconfig", "qbo"])} />
-                          </Form.Item>
-                        )}
-                      </Form.Item>
-                    )
-                  }),
-                  <Form.Item
-                    key="qbo_departmentid"
-                    label={t("bodyshop.labels.qbo_departmentid")}
-                    name={["accountingconfig", "qbo_departmentid"]}
-                  >
-                    <Input />
-                  </Form.Item>,
-                  <Form.Item
-                    key="accountingtiers"
-                    label={t("bodyshop.labels.accountingtiers")}
-                    rules={[
-                      {
-                        required: true
-                        //message: t("general.validation.required"),
-                      }
-                    ]}
-                    name={["accountingconfig", "tiers"]}
-                  >
-                    <Radio.Group>
-                      <Radio value={2}>2</Radio>
-                      <Radio value={3}>3</Radio>
-                    </Radio.Group>
-                  </Form.Item>,
-                  <Form.Item key="twotierpref_wrapper" shouldUpdate>
-                    {() => {
-                      return (
-                        <Form.Item
-                          label={t("bodyshop.labels.2tiersetup")}
-                          shouldUpdate
-                          rules={[
-                            {
-                              required: form.getFieldValue(["accountingconfig", "tiers"]) === 2
-                              //message: t("general.validation.required"),
-                            }
-                          ]}
-                          name={["accountingconfig", "twotierpref"]}
-                        >
-                          <Radio.Group disabled={form.getFieldValue(["accountingconfig", "tiers"]) === 3}>
-                            <Radio value="name">{t("bodyshop.labels.2tiername")}</Radio>
-                            <Radio value="source">{t("bodyshop.labels.2tiersource")}</Radio>
-                          </Radio.Group>
-                        </Form.Item>
-                      );
-                    }}
-                  </Form.Item>,
-                  <Form.Item
-                    key="printlater"
-                    label={t("bodyshop.labels.printlater")}
-                    valuePropName="checked"
-                    name={["accountingconfig", "printlater"]}
-                  >
-                    <Switch />
-                  </Form.Item>,
-                  <Form.Item
-                    key="emaillater"
-                    label={t("bodyshop.labels.emaillater")}
-                    valuePropName="checked"
-                    name={["accountingconfig", "emaillater"]}
-                  >
-                    <Switch />
-                  </Form.Item>
-                ]
-              : []),
-            <Form.Item
-              key="inhousevendorid"
-              label={t("bodyshop.fields.inhousevendorid")}
-              name={"inhousevendorid"}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-            >
-              <Input />
-            </Form.Item>,
-            <Form.Item
-              key="default_adjustment_rate"
-              label={t("bodyshop.fields.default_adjustment_rate")}
-              name={"default_adjustment_rate"}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-            >
-              <InputNumber min={0} precision={2} />
-            </Form.Item>,
-            InstanceRenderManager({
-              imex: (
-                <Form.Item key="federal_tax_id" label={t("bodyshop.fields.federal_tax_id")} name="federal_tax_id">
-                  <Input />
-                </Form.Item>
-              )
-            }),
-            <Form.Item key="state_tax_id" label={t("bodyshop.fields.state_tax_id")} name="state_tax_id">
-              <Input />
-            </Form.Item>,
-            ...(HasFeatureAccess({ featureName: "bills", bodyshop })
-              ? [
-                  InstanceRenderManager({
-                    imex: (
-                      <Form.Item
-                        key="invoice_federal_tax_rate"
-                        label={t("bodyshop.fields.invoice_federal_tax_rate")}
-                        name={["bill_tax_rates", "federal_tax_rate"]}
-                        rules={[
-                          {
-                            required: true
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                      >
-                        <InputNumber />
-                      </Form.Item>
-                    )
-                  }),
-                  <Form.Item
-                    key="invoice_state_tax_rate"
-                    label={t("bodyshop.fields.invoice_state_tax_rate")}
-                    name={["bill_tax_rates", "state_tax_rate"]}
-                    rules={[
-                      {
-                        required: true
-                        //message: t("general.validation.required"),
-                      }
-                    ]}
-                  >
-                    <InputNumber />
-                  </Form.Item>,
-                  <Form.Item
-                    key="invoice_local_tax_rate"
-                    label={t("bodyshop.fields.invoice_local_tax_rate")}
-                    name={["bill_tax_rates", "local_tax_rate"]}
-                    rules={[
-                      {
-                        required: true
-                        //message: t("general.validation.required"),
-                      }
-                    ]}
-                  >
-                    <InputNumber />
-                  </Form.Item>
-                ]
-              : []),
-            <Form.Item
-              key="md_payment_types"
-              name={["md_payment_types"]}
-              label={t("bodyshop.fields.md_payment_types")}
-              rules={[
-                {
-                  required: true,
-                  //message: t("general.validation.required"),
-                  type: "array"
-                }
-              ]}
-            >
-              <Select mode="tags" />
-            </Form.Item>,
-            ...(HasFeatureAccess({ featureName: "export", bodyshop })
-              ? [
-                  <Form.Item
-                    key="ReceivableCustomField1"
-                    name={["accountingconfig", "ReceivableCustomField1"]}
-                    label={t("bodyshop.fields.ReceivableCustomField", { number: 1 })}
-                  >
-                    {ReceivableCustomFieldSelect}
-                  </Form.Item>,
-                  <Form.Item
-                    key="ReceivableCustomField2"
-                    name={["accountingconfig", "ReceivableCustomField2"]}
-                    label={t("bodyshop.fields.ReceivableCustomField", { number: 2 })}
-                  >
-                    {ReceivableCustomFieldSelect}
-                  </Form.Item>,
-                  <Form.Item
-                    key="ReceivableCustomField3"
-                    name={["accountingconfig", "ReceivableCustomField3"]}
-                    label={t("bodyshop.fields.ReceivableCustomField", { number: 3 })}
-                  >
-                    {ReceivableCustomFieldSelect}
-                  </Form.Item>,
-                  <Form.Item
-                    key="md_classes"
-                    name={["md_classes"]}
-                    label={t("bodyshop.fields.md_classes")}
-                    rules={[
-                      ({ getFieldValue }) => {
-                        return {
-                          required: getFieldValue("enforce_class"),
-                          //message: t("general.validation.required"),
-                          type: "array"
-                        };
-                      }
-                    ]}
-                  >
-                    <Select mode="tags" />
-                  </Form.Item>,
-                  <Form.Item
-                    key="enforce_class"
-                    name={["enforce_class"]}
-                    label={t("bodyshop.fields.enforce_class")}
-                    valuePropName="checked"
-                  >
-                    <Switch />
-                  </Form.Item>,
-                  ...(ClosingPeriod.treatment === "on"
-                    ? [
-                        <Form.Item
-                          key="ClosingPeriod"
-                          name={["accountingconfig", "ClosingPeriod"]}
-                          label={t("bodyshop.fields.closingperiod")} //{t("reportcenter.labels.dates")}
-                        >
-                          <DatePicker.RangePicker format="MM/DD/YYYY" presets={DatePickerRanges} />
-                        </Form.Item>
-                      ]
-                    : []),
-                  ...(ADPPayroll.treatment === "on"
-                    ? [
-                        <Form.Item
-                          key="companyCode"
-                          name={["accountingconfig", "companyCode"]}
-                          label={t("bodyshop.fields.companycode")}
-                        >
-                          <Input />
-                        </Form.Item>
-                      ]
-                    : []),
-                  ...(ADPPayroll.treatment === "on"
-                    ? [
-                        <Form.Item
-                          key="batchID"
-                          name={["accountingconfig", "batchID"]}
-                          label={t("bodyshop.fields.batchid")}
-                        >
-                          <Input />
-                        </Form.Item>
-                      ]
-                    : [])
-                ]
-              : []),
-            <Form.Item
-              key="accumulatePayableLines"
-              name={["accountingconfig", "accumulatePayableLines"]}
-              label={t("bodyshop.fields.accumulatePayableLines")}
-              valuePropName="checked"
-            >
-              <Switch />
-            </Form.Item>
-          ]}
-        </LayoutFormRow>
        {HasFeatureAccess({ featureName: "export", bodyshop }) && (
          <>
            <LayoutFormRow header={t("bodyshop.labels.responsibilitycenters.costs")} id="costs">
--- a/client/src/components/shop-info/shop-info.speedprint.component.jsx
+++ b/client/src/components/shop-info/shop-info.speedprint.component.jsx
@@ -4,18 +4,10 @@ import { useTranslation } from "react-i18next";
 import { TemplateList } from "../../utils/TemplateConstants";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";

 export default function ShopInfoSpeedPrint() {
  const { t } = useTranslation();
-  const allTemplates = TemplateList("job");
-  const TemplateListGenerated = InstanceRenderManager({
-    imex: Object.fromEntries(
-      Object.entries(allTemplates).filter(([, { enhanced_payroll }]) => !enhanced_payroll)
-    ),
-    rome: allTemplates
-  });
-
+  const TemplateListGenerated = TemplateList("job");
  return (
    <Form.List name={["speedprint"]}>
      {(fields, { add, remove, move }) => {
--- a/client/src/components/tech-header/tech-header.component.jsx
+++ b/client/src/components/tech-header/tech-header.component.jsx
@@ -16,7 +16,7 @@ const mapDispatchToProps = () => ({
 export function TechHeader({ technician }) {
  const { t } = useTranslation();
  return (
-    <Header style={{ textAlign: "center", height: "auto", overflow: "visible" }}>
+    <Header style={{ textAlign: "center" }}>
      <Typography.Title style={{ color: "#fff" }}>
        {technician
          ? t("tech.labels.loggedin", {
--- a/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx
+++ b/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx
@@ -1,5 +1,5 @@
 import { useMutation, useQuery } from "@apollo/client";
-import { Button, Card, Form, InputNumber, Popover, Select, Space } from "antd";
+import { Button, Card, Col, Form, InputNumber, Popover, Row, Select } from "antd";
 import axios from "axios";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -124,97 +124,71 @@ export function TechClockOffButton({
            cost_center: isShiftTicket ? "timetickets.labels.shift" : technician ? technician.cost_center : null
          }}
        >
-          <Space direction="vertical">
-            {!isShiftTicket ? (
-              <div>
-                <Form.Item
-                  label={t("timetickets.fields.actualhrs")}
-                  name="actualhrs"
-                  rules={[
-                    {
-                      required: true
-                      //message: t("general.validation.required"),
-                    }
-                  ]}
-                >
-                  <InputNumber min={0} precision={1} />
-                </Form.Item>
-                <Form.Item
-                  label={t("timetickets.fields.productivehrs")}
-                  name="productivehrs"
-                  rules={[
-                    {
-                      required: true
-                      //message: t("general.validation.required"),
-                    },
-                    ({ getFieldValue }) => ({
-                      validator(rule, value) {
-                        if (!bodyshop.tt_enforce_hours_for_tech_console) {
-                          return Promise.resolve();
-                        }
-                        if (!value || getFieldValue("cost_center") === null || !lineTicketData)
-                          return Promise.resolve();
-                        //Check the cost center,
-                        const totals = CalculateAllocationsTotals(
-                          bodyshop,
-                          lineTicketData.joblines,
-                          lineTicketData.timetickets,
-                          lineTicketData.jobs_by_pk.lbr_adjustments
-                        );
-                        const fieldTypeToCheck =
-                          bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? "mod_lbr_ty" : "cost_center";
-                        const costCenterDiff =
-                          Math.round(
-                            totals.find((total) => total[fieldTypeToCheck] === getFieldValue("cost_center"))
-                              ?.difference * 10
-                          ) / 10;
-                        if (value > costCenterDiff)
-                          return Promise.reject(t("timetickets.validation.hoursenteredmorethanavailable"));
-                        else {
-                          return Promise.resolve();
-                        }
+          <Row gutter={[16, 16]}>
+            <Col span={!isShiftTicket ? 8 : 24}>
+              {!isShiftTicket ? (
+                <div>
+                  <Form.Item
+                    label={t("timetickets.fields.actualhrs")}
+                    name="actualhrs"
+                    rules={[
+                      {
+                        required: true
+                        //message: t("general.validation.required"),
                      }
-                    })
-                  ]}
-                >
-                  <InputNumber min={0} precision={1} />
-                </Form.Item>
-              </div>
-            ) : null}
-            <Form.Item
-              name="cost_center"
-              label={t("timetickets.fields.cost_center")}
-              rules={[
-                {
-                  required: true
-                  //message: t("general.validation.required"),
-                }
-              ]}
-            >
-              <Select disabled={isShiftTicket}>
-                {isShiftTicket ? (
-                  <Select.Option value="timetickets.labels.shift">{t("timetickets.labels.shift")}</Select.Option>
-                ) : (
-                  emps &&
-                  emps.rates.map((item) => (
-                    <Select.Option key={item.cost_center}>
-                      {item.cost_center === "timetickets.labels.shift"
-                        ? t(item.cost_center)
-                        : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
-                          ? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
-                          : item.cost_center}
-                    </Select.Option>
-                  ))
-                )}
-              </Select>
-            </Form.Item>
-            {isShiftTicket ? (
-              <div></div>
-            ) : (
+                    ]}
+                  >
+                    <InputNumber min={0} precision={1} />
+                  </Form.Item>
+                  <Form.Item
+                    label={t("timetickets.fields.productivehrs")}
+                    name="productivehrs"
+                    rules={[
+                      {
+                        required: true
+                        //message: t("general.validation.required"),
+                      },
+                      ({ getFieldValue }) => ({
+                        validator(rule, value) {
+                          if (!bodyshop.tt_enforce_hours_for_tech_console) {
+                            return Promise.resolve();
+                          }
+                          if (!value || getFieldValue("cost_center") === null || !lineTicketData)
+                            return Promise.resolve();
+
+                          //Check the cost center,
+                          const totals = CalculateAllocationsTotals(
+                            bodyshop,
+                            lineTicketData.joblines,
+                            lineTicketData.timetickets,
+                            lineTicketData.jobs_by_pk.lbr_adjustments
+                          );
+
+                          const fieldTypeToCheck =
+                            bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? "mod_lbr_ty" : "cost_center";
+
+                          const costCenterDiff =
+                            Math.round(
+                              totals.find((total) => total[fieldTypeToCheck] === getFieldValue("cost_center"))
+                                ?.difference * 10
+                            ) / 10;
+
+                          if (value > costCenterDiff)
+                            return Promise.reject(t("timetickets.validation.hoursenteredmorethanavailable"));
+                          else {
+                            return Promise.resolve();
+                          }
+                        }
+                      })
+                    ]}
+                  >
+                    <InputNumber min={0} precision={1} />
+                  </Form.Item>
+                </div>
+              ) : null}
              <Form.Item
-                name="status"
-                label={t("jobs.fields.status")}
-                initialValue={lineTicketData && lineTicketData.jobs_by_pk.status}
+                name="cost_center"
+                label={t("timetickets.fields.cost_center")}
                rules={[
                  {
                    required: true
@@ -222,32 +196,67 @@ export function TechClockOffButton({
                  }
                ]}
              >
-                <Select>
-                  {bodyshop.md_ro_statuses.production_statuses.map((item) => (
-                    <Select.Option key={item}></Select.Option>
-                  ))}
+                <Select disabled={isShiftTicket}>
+                  {isShiftTicket ? (
+                    <Select.Option value="timetickets.labels.shift">{t("timetickets.labels.shift")}</Select.Option>
+                  ) : (
+                    emps &&
+                    emps.rates.map((item) => (
+                      <Select.Option key={item.cost_center}>
+                        {item.cost_center === "timetickets.labels.shift"
+                          ? t(item.cost_center)
+                          : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                            ? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
+                            : item.cost_center}
+                      </Select.Option>
+                    ))
+                  )}
                </Select>
              </Form.Item>
-            )}
-            <Button type="primary" htmlType="submit" loading={loading}>
-              {t("general.actions.save")}
-            </Button>
-            <TechJobClockoutDelete completedCallback={completedCallback} timeTicketId={timeTicketId} />
+
+              {isShiftTicket ? (
+                <div></div>
+              ) : (
+                <Form.Item
+                  name="status"
+                  label={t("jobs.fields.status")}
+                  initialValue={lineTicketData && lineTicketData.jobs_by_pk.status}
+                  rules={[
+                    {
+                      required: true
+                      //message: t("general.validation.required"),
+                    }
+                  ]}
+                >
+                  <Select>
+                    {bodyshop.md_ro_statuses.production_statuses.map((item) => (
+                      <Select.Option key={item}></Select.Option>
+                    ))}
+                  </Select>
+                </Form.Item>
+              )}
+              <Button type="primary" htmlType="submit" loading={loading}>
+                {t("general.actions.save")}
+              </Button>
+              <TechJobClockoutDelete completedCallback={completedCallback} timeTicketId={timeTicketId} />
+            </Col>
            {!isShiftTicket && (
-              <LaborAllocationContainer jobid={jobId || null} loading={queryLoading} lineTicketData={lineTicketData} />
+              <Col span={16}>
+                <LaborAllocationContainer
+                  jobid={jobId || null}
+                  loading={queryLoading}
+                  lineTicketData={lineTicketData}
+                />
+              </Col>
            )}
-          </Space>
+          </Row>
        </Form>
      </div>
    </Card>
  );

  return (
-    <Popover 
-      content={<div style={{ maxHeight: "75vh", overflowY: "auto" }}>{overlay}</div>} 
-      trigger="click"
-      getPopupContainer={() => document.querySelector('#time-ticket-modal')}
-    >
+    <Popover content={overlay} trigger="click">
      <Button loading={loading} {...otherBtnProps}>
        {t("timetickets.actions.clockout")}
      </Button>
--- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
@@ -1,7 +1,6 @@
 import { useLazyQuery } from "@apollo/client";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Card, Form, Input, InputNumber, Select, Space, Switch } from "antd";
-import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -34,9 +33,7 @@ export function TimeTicketModalComponent({
  authLevel,
  employeeAutoCompleteOptions,
  disabled,
-  employeeSelectDisabled,
-  lineTicketRefreshKey,
-  isOpen
+  employeeSelectDisabled
 }) {
  const { t } = useTranslation();
  const {
@@ -51,18 +48,6 @@ export function TimeTicketModalComponent({
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only"
  });
-
-  // Watch the jobid field so we can refetch the bottom section without relying on jobid changes
-  const watchedJobId = Form.useWatch("jobid", form);
-
-  useEffect(() => {
-    if (!isOpen) return;
-    if (!watchedJobId) return;
-    if (!lineTicketRefreshKey) return;
-
-    loadLineTicketData({ variables: { id: watchedJobId } });
-  }, [lineTicketRefreshKey, watchedJobId, isOpen]);
-
  const CostCenterSelect = ({ emps, value, ...props }) => {
    return (
      <Select
@@ -319,7 +304,6 @@ export function TimeTicketModalComponent({
          )}
        </Form.Item>
      </LayoutFormRow>
-
      <Form.Item dependencies={["jobid"]}>
        {() => {
          const jobid = form.getFieldValue("jobid");
--- a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
@@ -29,9 +29,6 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
  const [loading, setLoading] = useState(false);
  const { t } = useTranslation();
  const [enterAgain, setEnterAgain] = useState(false);
-
-  const [lineTicketRefreshKey, setLineTicketRefreshKey] = useState(0);
-
  const [insertTicket] = useMutation(INSERT_NEW_TIME_TICKET);
  const [updateTicket] = useMutation(UPDATE_TIME_TICKET);
  const {
@@ -88,17 +85,11 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
    notification["success"]({
      message: t("timetickets.successes.created")
    });
-
-    // Refresh parent screens (Job Labor tab, etc.)
    if (timeTicketModal.actions.refetch) timeTicketModal.actions.refetch();
-
-    // Refresh the modal "bottom section" (allocations + embedded ticket list) for the current job
-    setLineTicketRefreshKey((k) => k + 1);
-
    if (enterAgain) {
-      // Capture existing information and repopulate it.
-      // (Include jobid so Save & New stays on the same RO if it was selected in-form.)
-      const prev = form.getFieldsValue(["jobid", "date", "employeeid", "flat_rate"]);
+      //Capture the existing information and repopulate it.
+
+      const prev = form.getFieldsValue(["date", "employeeid", "flat_rate"]);

      form.resetFields();

@@ -238,7 +229,6 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
            </Space>
          }
        />
-
        <TimeTicketModalComponent
          isEdit={timeTicketModal.context.id}
          form={form}
@@ -248,8 +238,6 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
            timeTicketModal.context?.timeticket?.committed_at ||
            (timeTicketModal.context?.timeticket?.employeeid && !timeTicketModal.context.id ? true : false)
          }
-          lineTicketRefreshKey={lineTicketRefreshKey}
-          isOpen={timeTicketModal.open}
        />
      </Form>
    </Modal>
--- a/client/src/firebase/firebase.utils.js
+++ b/client/src/firebase/firebase.utils.js
@@ -5,7 +5,7 @@ import { getFirestore } from "@firebase/firestore";
 import { getMessaging, getToken, onMessage } from "@firebase/messaging";
 import { store } from "../redux/store";
 //import * as amplitude from '@amplitude/analytics-browser';
-// import posthog from 'posthog-js'
+import posthog from 'posthog-js'

 const config = JSON.parse(import.meta.env.VITE_APP_FIREBASE_CONFIG);
 initializeApp(config);
@@ -74,6 +74,7 @@ onMessage(messaging, (payload) => {

 export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
  try {
+
    const state = stateProp || store.getState();

    const eventParams = {
@@ -98,7 +99,8 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
    // );
    logEvent(analytics, eventName, eventParams);
    //amplitude.track(eventName, eventParams);
-    //posthog.capture(eventName, eventParams);
+    posthog.capture(eventName, eventParams);
+
  } finally {
    //If it fails, just keep going.
  }
--- a/client/src/graphql/appointments.queries.js
+++ b/client/src/graphql/appointments.queries.js
@@ -40,8 +40,6 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
        ownr_fn
        ownr_ph1
        ownr_ph2
-        ownr_ph1_ty
-        ownr_ph2_ty
        ownr_ea
        clm_total
        id
--- a/client/src/graphql/conversations.queries.js
+++ b/client/src/graphql/conversations.queries.js
@@ -2,27 +2,7 @@ import { gql } from "@apollo/client";

 export const UNREAD_CONVERSATION_COUNT = gql`
  query UNREAD_CONVERSATION_COUNT {
-    # How many conversations have at least one unread inbound, non-system message
-    conversations_aggregate(
-      where: {
-        archived: { _eq: false }
-        messages: { read: { _eq: false }, isoutbound: { _eq: false }, is_system: { _eq: false } }
-      }
-    ) {
-      aggregate {
-        count
-      }
-    }
-
-    # How many unread inbound, non-system messages exist (excluding archived conversations)
-    messages_aggregate(
-      where: {
-        read: { _eq: false }
-        isoutbound: { _eq: false }
-        is_system: { _eq: false }
-        conversation: { archived: { _eq: false } }
-      }
-    ) {
+    messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false } }) {
      aggregate {
        count
      }
@@ -39,7 +19,7 @@ export const CONVERSATION_LIST_QUERY = gql`
      unreadcnt
      archived
      label
-      messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false }, is_system: { _eq: false } }) {
+      messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false } }) {
        aggregate {
          count
        }
@@ -61,7 +41,6 @@ export const CONVERSATION_SUBSCRIPTION_BY_PK = gql`
  subscription CONVERSATION_SUBSCRIPTION_BY_PK($conversationId: uuid!) {
    messages(order_by: { created_at: asc_nulls_first }, where: { conversationid: { _eq: $conversationId } }) {
      id
-      conversationid
      status
      text
      is_system
@@ -97,7 +76,6 @@ export const GET_CONVERSATION_DETAILS = gql`
      }
      messages(order_by: { created_at: asc_nulls_first }) {
        id
-        conversationid
        status
        text
        is_system
@@ -132,7 +110,7 @@ export const CONVERSATION_ID_BY_PHONE = gql`
          ro_number
        }
      }
-      messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false }, is_system: { _eq: false } }) {
+      messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false } }) {
        aggregate {
          count
        }
@@ -161,7 +139,7 @@ export const CREATE_CONVERSATION = gql`
            ro_number
          }
        }
-        messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false }, is_system: { _eq: false } }) {
+        messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false } }) {
          aggregate {
            count
          }
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -19,9 +19,7 @@ export const QUERY_ALL_ACTIVE_JOBS_PAGINATED = gql`
      ownr_ln
      ownr_co_nm
      ownr_ph1
-      ownr_ph1_ty
      ownr_ph2
-      ownr_ph2_ty
      ownr_ea
      ownerid
      comment
@@ -71,8 +69,6 @@ export const QUERY_ALL_ACTIVE_JOBS = gql`
      ownr_co_nm
      ownr_ph1
      ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
      ownr_ea
      ownerid
      comment
@@ -126,8 +122,6 @@ export const QUERY_PARTS_QUEUE = gql`
      ownr_co_nm
      ownr_ph1
      ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
      ownr_ea
      plate_no
      plate_st
@@ -185,8 +179,6 @@ export const QUERY_EXACT_JOB_IN_PRODUCTION = gql`
      clm_total
      ownr_ph1
      ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
      special_coverage_policy
      owner_owing
      production_vars
@@ -257,8 +249,6 @@ export const QUERY_EXACT_JOBS_IN_PRODUCTION = gql`
      clm_total
      ownr_ph1
      ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
      special_coverage_policy
      owner_owing
      production_vars
@@ -625,8 +615,6 @@ export const GET_JOB_BY_PK = gql`
        ownr_ln
        ownr_ph1
        ownr_ph2
-        ownr_ph1_ty
-        ownr_ph2_ty
        ownr_st
        ownr_zip
        tax_number
@@ -643,8 +631,6 @@ export const GET_JOB_BY_PK = gql`
      ownr_ln
      ownr_ph1
      ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
      ownr_st
      ownr_zip
      parts_tax_rates
@@ -728,7 +714,7 @@ export const GET_JOB_BY_PK = gql`
      v_model_yr
      v_model_desc
      v_vin
-      notes(where: { pinned: { _eq: true } }, order_by: { updated_at: desc }) {
+      notes(where:{pinned: {_eq: true}}, order_by: {updated_at: desc}) {
        created_at
        created_by
        critical
@@ -844,8 +830,6 @@ export const QUERY_JOB_CARD_DETAILS = gql`
      ownr_co_nm
      ownr_ph1
      ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
      comment
      ownr_ea
      ca_gst_registrant
@@ -1016,6 +1000,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
        key
        type
      }
+
    }
  }
 `;
@@ -1111,7 +1096,6 @@ export const UPDATE_JOB = gql`
        scheduled_completion
        scheduled_delivery
        actual_in
-        actual_completion
        date_repairstarted
        date_void
        date_lost_sale
@@ -1246,8 +1230,6 @@ export const GET_JOB_INFO_FOR_STRIPE = gql`
      ownr_co_nm
      ownr_ph1
      ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
      ownr_ea
    }
  }
@@ -1461,10 +1443,8 @@ export const QUERY_JOB_FOR_DUPE = gql`
      ownr_ln
      ownr_ph1
      ownr_ph1x
-      ownr_ph1_ty
      ownr_ph2
      ownr_ph2x
-      ownr_ph2_ty
      ownr_st
      ownr_title
      ownr_zip
@@ -1710,10 +1690,8 @@ export const QUERY_ALL_JOB_FIELDS = gql`
      ownr_ln
      ownr_ph1
      ownr_ph1x
-      ownr_ph1_ty
      ownr_ph2
      ownr_ph2x
-      ownr_ph2_ty
      ownr_st
      ownr_title
      ownr_zip
@@ -1851,8 +1829,6 @@ export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
      ownr_co_nm
      ownr_ph1
      ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
      plate_no
      plate_st
      v_vin
@@ -1893,8 +1869,6 @@ export const QUERY_SIMPLIFIED_PARTS_PAGINATED_STATUS_FILTERED = gql`
      ownr_co_nm
      ownr_ph1
      ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
      plate_no
      plate_st
      v_vin
@@ -2143,8 +2117,6 @@ export const GET_JOB_FOR_CC_CONTRACT = gql`
      ownr_zip
      ownr_ph1
      ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
    }
  }
 `;
@@ -2443,7 +2415,7 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
        start
        status
      }
-      notes(where: { pinned: { _eq: true } }, order_by: { updated_at: desc }) {
+      notes(where:{pinned: {_eq: true}}, order_by: {updated_at: desc}) {
        created_at
        created_by
        critical
@@ -2531,8 +2503,6 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
      ownr_ln
      ownr_ph1
      ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
      owner {
        id
        preferred_contact
@@ -2622,7 +2592,6 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
      vehicleid
      plate_no
      actual_in
-      actual_completion
      scheduled_completion
      scheduled_delivery
      date_last_contacted
@@ -2631,8 +2600,6 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
      clm_total
      ownr_ph1
      ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
      special_coverage_policy
      owner_owing
      production_vars
--- a/client/src/graphql/owners.queries.js
+++ b/client/src/graphql/owners.queries.js
@@ -8,8 +8,6 @@ export const QUERY_SEARCH_OWNER_BY_IDX = gql`
      ownr_co_nm
      ownr_ph1
      ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
      ownr_addr1
      ownr_addr2
      ownr_city
@@ -59,10 +57,8 @@ export const QUERY_OWNER_BY_ID = gql`
      ownr_ea
      ownr_fn
      ownr_ph1
-      ownr_ph1_ty
      ownr_ln
      ownr_ph2
-      ownr_ph2_ty
      ownr_st
      ownr_title
      ownr_zip
@@ -116,10 +112,8 @@ export const QUERY_ALL_OWNERS = gql`
      ownr_ea
      ownr_fn
      ownr_ph1
-      ownr_ph1_ty
      ownr_ln
      ownr_ph2
-      ownr_ph2_ty
      ownr_st
      ownr_title
      ownr_zip
@@ -142,10 +136,8 @@ export const QUERY_ALL_OWNERS_PAGINATED = gql`
      ownr_ea
      ownr_fn
      ownr_ph1
-      ownr_ph1_ty
      ownr_ln
      ownr_ph2
-      ownr_ph2_ty
      ownr_st
      ownr_title
      ownr_zip
@@ -172,10 +164,8 @@ export const QUERY_OWNER_FOR_JOB_CREATION = gql`
      ownr_ea
      ownr_fn
      ownr_ph1
-      ownr_ph1_ty
      ownr_ln
      ownr_ph2
-      ownr_ph2_ty
      ownr_st
      ownr_title
      ownr_zip
--- a/client/src/graphql/parts-orders.queries.js
+++ b/client/src/graphql/parts-orders.queries.js
@@ -177,12 +177,10 @@ export const QUERY_PARTS_ORDER_OEC = gql`
        ownr_fax
        ownr_faxx
        ownr_ph1
-        ownr_ph1_ty
        ownr_fn
        ownr_ln
        ownr_ph1x
        ownr_ph2
-        ownr_ph2_ty
        ownr_ph2x
        ownr_st
        ownr_title
--- a/client/src/graphql/search.queries.js
+++ b/client/src/graphql/search.queries.js
@@ -22,8 +22,6 @@ export const GLOBAL_SEARCH_QUERY = gql`
      ownr_co_nm
      ownr_ph1
      ownr_ph2
-      ownr_ph1_ty
-      ownr_ph2_ty
    }
    search_vehicles(args: { search: $search }, limit: 25) {
      id
--- a/client/src/pages/dms/dms.container.jsx
+++ b/client/src/pages/dms/dms.container.jsx
@@ -21,6 +21,8 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -54,6 +56,14 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
  const search = queryString.parse(useLocation().search);
  const { jobId } = search;
  const notification = useNotification();
+  const {
+    treatments: { Fortellis }
+  } = useSplitTreatments({
+    attributes: {},
+    names: ["Fortellis"],
+    splitKey: bodyshop.imexshopid
+  });
+  const { socket: wsssocket } = useSocket();

  const { loading, error, data } = useQuery(QUERY_JOB_EXPORT_DMS, {
    variables: { id: jobId },
@@ -84,45 +94,75 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
  }, [t, setBreadcrumbs, setSelectedHeader]);

  useEffect(() => {
-    socket.on("connect", () => socket.emit("set-log-level", logLevel));
-    socket.on("reconnect", () => {
-      setLogs((logs) => {
-        return [
-          ...logs,
-          {
-            timestamp: new Date(),
-            level: "warn",
-            message: "Reconnected to CDK Export Service"
-          }
-        ];
-      });
-    });
-    socket.on("connect_error", (err) => {
-      console.log(`connect_error due to ${err}`, err);
-      notification.error({ message: err.message });
-    });
-    socket.on("log-event", (payload) => {
-      setLogs((logs) => {
-        return [...logs, payload];
-      });
-    });
-    socket.on("export-success", (payload) => {
-      notification.success({
-        message: t("jobs.successes.exported")
-      });
-      insertAuditTrail({
-        jobid: payload,
-        operation: AuditTrailMapping.jobexported(),
-        type: "jobexported"
-      });
-      history("/manage/accounting/receivables");
-    });
+    if (Fortellis.treatment === "on") {
+      wsssocket.emit("set-log-level", logLevel);

-    if (socket.disconnected) socket.connect();
-    return () => {
-      socket.removeAllListeners();
-      socket.disconnect();
-    };
+      const handleLogEvent = (payload) => {
+        setLogs((logs) => {
+          return [...logs, payload];
+        });
+      };
+
+      const handleExportSuccess = (payload) => {
+        notification.success({
+          message: t("jobs.successes.exported")
+        });
+        insertAuditTrail({
+          jobid: payload,
+          operation: AuditTrailMapping.jobexported(),
+          type: "jobexported"
+        });
+        history("/manage/accounting/receivables");
+      };
+
+      wsssocket.on("fortellis-log-event", handleLogEvent);
+      wsssocket.on("export-success", handleExportSuccess);
+
+      return () => {
+        wsssocket.off("fortellis-log-event", handleLogEvent);
+        wsssocket.off("export-success", handleExportSuccess);
+      };
+    } else {
+      socket.on("connect", () => socket.emit("set-log-level", logLevel));
+      socket.on("reconnect", () => {
+        setLogs((logs) => {
+          return [
+            ...logs,
+            {
+              timestamp: new Date(),
+              level: "warn",
+              message: "Reconnected to CDK Export Service"
+            }
+          ];
+        });
+      });
+      socket.on("connect_error", (err) => {
+        console.log(`connect_error due to ${err}`, err);
+        notification.error({ message: err.message });
+      });
+      socket.on("log-event", (payload) => {
+        setLogs((logs) => {
+          return [...logs, payload];
+        });
+      });
+      socket.on("export-success", (payload) => {
+        notification.success({
+          message: t("jobs.successes.exported")
+        });
+        insertAuditTrail({
+          jobid: payload,
+          operation: AuditTrailMapping.jobexported(),
+          type: "jobexported"
+        });
+        history("/manage/accounting/receivables");
+      });
+
+      if (socket.disconnected) socket.connect();
+      return () => {
+        socket.removeAllListeners();
+        socket.disconnect();
+      };
+    }
  }, []);

  if (loading) return <LoadingSpinner />;
@@ -136,6 +176,9 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse

  return (
    <div>
+      {Fortellis.treatment === "on" && (
+        <AlertComponent message="Posting to Fortellis" type="warning" showIcon closable />
+      )}
      <Row gutter={[16, 16]}>
        <Col md={24} lg={10}>
          <DmsAllocationsSummary
@@ -157,7 +200,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
          <DmsPostForm socket={socket} jobId={jobId} job={data && data.jobs_by_pk} logsRef={logsRef} />
        </Col>

-        <DmsCustomerSelector />
+        <DmsCustomerSelector jobid={jobId} />

        <Col span={24}>
          <div ref={logsRef}>
@@ -182,8 +225,13 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
                  <Button
                    onClick={() => {
                      setLogs([]);
-                      socket.disconnect();
-                      socket.connect();
+                      if (Fortellis.treatment === "on") {
+                        wsssocket.disconnect();
+                        wsssocket.connect();
+                      } else {
+                        socket.disconnect();
+                        socket.connect();
+                      }
                    }}
                  >
                    Reconnect
--- a/client/src/pages/jobs-create/jobs-create.container.jsx
+++ b/client/src/pages/jobs-create/jobs-create.container.jsx
@@ -9,23 +9,21 @@ import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { INSERT_NEW_JOB } from "../../graphql/jobs.queries";
 import { QUERY_OWNER_FOR_JOB_CREATION } from "../../graphql/owners.queries";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
-import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import JobsCreateComponent from "./jobs-create.component";
 import JobCreateContext from "./jobs-create.context";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-  currentUser: selectCurrentUser
+  bodyshop: selectBodyshop
 });
 const mapDispatchToProps = (dispatch) => ({
  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
  setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
 });

-function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, currentUser }) {
+function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
  const { t } = useTranslation();
  const notification = useNotification();

@@ -76,7 +74,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, curr
  }, [t, setBreadcrumbs, setSelectedHeader]);

  const runInsertJob = (job) => {
-    insertJob({ variables: { job } })
+    insertJob({ variables: { job: job } })
      .then((resp) => {
        setState({
          ...state,
@@ -152,11 +150,6 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, curr
    if (job.owner === null) delete job.owner;
    if (job.vehicle === null) delete job.vehicle;

-    // Associate to the current user if one exists
-    if (currentUser?.email) {
-      job.created_user_email = currentUser.email;
-    }
-
    runInsertJob(job);
  };

--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -50,7 +50,7 @@ import {
 } from "./user.actions";
 import UserActionTypes from "./user.types";
 //import * as amplitude from '@amplitude/analytics-browser';
-import posthog from "posthog-js";
+import posthog from 'posthog-js';

 const fpPromise = FingerprintJS.load();

@@ -239,13 +239,22 @@ export function* signInSuccessSaga({ payload }) {

  try {
    window.$crisp.push(["set", "user:nickname", [payload.displayName || payload.email]]);
+    const currentUserSegment = InstanceRenderManager({
+      imex: "imex-online-user",
+      rome: "rome-online-user"
+    });
+    window.$crisp.push(["set", "session:segments", [[currentUserSegment]]]);

    InstanceRenderManager({
      executeFunction: true,
      args: [],
+      imex: () => {
+        window.$crisp.push(["set", "session:segments", [["imex"]]]);
+      },
      rome: () => {
        window.$zoho.salesiq.visitor.name(payload.displayName || payload.email);
        window.$zoho.salesiq.visitor.email(payload.email);
+        window.$crisp.push(["set", "session:segments", [["rome"]]]);
      }
    });

@@ -253,20 +262,18 @@ export function* signInSuccessSaga({ payload }) {
    try {
      const state = yield select();
      const isParts = state?.application?.isPartsEntry === true;
-      const instanceSeg = InstanceRenderManager({
-        imex: ["imex-online-user", "imex"],
-        rome: ["rome-online-user", "rome"]
-      });
+      const instanceSeg = InstanceRenderManager({ imex: "imex", rome: "rome" });
      // Always ensure segments include instance + user, and append partsManagement if applicable
      const segs = [
-        ...instanceSeg,
+        currentUserSegment,
+        instanceSeg,
        ...(isParts
          ? [
-              InstanceRenderManager({
-                imex: "ImexPartsManagement",
-                rome: "RomePartsManagement"
-              })
-            ]
+            InstanceRenderManager({
+              imex: "ImexPartsManagement",
+              rome: "RomePartsManagement"
+            })
+          ]
          : [])
      ];
      window.$crisp.push(["set", "session:segments", [segs]]);
@@ -366,39 +373,22 @@ export function* SetAuthLevelFromShopDetails({ payload }) {

      // Build consolidated Crisp segments including instance, region, features, and parts mode
      const isParts = yield select((state) => state.application.isPartsEntry === true);
-      const instanceSeg = InstanceRenderManager({
-        imex: ["imex-online-user", "imex"],
-        rome: ["rome-online-user", "rome"]
-      });
+      const instanceSeg = InstanceRenderManager({ imex: "imex", rome: "rome" });

-      const featureSegments =
-        payload.features?.allAccess === true
-          ? ["allAccess"]
-          : [
-              "basic",
-              ...Object.keys(payload.features).filter(
-                (key) =>
-                  payload.features[key] === true ||
-                  (typeof payload.features[key] === "string" && !isNaN(Date.parse(payload.features[key])))
-              )
-            ];
-
-      const additionalSegments = [
-        payload.cdk_dealerid && "CDK",
-        payload.pbs_serialnumber && "PBS",
-        // payload.rr_dealerid && "Reynolds",
-        payload.accountingconfig.qbo === true && "QBO",
-        payload.accountingconfig.qbo === false &&
-          !payload.cdk_dealerid &&
-          !payload.pbs_serialnumber &&
-          // !payload.rr_dealerid &&
-          "QBD"
-      ].filter(Boolean);
-
-      featureSegments.push(...additionalSegments);
+      let featureSegments;
+      if (payload.features?.allAccess === true) {
+        featureSegments = ["allAccess"];
+      } else {
+        const featureKeys = Object.keys(payload.features).filter(
+          (key) =>
+            payload.features[key] === true ||
+            (typeof payload.features[key] === "string" && !isNaN(Date.parse(payload.features[key])))
+        );
+        featureSegments = ["basic", ...featureKeys];
+      }

      const regionSeg = payload.region_config ? `region:${payload.region_config}` : null;
-      const segments = [...instanceSeg, ...(regionSeg ? [regionSeg] : []), ...featureSegments];
+      const segments = [instanceSeg, ...(regionSeg ? [regionSeg] : []), ...featureSegments];
      if (isParts) {
        segments.push(InstanceRenderManager({ imex: "ImexPartsManagement", rome: "RomePartsManagement" }));
      }
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -277,8 +277,7 @@
      "errors": {
        "creatingdefaultview": "Error creating default view.",
        "loading": "Unable to load shop details. Please call technical support.",
-        "saving": "Error encountered while saving. {{message}}",
-        "duplicate_insurance_company": "Duplicate insurance company name. Each insurance company name must be unique"
+        "saving": "Error encountered while saving. {{message}}"
      },
      "fields": {
        "ReceivableCustomField": "QBO Receivable Custom Field {{number}}",
@@ -1271,7 +1270,6 @@
        "vehicle": "Vehicle"
      },
      "labels": {
-        "selected": "Selected",
        "settings": "Settings",
        "actions": "Actions",
        "areyousure": "Are you sure?",
@@ -1493,8 +1491,7 @@
        "assign_team": "Assign Team",
        "converttolabor": "Convert amount to Labor.",
        "dispatchparts": "Dispatch Parts ({{count}})",
-        "new": "New Line",
-        "updatelocation": "Update Location"
+        "new": "New Line"
      },
      "errors": {
        "creating": "Error encountered while creating job line.  {{message}}",
@@ -1575,8 +1572,7 @@
        "ioucreated": "IOU",
        "new": "New Line",
        "nostatus": "No Status",
-        "presets": "Jobline Presets",
-        "bulk_location_help": "This will set the same location on all selected lines."
+        "presets": "Jobline Presets"
      },
      "successes": {
        "created": "Job line created successfully.",
@@ -2434,8 +2430,7 @@
        "selectmedia": "Select Media",
        "sentby": "Sent by {{by}} at {{time}}",
        "typeamessage": "Send a message...",
-        "unarchive": "Unarchive",
-        "mark_unread": "Mark as unread"
+        "unarchive": "Unarchive"
      },
      "render": {
        "conversation_list": "Conversation List"
@@ -2595,10 +2590,7 @@
        "fromclaim": "Current Claim",
        "fromowner": "Historical Owner Record",
        "relatedjobs": "Related Jobs",
-        "updateowner": "Update Owner",
-        "work": "Work",
-        "home": "Home",
-        "cell": "Cell"
+        "updateowner": "Update Owner"
      },
      "successes": {
        "delete": "Owner deleted successfully.",
@@ -2958,8 +2950,6 @@
        "settings": "Error saving board settings: {{error}}"
      },
      "labels": {
-        "click_for_statuses": "Click to view parts statuses",
-        "partsreceived": "Parts Received",
        "actual_in": "Actual In",
        "addnewprofile": "Add New Profile",
        "alert": "Alert",
@@ -3219,7 +3209,6 @@
        "parts_not_recieved_vendor": "Parts Not Received by Vendor",
        "parts_received_not_scheduled": "Parts Received for Jobs Not Scheduled",
        "payments_by_date": "Payments by Date",
-        "payments_by_date_excel": "Payments by Date - Excel",
        "payments_by_date_payment": "Payments by Date and Payment Type",
        "payments_by_date_type": "Payments by Date and Customer Type",
        "production_by_category": "Production by Category",
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -277,8 +277,7 @@
      "errors": {
        "creatingdefaultview": "",
        "loading": "No se pueden cargar los detalles de la tienda. Por favor llame al soporte técnico.",
-        "saving": "",
-        "duplicate_insurance_company": ""
+        "saving": ""
      },
      "fields": {
        "ReceivableCustomField": "",
@@ -1271,7 +1270,6 @@
        "vehicle": ""
      },
      "labels": {
-        "selected": "",
        "actions": "Comportamiento",
        "settings": "",
        "areyousure": "",
@@ -1493,8 +1491,7 @@
        "assign_team": "",
        "converttolabor": "",
        "dispatchparts": "",
-        "new": "",
-        "updatelocation": ""
+        "new": ""
      },
      "errors": {
        "creating": "",
@@ -1575,8 +1572,7 @@
        "ioucreated": "",
        "new": "Nueva línea",
        "nostatus": "",
-        "presets": "",
-        "bulk_location_help": ""
+        "presets": ""
      },
      "successes": {
        "created": "",
@@ -2434,8 +2430,7 @@
        "selectmedia": "",
        "sentby": "",
        "typeamessage": "Enviar un mensaje...",
-        "unarchive": "",
-        "mark_unread": ""
+        "unarchive": ""
      },
      "render": {
        "conversation_list": ""
@@ -2595,10 +2590,7 @@
        "fromclaim": "",
        "fromowner": "",
        "relatedjobs": "",
-        "updateowner": "",
-        "work": "",
-        "home": "",
-        "cell": ""
+        "updateowner": ""
      },
      "successes": {
        "delete": "",
@@ -2958,8 +2950,6 @@
        "settings": ""
      },
      "labels": {
-        "click_for_statuses": "",
-        "partsreceived": "",
        "actual_in": "",
        "addnewprofile": "",
        "alert": "",
@@ -3219,7 +3209,6 @@
        "parts_not_recieved_vendor": "",
        "parts_received_not_scheduled": "",
        "payments_by_date": "",
-        "payments_by_date_excel": "",
        "payments_by_date_payment": "",
        "payments_by_date_type": "",
        "production_by_category": "",
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -277,8 +277,7 @@
      "errors": {
        "creatingdefaultview": "",
        "loading": "Impossible de charger les détails de la boutique. Veuillez appeler le support technique.",
-        "saving": "",
-        "duplicate_insurance_company": ""
+        "saving": ""
      },
      "fields": {
        "ReceivableCustomField": "",
@@ -1271,7 +1270,6 @@
        "vehicle": ""
      },
      "labels": {
-        "selected": "",
        "settings": "",
        "actions": "actes",
        "areyousure": "",
@@ -1493,8 +1491,7 @@
        "assign_team": "",
        "converttolabor": "",
        "dispatchparts": "",
-        "new": "",
-        "updatelocation": ""
+        "new": ""
      },
      "errors": {
        "creating": "",
@@ -1575,8 +1572,7 @@
        "ioucreated": "",
        "new": "Nouvelle ligne",
        "nostatus": "",
-        "presets": "",
-        "bulk_location_help": ""
+        "presets": ""
      },
      "successes": {
        "created": "",
@@ -2434,8 +2430,7 @@
        "selectmedia": "",
        "sentby": "",
        "typeamessage": "Envoyer un message...",
-        "unarchive": "",
-        "mark_unread": ""
+        "unarchive": ""
      },
      "render": {
        "conversation_list": ""
@@ -2595,10 +2590,7 @@
        "fromclaim": "",
        "fromowner": "",
        "relatedjobs": "",
-        "updateowner": "",
-        "work": "",
-        "home": "",
-        "cell": ""
+        "updateowner": ""
      },
      "successes": {
        "delete": "",
@@ -2958,8 +2950,6 @@
        "settings": ""
      },
      "labels": {
-        "click_for_statuses": "",
-        "partsreceived": "",
        "actual_in": "",
        "addnewprofile": "",
        "alert": "",
@@ -3219,7 +3209,6 @@
        "parts_not_recieved_vendor": "",
        "parts_received_not_scheduled": "",
        "payments_by_date": "",
-        "payments_by_date_excel": "",
        "payments_by_date_payment": "",
        "payments_by_date_type": "",
        "production_by_category": "",
--- a/client/src/utils/GraphQLClient.js
+++ b/client/src/utils/GraphQLClient.js
@@ -148,26 +148,6 @@ const cache = new InMemoryCache({
    Query: {
      fields: {
        // Note: This is required because we switch from a read to an unread state with a toggle,
-        conversations: {
-          keyArgs: ["where", "order_by"], // keep separate caches for archived/unarchived + sort
-          merge(existing = [], incoming = [], { args, readField }) {
-            const offset = args?.offset ?? 0;
-            const merged = existing ? existing.slice(0) : [];
-
-            for (let i = 0; i < incoming.length; i++) {
-              merged[offset + i] = incoming[i];
-            }
-
-            // Deduplicate by id (important when you also upsert via sockets)
-            const seen = new Set();
-            return merged.filter((ref) => {
-              const id = readField("id", ref);
-              if (!id || seen.has(id)) return false;
-              seen.add(id);
-              return true;
-            });
-          }
-        },
        notifications: {
          merge(existing = [], incoming = [], { readField }) {
            // Create a map to deduplicate by __ref
--- a/client/src/utils/PhoneFormatter.jsx
+++ b/client/src/utils/PhoneFormatter.jsx
@@ -1,23 +1,7 @@
-import { Typography } from "antd";
+//import NumberFormat from "react-number-format";
 import parsePhoneNumber from "libphonenumber-js";

-const { Text } = Typography;
-
-export default function PhoneNumberFormatter({ children, type }) {
-  const p = parsePhoneNumber(children || "", "CA");
-  if (!p) return null;
-
-  const phone = p.formatNational();
-
-  return (
-    <span>
-      <Text>{phone}</Text>
-      {type ? (
-        <>
-          {" "}
-          <Text type="secondary">({type})</Text>
-        </>
-      ) : null}
-    </span>
-  );
+export default function PhoneNumberFormatter(props) {
+  const p = parsePhoneNumber(props.children || "", "CA");
+  return p ? <span>{p.formatNational()}</span> : null;
 }
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -1218,18 +1218,6 @@ export const TemplateList = (type, context) => {
            },
            group: "customers"
          },
-          payments_by_date_excel: {
-            title: i18n.t("reportcenter.templates.payments_by_date_excel"),
-            subject: i18n.t("reportcenter.templates.payments_by_date_excel"),
-            key: "payments_by_date_excel",
-            reporttype: "excel",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.payments"),
-              field: i18n.t("payments.fields.date")
-            },
-            group: "customers"
-          },
          schedule: {
            title: i18n.t("reportcenter.templates.schedule"),
            subject: i18n.t("reportcenter.templates.schedule"),
--- a/client/src/utils/sentry.js
+++ b/client/src/utils/sentry.js
@@ -31,8 +31,7 @@ if (!import.meta.env.DEV) {
      "Module specifier, 'fs' does not start",
      "Module specifier, 'zlib' does not start with",
      "Messaging: This browser doesn't support the API's required to use the Firebase SDK.",
-      "Failed to update a ServiceWorker for scope",
-      "Network Error"
+      "Failed to update a ServiceWorker for scope"
    ],
    integrations: [
      // See docs for support of different versions of variation of react router
--- a/client/vite.config.js
+++ b/client/vite.config.js
@@ -24,13 +24,11 @@ const lightningCssTargets = browserslistToTargets(
  })
 );

-const pstFormatter = new Intl.DateTimeFormat("en-CA", {
-  timeZone: "America/Los_Angeles",
-  year: "numeric",
-  month: "2-digit",
-  day: "2-digit"
-});
-const currentDatePST = pstFormatter.format(new Date());
+const currentDatePST = new Date()
+  .toLocaleDateString("en-US", { timeZone: "America/Los_Angeles", year: "numeric", month: "2-digit", day: "2-digit" })
+  .split("/")
+  .reverse()
+  .join("-");

 const getFormattedTimestamp = () =>
  new Date().toLocaleTimeString("en-US", { hour12: true }).replace("AM", "a.m.").replace("PM", "p.m.");
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -1156,11 +1156,7 @@
        enable_manual: false
        update:
          columns:
-            - imexshopid
-            - timezone
            - shopname
-            - notification_followers
-            - state
            - md_order_statuses
      retry_conf:
        interval_sec: 10
@@ -3684,7 +3680,6 @@
          - completed_tasks
          - converted
          - created_at
-          - created_user_email
          - cust_pr
          - date_estimated
          - date_exported
@@ -3703,7 +3698,6 @@
          - deliverchecklist
          - depreciation_taxes
          - dms_allocation
-          - dms_id
          - driveable
          - employee_body
          - employee_csr
@@ -3799,10 +3793,8 @@
          - ownr_fn
          - ownr_ln
          - ownr_ph1
-          - ownr_ph1_ty
          - ownr_ph1x
          - ownr_ph2
-          - ownr_ph2_ty
          - ownr_ph2x
          - ownr_st
          - ownr_title
@@ -3964,7 +3956,6 @@
          - completed_tasks
          - converted
          - created_at
-          - created_user_email
          - cust_pr
          - date_estimated
          - date_exported
@@ -3984,7 +3975,6 @@
          - deliverchecklist
          - depreciation_taxes
          - dms_allocation
-          - dms_id
          - driveable
          - employee_body
          - employee_csr
@@ -4081,10 +4071,8 @@
          - ownr_fn
          - ownr_ln
          - ownr_ph1
-          - ownr_ph1_ty
          - ownr_ph1x
          - ownr_ph2
-          - ownr_ph2_ty
          - ownr_ph2x
          - ownr_st
          - ownr_title
@@ -4257,7 +4245,6 @@
          - completed_tasks
          - converted
          - created_at
-          - created_user_email
          - cust_pr
          - date_estimated
          - date_exported
@@ -4277,7 +4264,6 @@
          - deliverchecklist
          - depreciation_taxes
          - dms_allocation
-          - dms_id
          - driveable
          - employee_body
          - employee_csr
@@ -4374,10 +4360,8 @@
          - ownr_fn
          - ownr_ln
          - ownr_ph1
-          - ownr_ph1_ty
          - ownr_ph1x
          - ownr_ph2
-          - ownr_ph2_ty
          - ownr_ph2x
          - ownr_st
          - ownr_title
@@ -4650,7 +4634,7 @@
      request_transform:
        body:
          action: transform
-          template: "{\r\n  \"event\": {\r\n  \"session_variables\": {\r\n    \"x-hasura-user-id\": {{$body?.event?.session_variables?.x-hasura-user-id ?? \"Internal\"}},\r\n    \"x-hasura-role\": {{$body?.event?.session_variables?.x-hasura-role ?? \"Internal\"}}\r\n    }, \r\n    \"op\": {{$body.event.op}},\r\n    \"data\": {\r\n      \"new\": {\r\n        \"id\": {{$body.event.data.new.id}},\r\n        \"shopid\": {{$body.event.data.new?.shopid}},\r\n        \"ro_number\": {{$body.event.data.new?.ro_number}},\r\n        \"created_user_email\": {{$body.event.data.new?.created_user_email}}\r\n      }\r\n    }\r\n  },\r\n  \"trigger\": {\r\n    \"name\": \"notifications_jobs_autoadd\"\r\n  },\r\n  \"table\": {\r\n    \"schema\": \"public\",\r\n    \"name\": \"jobs\"\r\n  }\r\n}\r\n"
+          template: "{\r\n  \"event\": {\r\n  \"session_variables\": {\r\n    \"x-hasura-user-id\": {{$body?.event?.session_variables?.x-hasura-user-id ?? \"Internal\"}},\r\n    \"x-hasura-role\": {{$body?.event?.session_variables?.x-hasura-role ?? \"Internal\"}}\r\n    }, \r\n    \"op\": {{$body.event.op}},\r\n    \"data\": {\r\n      \"new\": {\r\n        \"id\": {{$body.event.data.new.id}},\r\n        \"shopid\": {{$body.event.data.new?.shopid}},\r\n        \"ro_number\": {{$body.event.data.new?.ro_number}}\r\n      }\r\n    }\r\n  },\r\n  \"trigger\": {\r\n    \"name\": \"notifications_jobs_autoadd\"\r\n  },\r\n  \"table\": {\r\n    \"schema\": \"public\",\r\n    \"name\": \"jobs\"\r\n  }\r\n}\r\n"
        method: POST
        query_params: {}
        template_engine: Kriti
@@ -5177,9 +5161,7 @@
          - ownr_fn
          - ownr_ln
          - ownr_ph1
-          - ownr_ph1_ty
          - ownr_ph2
-          - ownr_ph2_ty
          - ownr_st
          - ownr_title
          - ownr_zip
@@ -5204,9 +5186,7 @@
          - ownr_fn
          - ownr_ln
          - ownr_ph1
-          - ownr_ph1_ty
          - ownr_ph2
-          - ownr_ph2_ty
          - ownr_st
          - ownr_title
          - ownr_zip
@@ -5242,9 +5222,7 @@
          - ownr_fn
          - ownr_ln
          - ownr_ph1
-          - ownr_ph1_ty
          - ownr_ph2
-          - ownr_ph2_ty
          - ownr_st
          - ownr_title
          - ownr_zip
--- a/hasura/migrations/1762815418708_set_fk_public_media_analytics_detail_jobid/down.sql
+++ b/hasura/migrations/1762815418708_set_fk_public_media_analytics_detail_jobid/down.sql
@@ -1,5 +0,0 @@
-alter table "public"."media_analytics_detail" drop constraint "media_analytics_detail_jobid_fkey",
-  add constraint "media_analytics_detail_jobid_fkey"
-  foreign key ("jobid")
-  references "public"."jobs"
-  ("id") on update restrict on delete restrict;
--- a/hasura/migrations/1762815418708_set_fk_public_media_analytics_detail_jobid/up.sql
+++ b/hasura/migrations/1762815418708_set_fk_public_media_analytics_detail_jobid/up.sql
@@ -1,5 +0,0 @@
-alter table "public"."media_analytics_detail" drop constraint "media_analytics_detail_jobid_fkey",
-  add constraint "media_analytics_detail_jobid_fkey"
-  foreign key ("jobid")
-  references "public"."jobs"
-  ("id") on update set null on delete set null;
--- a/hasura/migrations/1762816491980_media_analytics_fk_trigger/down.sql
+++ b/hasura/migrations/1762816491980_media_analytics_fk_trigger/down.sql
@@ -1,23 +0,0 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
-- CREATE OR REPLACE FUNCTION set_fk_to_null_if_invalid_media_analytics()
-- RETURNS TRIGGER AS $$
-- BEGIN
--     -- Check if the foreign key value is not NULL
--     IF NEW.jobid IS NOT NULL THEN
--         -- Check if the corresponding record exists in the parent table
--         IF NOT EXISTS (SELECT 1 FROM jobs WHERE id = NEW.jobid) THEN
--             -- If it doesn't exist, set the foreign key to NULL
--             NEW.jobid = NULL;
--         END IF;
--     END IF;
--
--     -- Return the (potentially modified) record to be inserted/updated
--     RETURN NEW;
-- END;
-- $$ LANGUAGE plpgsql;
--
-- CREATE TRIGGER media_analytics_fk_null
-- BEFORE INSERT OR UPDATE ON media_analytics_detail
-- FOR EACH ROW
-- EXECUTE FUNCTION set_fk_to_null_if_invalid_media_analytics();
--- a/hasura/migrations/1762816491980_media_analytics_fk_trigger/up.sql
+++ b/hasura/migrations/1762816491980_media_analytics_fk_trigger/up.sql
@@ -1,21 +0,0 @@
-CREATE OR REPLACE FUNCTION set_fk_to_null_if_invalid_media_analytics()
-RETURNS TRIGGER AS $$
-BEGIN
-    -- Check if the foreign key value is not NULL
-    IF NEW.jobid IS NOT NULL THEN
-        -- Check if the corresponding record exists in the parent table
-        IF NOT EXISTS (SELECT 1 FROM jobs WHERE id = NEW.jobid) THEN
-            -- If it doesn't exist, set the foreign key to NULL
-            NEW.jobid = NULL;
-        END IF;
-    END IF;
-    
-    -- Return the (potentially modified) record to be inserted/updated
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
-CREATE TRIGGER media_analytics_fk_null
-BEFORE INSERT OR UPDATE ON media_analytics_detail
-FOR EACH ROW
-EXECUTE FUNCTION set_fk_to_null_if_invalid_media_analytics();
--- a/hasura/migrations/1762823244230_create_index_media_analytics_detail_bodyshopid/down.sql
+++ b/hasura/migrations/1762823244230_create_index_media_analytics_detail_bodyshopid/down.sql
@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."media_analytics_detail_bodyshopid";
--- a/hasura/migrations/1762823244230_create_index_media_analytics_detail_bodyshopid/up.sql
+++ b/hasura/migrations/1762823244230_create_index_media_analytics_detail_bodyshopid/up.sql
@@ -1,2 +0,0 @@
-CREATE  INDEX "media_analytics_detail_bodyshopid" on
-  "public"."media_analytics_detail" using btree ("bodyshopid");
--- a/hasura/migrations/1762823258200_create_index_media_analytics_detail_jobid/down.sql
+++ b/hasura/migrations/1762823258200_create_index_media_analytics_detail_jobid/down.sql
@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."media_analytics_detail_jobid";
--- a/hasura/migrations/1762823258200_create_index_media_analytics_detail_jobid/up.sql
+++ b/hasura/migrations/1762823258200_create_index_media_analytics_detail_jobid/up.sql
@@ -1,2 +0,0 @@
-CREATE  INDEX "media_analytics_detail_jobid" on
-  "public"."media_analytics_detail" using btree ("jobid");
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Patrick Fic	daf9f197eb	IO-2776 Re-disable make fields.	2025-11-14 11:00:08 -08:00
Patrick Fic	5848daef72	IO-2776 Remove ref file.	2025-11-14 10:58:37 -08:00
Patrick Fic	c655badae2	Fortellis cleanup.	2025-11-14 10:55:47 -08:00
Patrick Fic	7af70f7512	Additional Fortellis functionality on delete.	2025-11-14 08:36:42 -08:00
Patrick Fic	a8dcc542cc	Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2776-cdk-fortellis	2025-11-13 14:27:43 -08:00
Patrick Fic	a16c680d04	Add department overrides.	2025-11-05 13:23:24 -08:00
Patrick Fic	c6d083ce02	Additional fortellis changes.	2025-10-15 15:20:14 -07:00
Patrick Fic	ec30e73b3e	WIP Get Makes	2025-10-07 13:23:42 -07:00
Patrick Fic	92b05a290e	IO-2776 Remove issue checking revoked token causing log issues on wss.	2025-10-06 11:20:52 -07:00
Dave	0d9a7dda53	feature/IO-2776-cdk-fortellis - Rename missing WSS loggers	2025-10-06 12:53:21 -04:00
Dave	601eed6db8	feature/IO-2776-cdk-fortellis - Rename missing WSS loggers	2025-10-06 12:29:29 -04:00
Dave	9b708d5e8e	Merge remote-tracking branch 'origin/release/2025-10-17' into feature/IO-2776-cdk-fortellis	2025-10-06 12:26:57 -04:00
Dave	6b4bc27205	feature/IO-2776-cdk-fortellis - Remove socket auth , was supposed to be old sockets.	2025-10-06 12:16:31 -04:00
Dave	0eb0e335fe	Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2776-cdk-fortellis	2025-10-02 14:13:03 -04:00
Patrick Fic	cd1e8b0b15	Add delete DMS wip.	2025-09-25 14:34:31 -07:00
Dave	f7799ffd03	feature/IO-2776-cdk-fortellis - Cleanup + Auth Socket stuff	2025-09-24 18:12:57 -04:00
Dave	57baa3d9fd	Merge remote-tracking branch 'origin/release/2025-09-26' into feature/IO-2776-cdk-fortellis	2025-09-24 17:27:08 -04:00
Patrick Fic	f796dd0f89	Add DMS error WIP query.	2025-09-22 11:44:46 -07:00
Patrick Fic	517c30787d	Improved error logging.	2025-09-18 11:32:48 -07:00
Patrick Fic	c8771275ce	WIP and improved error handling	2025-09-15 12:39:35 -07:00
Patrick Fic	de26979e44	Merge branch 'master-AIO' into feature/IO-2776-cdk-fortellis	2025-09-11 14:40:20 -07:00
Patrick Fic	661678eb1c	Additional WIP Fortellis.	2025-09-11 08:45:34 -07:00
Dave	1728982b2b	deps	2025-09-08 12:17:17 -04:00
Dave	8aa747edc5	Merge remote-tracking branch 'origin/release/2025-09-12' into feature/IO-2776-cdk-fortellis	2025-09-08 12:16:14 -04:00
Dave Richer	544494ce0d	Merged in release/2025-09-12 (pull request #2536 ) Release/2025 09 12	2025-09-03 18:54:16 +00:00
Patrick Fic	2e25324ae9	IO-2776 Calculate allocations on load using Fortellis connection.	2025-08-27 16:56:46 -07:00
Patrick Fic	f525ec6fb8	IO-2776 Resolve circular dependancy for legacy WS preventing run time.	2025-08-27 16:52:47 -07:00
Patrick Fic	8296d914c5	IO-2776 Add posting transactions for Fortellis.	2025-08-27 16:37:31 -07:00
Dave Richer	3d691568ff	Merged in release/2025-08-29 (pull request #2518 ) Release/2025 08 29	2025-08-27 19:27:22 +00:00
Dave	7ab070e2bc	feature/IO-2776-cdk-fortellis - Fix linting errors preventing build of front end	2025-08-21 12:23:02 -04:00
Dave	47a974e3cb	Merge branch 'feature/IO-3255-simplified-part-management' into feature/IO-2776-cdk-fortellis	2025-08-21 12:04:36 -04:00
Dave	eac81cdffb	Merge branch 'feature/IO-3255-simplified-part-management' into feature/IO-2776-cdk-fortellis	2025-08-21 11:45:58 -04:00
Dave	77c3e6f7e7	feature/IO-2776-cdk-fortellis - Update to the latest from simplified Parts Management	2025-08-21 11:28:23 -04:00
Dave	7f07da4360	Merge branch 'feature/IO-3255-simplified-part-management' into feature/IO-2776-cdk-fortellis # Conflicts: # client/package-lock.json # client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx # client/src/components/dms-customer-selector/dms-customer-selector.component.jsx # client/src/pages/dms/dms.container.jsx # package-lock.json # package.json	2025-08-21 11:13:27 -04:00
Dave	c47144df72	Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2776-cdk-fortellis # Conflicts: # client/src/components/dms-post-form/dms-post-form.component.jsx # package-lock.json # package.json # server/web-sockets/redisSocketEvents.js	2025-08-21 11:05:03 -04:00
Patrick Fic	163eaac110	Fortellis bug fixes.	2025-05-14 17:48:28 -07:00
Patrick Fic	19ce1c66ad	WIP Fortellis.	2025-04-25 11:58:38 -07:00
Patrick Fic	e2b4b408ed	Basic posting up to fortellis-select-customer.	2025-04-16 15:55:22 -07:00
Patrick Fic	567171c722	Resolve use socket.	2025-04-14 14:59:36 -07:00
Patrick Fic	03acb78ab2	Merge branch 'master-AIO' into feature/IO-2776-cdk-fortellis	2025-04-14 12:51:43 -07:00
Patrick Fic	e7c4797fef	IO-2776 Add additional redis helpers, restructure some fortellis calls.	2025-03-17 10:49:02 -07:00
Patrick Fic	88c35e8c48	Merge branch 'release/2025-03-14' into feature/IO-2776-cdk-fortellis	2025-03-14 09:21:09 -07:00
Patrick Fic	8623172aa1	WIP Fortellis work.	2025-03-13 14:06:07 -07:00
Patrick Fic	6ecc67184d	Merge branch 'master-AIO' into feature/IO-2776-cdk-fortellis	2025-03-11 13:08:54 -07:00
Patrick Fic	09973ecb3b	Merge branch 'release/2025-02-14' into feature/IO-2776-cdk-fortellis	2025-02-12 08:18:27 -08:00
Patrick Fic	db9e86e4c8	Succesful header creation.	2024-08-15 12:37:05 -07:00
Patrick Fic	85c446bc57	Refactor testing js file and made more modular.	2024-08-15 10:17:11 -07:00
Patrick Fic	5cf6f47bdc	Merge remote-tracking branch 'origin/master-AIO' into feature/AIO/IO-2776-cdk-fortellis	2024-08-14 08:18:49 -07:00
Patrick Fic	1db4cbeeb8	Fortellis WIP	2024-05-22 08:18:10 -07:00
Patrick Fic	c88bf4065e	Fortellis WIP	2024-05-14 08:15:40 -07:00
				`@@ -1 +0,0 @@`
				`DROP INDEX IF EXISTS "public"."media_analytics_detail_bodyshopid";`