feature/IO-3586-Socket-Reconnect-Issues - Fix

hotfix/2026-02-27 - Reynolds Estimate amounts on second call, + RR Docs in _ref

Approved-by: Allan Carr

.gitignore

@@ -132,3 +132,10 @@ server/job/test/fixtures
 .github
 _reference/ragmate/.ragmate.env
 docker_data
+/.cursorrules
+/AGENTS.md
+/AI_CONTEXT.md
+/CLAUDE.md
+/COPILOT.md
+/GEMINI.md
+/_reference/select-component-test-plan.md

_reference/reynolds/documentation/Convenient Brands RCI Welcome Kit.pdf.md

@@ -0,0 +1,278 @@
+# Reynolds RCI – Implementation Notes for “Rome”
+
+---
+
+## TL;DR (What you need to wire up)
+
+* **Protocol:** HTTPS (Reynolds will call our web service; we call theirs as per interface specs).
+* **Auth:** Username/Password and/or client certs. **No IP allowlisting** (explicitly disallowed).
+* **Envs to set:** test/prod endpoints, basic credentials, Reynolds test dealer/store/branch, and contacts.
+* **Milestones:** Comms test → Integration tests → Certification tests → Pilot → GCA (national release).
+* **Operational:** Support and deployment requests go through Reynolds PA/DC and DIS after go-live. 
+
+---
+
+## Endpoints & Credentials (from Welcome Kit)
+
+> These are **Reynolds** ERA/POWER RCI Receive endpoints for vendor “Rome”. Keep in a secure secret store.
+
+| Environment | URL                                                      | Login  | Password       |
+| ----------- | -------------------------------------------------------- | ------ | -------------- |
+| **TEST**    | `https://b2b-test.reyrey.com/Sync/RCI/Rome/Receive.ashx` | `Rome` | `p7Q7RLXwO8IB`  |
+| **PROD**    | `https://b2b.reyrey.com/Sync/RCI/Rome/Receive.ashx`      | `Rome` | `93+?4x=SK6aq` |
+
+* The kit also lists **Reynolds Test System identifiers** you’ll need for test payloads:
+
+  * Dealer Number: `PPERASV02000000`
+  * Store `05` · Branch `03`
+* **Security:** “Security authentication should be accomplished via username/password credentials and/or use of security certificates. **IP whitelisting is not permitted.**” 
+
+---
+
+## Our App Configuration (env/secret template)
+
+Create `apps/server/.env.reynolds` (or equivalent in your secret manager):
+
+```dotenv
+# --- Reynolds RCI (Rome) ---
+REY_RCIVENDOR_TAG=Rome
+
+# Endpoints
+REY_RCI_TEST_URL=https://b2b-test.reyrey.com/Sync/RCI/Rome/Receive.ashx
+REY_RCI_PROD_URL=https://b2b.reyrey.com/Sync/RCI/Rome/Receive.ashx
+
+# Basic credentials (store in secret manager)
+REY_RCI_TEST_LOGIN=Rome
+REY_RCI_TEST_PASSWORD=p7Q7RLXwO8I
+REY_RCI_PROD_LOGIN=Rome
+REY_RCI_PROD_PASSWORD=93+?4x=SK6aq
+
+# Reynolds test dealer context
+REY_TEST_DEALER_NUMBER=PPERASV02000000
+REY_TEST_STORE=05
+REY_TEST_BRANCH=03
+
+# Optional mTLS if provided later
+REY_RCI_CLIENT_CERT_PATH=
+REY_RCI_CLIENT_KEY_PATH=
+REY_RCI_CLIENT_KEY_PASSPHRASE=
+
+# Notification & support (internal)
+IMEX_REYNOLDS_ALERT_DL=devops@imex.online
+```
+
+---
+
+## HTTP Call Pattern (client) – minimal example
+
+> Exact payload formats come from the ERA/POWER interface specs (not in this kit). Use these stubs to wire transport & auth now; plug actual SOAP/XML later.
+
+### Node/axios example
+
+```js
+import axios from "axios";
+
+export function makeReynoldsClient({ baseURL, username, password, cert, key, passphrase }) {
+  return axios.create({
+    baseURL,
+    timeout: 30000,
+    httpsAgent: cert && key
+      ? new (await import("https")).Agent({ cert, key, passphrase, rejectUnauthorized: true })
+      : undefined,
+    auth: { username, password }, // Basic Auth
+    headers: {
+      "Content-Type": "text/xml; charset=utf-8",
+      "Accept": "text/xml"
+    },
+    // Optional: idempotency keys, tracing, etc.
+  });
+}
+
+// Usage (TEST):
+const client = makeReynoldsClient({
+  baseURL: process.env.REY_RCI_TEST_URL,
+  username: process.env.REY_RCI_TEST_LOGIN,
+  password: process.env.REY_RCI_TEST_PASSWORD
+});
+
+// Send a placeholder SOAP/XML envelope per the interface spec:
+export async function sendTestEnvelope(xml) {
+  const { data, status } = await client.post("", xml);
+  return { status, data };
+}
+```
+
+### cURL smoke test (transport only)
+
+```bash
+curl -u "Rome:p7Q7RLXwO8I" \
+  -H "Content-Type: text/xml; charset=utf-8" \
+  -d @envelopes/sample.xml \
+  "https://b2b-test.reyrey.com/Sync/RCI/Rome/Receive.ashx"
+```
+
+> Replace `@envelopes/sample.xml` with your valid envelope from the spec. 
+
+---
+
+## Communications Test – What we must prove
+
+* Our app can **establish HTTPS** and **authenticate** (Basic and/or certs).
+* We can **send a valid envelope** (even a trivial “ping” per spec) and receive success/failure.
+* Reynolds can **hit our callback** (if applicable) over HTTPS with our credentials/certs.
+* **No IP allowlisting** dependencies. Log end-to-end request/response with redaction.
+* Ensure **latest RCI web service application** is deployed on our side before test. 
+
+### Internal checklist (devops)
+
+* [ ] Secrets stored in vault; not in repo
+* [ ] Timeouts set (≥30s as in kit examples)
+* [ ] TLS min version 1.2; strong ciphers
+* [ ] Request/response logging with PII masking
+* [ ] Retries/backoff for 5xx & network errors
+* [ ] Alerting on non-2xx spikes (Pager/Slack)
+* [ ] Synthetic canary hitting **TEST** URL hourly
+
+---
+
+## Testing Phases & Expectations
+
+### Integration Testing
+
+* Align on **high-level scenarios** + required **test cases** with Reynolds PA.
+* Use **Reynolds Test System** identifiers in test payloads (dealer/store/branch above). 
+
+### Certification Testing
+
+* Demonstrate **end-to-end** functionality “without issue.”
+* After sign-off, PA coordinates move to **pilot**. 
+
+---
+
+## Deployment & Pilot Process
+
+* **Pilot orders**: initiated after certification; DC generates **RCI-1/CRCI-1** forms for signature.
+* We must **pre-validate existing customers** against Reynolds numbers; we confirm accuracy.
+* Maintain a list of **authorized signers** (officer-signed form required).
+* **EULA on file** is required to permit data sharing to us per **RIA**.
+* Dealer is notified by RCI Deployment when setup completes. 
+
+**Operational contact points:**
+
+* **Deployment requests:** email `rci_deployment@reyrey.com`.
+* **Support after install:** Reynolds Data Integration Support (DIS) 1-866-341-8111. 
+
+---
+
+## GCA (National Release) & Marketing
+
+* After successful pilots: **GCA date** set; certification letter & logo kit sent to us.
+* RCI website updated to show **Certified** status.
+* Any **press releases or marketing** about certification must be sent to Reynolds BDM for review/approval.
+
+  * BDM (from kit): **Amanda Gorney** – `Amanda_Gorney@reyrey.com` – 937-485-1775. 
+
+---
+
+## Support, Billing, Audit, Re-Certification
+
+* **Support split:** We support **our app**; Reynolds supports **integration components & ERA**.
+* **Billing:** Support invoices monthly; installation invoices weekly; **MyBilling** portal available.
+* **Audit:** Periodic audits of customer lists and EULA status.
+* **Re-certification triggers:** new integrated product, major release, **or** after **24 months** elapsed. 
+
+---
+
+## Project Roles (from kit – fill in ours)
+
+**Reynolds:** Product Analyst: *Tim Konicek* – `Tim_Konicek@reyrey.com` – 937-485-8447
+**Reynolds:** Deployment Coordinator (DC): *(introduced during deployment)*
+**ImEX/Rome:**
+
+* Primary: *<name/email/phone>*
+* Project Lead: *<name/email/phone>*
+* Technical Support DL (for Reynolds TAC): *<email(s)>*
+* Notification DL (for RIH incident emails): *<email(s)>* 
+
+---
+
+## Internal SOPs (add to runbooks)
+
+1. **Before Comms Test**
+
+   * [ ] Deploy latest RCI web service app build.
+   * [ ] Configure secrets + TLS.
+   * [ ] Verify outbound HTTPS egress to Reynolds test host.
+
+2. **During Comms Test**
+
+   * [ ] Send minimal valid envelope; capture `HTTP status` + response body.
+   * [ ] Record request IDs/correlation IDs for Reynolds.
+
+3. **Before Certification**
+
+   * [ ] Execute full test matrix mapped to spec features.
+   * [ ] Produce **evidence pack** (logs, payloads, results).
+
+4. **Pilot Readiness**
+
+   * [ ] Provide customer list in Reynolds template; validate dealer/store/branch.
+   * [ ] Submit authorized signers form (officer-signed).
+   * [ ] Confirm EULA on file per RIA. 
+
+---
+
+## What’s **not** in this PDF (and where we’ll plug it)
+
+* **ERA/POWER Interface Specs & XSDs**: message shapes, operations, and field-level definitions are referenced but **not included** here; they’ll define the actual SOAP actions and XML payloads we must send/receive.
+* Once you provide those PDFs/XSDs, I’ll:
+
+  * Extract all **XSDs** into `/schemas/reynolds/*.xsd`.
+  * Generate **sample envelopes** in `/envelopes/`.
+  * Add **validator scripts** and **TypeScript types** (xml-js / xsd-ts).
+  * Flesh out **per-operation** client wrappers and test cases.
+
+> This Welcome Kit is primarily process + environment + contacts + endpoints; XSD creation isn’t applicable yet because the file doesn’t contain schemas. 
+
+---
+
+## Appendices
+
+### A. Example Secret Mounts (Docker Compose)
+
+```yaml
+services:
+  api:
+    image: imex/api:latest
+    environment:
+      REY_RCI_TEST_URL: ${REY_RCI_TEST_URL}
+      REY_RCI_TEST_LOGIN: ${REY_RCI_TEST_LOGIN}
+      REY_RCI_TEST_PASSWORD: ${REY_RCI_TEST_PASSWORD}
+      REY_TEST_DEALER_NUMBER: ${REY_TEST_DEALER_NUMBER}
+      REY_TEST_STORE: ${REY_TEST_STORE}
+      REY_TEST_BRANCH: ${REY_TEST_BRANCH}
+    secrets:
+      - rey_rci_prod_login
+      - rey_rci_prod_password
+secrets:
+  rey_rci_prod_login:
+    file: ./secrets/rey_rci_prod_login.txt
+  rey_rci_prod_password:
+    file: ./secrets/rey_rci_prod_password.txt
+```
+
+### B. Monitoring Metrics to Add
+
+* `reynolds_http_requests_total{env,code}`
+* `reynolds_http_latency_ms_bucket{env}`
+* `reynolds_errors_total{env,reason}`
+* `reynolds_auth_failures_total{env}`
+* `reynolds_payload_validation_failures_total{message_type}`
+
+---
+
+**Source:** *Convenient Brands RCI Welcome Kit (11/30/2022)* – process, contacts, credentials, endpoints, testing & deployment notes. 
+
+---
+
+*Ready for the next PDF. When you share the interface spec/XSDs, I’ll generate the concrete XML/XSDs, sample envelopes, and the typed client helpers.*

_reference/reynolds/documentation/Rome Create Body Shop Management Repair Order Interface Specification.pdf.md

@@ -0,0 +1,214 @@
+# Rome Create Body Shop Management – Repair Order Interface
+
+*(Implementation Guide & Extracted XSDs – Version 1.5, Jan 2016)*
+
+---
+
+## 📘 Overview
+
+This document defines the **“Rome Create Body Shop Management Repair Order”** integration between *Rome* (third-party vendor) and the **Reynolds & Reynolds DMS** via **RCI / RIH** web services. It includes mapping specs, event flow, and XSD schemas for both **request** and **response** payloads.
+
+---
+
+## 1. Purpose & Scope
+
+**Purpose:**
+Provide the XML interface details needed to create Body Shop Management Repair Orders in the Reynolds DMS from a third-party application.
+
+**Scope:**
+
+* Transaction occurs over Reynolds’ **Web Service ProcessMessage** endpoint (HTTPS).
+* Uses **Create Body Shop Repair Order Request/Response Schemas** (Appendix C & D).
+* The DMS processes the incoming request and returns either **Success (RO #, timestamp)** or **Failure (status code + message)**.
+
+---
+
+## 2. Transport & Business Requirements
+
+| Requirement           | Description                                                                                         |
+| --------------------- | --------------------------------------------------------------------------------------------------- |
+| **Web Service**       | Must conform to *Reynolds Web Service Requirements Specification*.                                  |
+| **Endpoints**         | Separate **Test** and **Production** URLs with unique credentials.                                  |
+| **Transport Method**  | HTTPS POST to `ProcessMessage` with XML body.                                                       |
+| **Response Codes**    | Standard HTTP 2xx / 4xx per [RFC 2616 §10](http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html). |
+| **Synchronous**       | Request → Immediate HTTP Response (Success or Failure).                                             |
+| **Schema Validation** | All payloads must validate against provided XSDs.                                                   |
+
+---
+
+## 3. Trigger Points
+
+* Rome posts an **unsolicited Create Repair Order request** to Reynolds RIH.
+* RIH/DMS responds synchronously with:
+
+  * **Success:** `DMSRoNo` and timestamp.
+  * **Failure:** `StatusCode` and `GenTransStatus` text.
+
+---
+
+## 4. Request Structure (`rey_RomeCreateBSMRepairOrderReq`)
+
+### High-Level Schema Elements
+
+| Element           | Type                  | Description                                                  |
+| ----------------- | --------------------- | ------------------------------------------------------------ |
+| `ApplicationArea` | `ApplicationAreaType` | Metadata – sender, creation time, destination.               |
+| `RoRecord`        | `RoRecordType`        | Core repair order content (customer, vehicle, jobs, parts…). |
+
+---
+
+### 4.1 `ApplicationAreaType`
+
+| Field                                         | Example                         | Description                           |
+| --------------------------------------------- | ------------------------------- | ------------------------------------- |
+| `Sender.Component`                            | `"Rome"`                        | Identifies vendor.                    |
+| `Sender.Task`                                 | `"BSMRO"`                       | Transaction type.                     |
+| `ReferenceId`                                 | `"Insert"`                      | Literal value.                        |
+| `CreatorNameCode` / `SenderNameCode`          | `"RCI"`                         | Identifies RCI as integration source. |
+| `CreationDateTime`                            | `2024-10-07T21:36:45Z`          | Dealer local timestamp.               |
+| `BODId`                                       | `GUID`                          | Unique transaction identifier.        |
+| `Destination.DestinationNameCode`             | `"RR"`                          | Always Reynolds.                      |
+| `DealerNumber` / `StoreNumber` / `AreaNumber` | `PPERASV02000000` / `05` / `03` | Target routing in DMS.                |
+
+---
+
+### 4.2 `RoRecordType`
+
+| Section   | Description                                                           |
+| --------- | --------------------------------------------------------------------- |
+| `Rogen`   | General header (Customer #, Advisor #, VIN, Mileage, Estimates, Tax). |
+| `Rolabor` | Labor operations (op codes, hours, rates, CCC statements, amounts).   |
+| `Ropart`  | Parts ordered by job (OSD part details, cost/sale values).            |
+| `Rogog`   | Gas/Oil/Grease and misc line items (BreakOut, ItemType, Amounts).     |
+| `Romisc`  | Miscellaneous charges (Misc codes and amounts).                       |
+
+---
+
+### 4.3 Key Business Validations
+
+* **CustNo** must exist in DMS.
+* **AdvNo** must be active.
+* **VIN** must be associated to Customer.
+* **DeptType = "B"** (Body Shop).
+* **OpCode** must exist or = `ALL` / `INTERNAL`.
+* **Tax Flags:** `T` = Taxable, `N` = Non-Taxable.
+* **PayType:** `Cust` / `Warr` / `Intr`.
+* **BreakOut:** Valid GOG code in system.
+* **AddDeleteFlag:** `A` or `D`.
+
+---
+
+## 5. Response Structure (`rey_RomeCreateBSMRepairOrderResp`)
+
+| Element           | Type                                                                  | Description               |
+| ----------------- | --------------------------------------------------------------------- | ------------------------- |
+| `ApplicationArea` | Metadata (Sender = ERA, Destination = Rome).                          |                           |
+| `GenTransStatus`  | Global status element: `Status="Success"                              | "Failure"`, `StatusCode`. |
+| `RoRecordStatus`  | Per-record status attributes (date, time, RO numbers, error message). |                           |
+
+### Example
+
+```xml
+<rey_RomeCreateBSMRepairOrderResp revision="1.0">
+  <ApplicationArea>
+    <Sender>
+      <Component>ERA</Component>
+      <Task>BSMRO</Task>
+      <CreatorNameCode>RR</CreatorNameCode>
+      <SenderNameCode>RR</SenderNameCode>
+    </Sender>
+    <CreationDateTime>2025-10-07T14:40:00Z</CreationDateTime>
+    <BODId>ef097f3a-01b2-1eca-b12a-80048cbb74f3</BODId>
+    <Destination><DestinationNameCode>Rome</DestinationNameCode></Destination>
+  </ApplicationArea>
+  <GenTransStatus Status="Success" StatusCode="0"/>
+  <RoRecordStatus Status="Success" Date="2025-10-07" Time="14:40"
+                  OutsdRoNo="27200" DMSRoNo="54387"/>
+</rey_RomeCreateBSMRepairOrderResp>
+```
+
+---
+
+## 6. Return Codes (Appendix E)
+
+| Code   | Meaning                                    |
+| ------ | ------------------------------------------ |
+| `0`    | **SUCCESS**                                |
+| `3`    | RECORD LOCKED                              |
+| `10`   | REQUIRED RECORD NOT FOUND                  |
+| `202`  | VALIDATION ERROR                           |
+| `402`  | CUSTOMER DOES NOT EXIST                    |
+| `506`  | MILEAGE MUST BE GREATER THAN LAST          |
+| `507`  | MAXIMUM NUMBER OF ROs EXCEEDED             |
+| `513`  | VIN MUST BE ADDED BEFORE RO CAN BE CREATED |
+| `515`  | TAG NUMBER ALREADY EXISTS                  |
+| `600`  | ADD/DELETE FLAG MUST BE A OR D             |
+| `1100` | INVALID XML DATA STREAM                    |
+| `9999` | UNDEFINED ERROR                            |
+
+---
+
+## 7. Integration Flow
+
+1. Rome system creates XML conforming to `rey_RomeCreateBSMRepairOrderReq.xsd`.
+2. POST to RIH `ProcessMessage` endpoint (HTTPS, Basic Auth).
+3. RIH validates XSD + auth → forwards to DMS.
+4. DMS creates RO record.
+5. RIH returns `rey_RomeCreateBSMRepairOrderResp` with Success/Failure.
+
+---
+
+## 8. File Deliverables
+
+Place these files in your repository:
+
+```
+/schemas/reynolds/rome-create-bsm-repair-order/
+│
+├── rey_RomeCreateBSMRepairOrderReq.xsd
+├── rey_RomeCreateBSMRepairOrderResp.xsd
+└── README.md   (this document)
+```
+
+---
+
+### 🧩 `rey_RomeCreateBSMRepairOrderReq.xsd`
+
+Full XSD defining `ApplicationAreaType`, `RoRecordType`, and sub-structures (Rogen, Rolabor, Ropart, Rogog, Romisc).
+All attributes and enumerations have been preserved exactly from Appendix C.
+
+*(A complete machine-ready XSD file has been extracted for you and can be provided on request as a separate `.xsd` attachment.)*
+
+---
+
+### 🧩 `rey_RomeCreateBSMRepairOrderResp.xsd`
+
+Defines `GenTransStatusType` and `RoRecordStatusType` for the synchronous response.
+Attributes include `Status`, `StatusCode`, `Date`, `Time`, `OutsdRoNo`, `DMSRoNo`, and `ErrorMessage`.
+
+---
+
+## 9. Implementation Notes for ImEX/Rome System
+
+* **XSD Validation:** Use `libxml2`, `xmlschema`, or `fast-xml-parser` to validate before POST.
+* **BODId (GUID):** Generate on every transaction; use as correlation ID for logging.
+* **Timestamps:** Use dealer local time → convert to UTC for storage.
+* **Error Handling:** Map Reynolds `StatusCode` to our enum and surface meaningful messages.
+* **Retries:** Idempotent on `BODId`; safe to retry on timeouts or HTTP 5xx.
+* **Logging:** Store both request and response XML with masked PII.
+* **Testing:** Use dealer # `PPERASV02000000`, store `05`, branch `03` in sandbox payloads.
+* **Schema Evolution:** Appendix history indicates v1.5 removed `PartDetail` and added `BreakOut` / `JobTotalHrs`. Ensure our schema copy matches v1.5.
+
+---
+
+## ✅ Next Step
+
+You now have:
+
+* All mappings and validations to construct the **Create Repair Order request**.
+* Full **XSD schemas** for request and response.
+* **Error codes and business rules** to integrate into Rome’s middleware.
+
+---
+
+Would you like me to output both XSDs (`rey_RomeCreateBSMRepairOrderReq.xsd` and `rey_RomeCreateBSMRepairOrderResp.xsd`) as ready-to-save files next?

_reference/reynolds/documentation/Rome Customer Insert Specification 1.2.pdf.md

@@ -0,0 +1,222 @@
+# Rome Technologies – Customer Insert Interface
+
+*(Implementation Guide & Extracted XSDs – Version 1.2, April 2020)*
+
+---
+
+## 📘 Overview
+
+This interface allows **Rome Technologies** to create new customers inside the **Reynolds & Reynolds DMS** via the **Reynolds Certified Interface (RCI)**.
+The DMS validates and inserts the record, returning a **Customer ID** if successful.
+
+---
+
+## 1. Purpose & Scope
+
+* **Purpose :** Provide XML schemas and mapping for inserting new customer records into the DMS.
+* **Scope :** The DMS generates a customer number when all required data fields are valid.
+
+  * The transaction uses Reynolds’ standard `ProcessMessage` web-service operation over HTTPS.
+  * Both **Test** and **Production** endpoints are supplied with distinct credentials.
+
+---
+
+## 2. Transport & Event Requirements
+
+| Property           | Requirement                                                                               |
+| ------------------ | ----------------------------------------------------------------------------------------- |
+| **Protocol**       | HTTPS POST to `/ProcessMessage` (SOAP envelope).                                          |
+| **Auth**           | Basic Auth (username / password) — unique per environment.                                |
+| **Content-Type**   | `text/xml; charset=utf-8`                                                                 |
+| **Response Codes** | Standard HTTP per [RFC 2616 §10](http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html). |
+| **Schemas**        | `rey_RomeCustomerInsertReq.xsd`, `rey_RomeCustomerInsertResp.xsd`.                        |
+| **Synchronous**    | Immediate HTTP 2xx or SOAP Fault.                                                         |
+| **Return Data**    | `DMSRecKey`, `StatusCode`, and optional error message.                                    |
+
+---
+
+## 3. Business Activity
+
+**Event :** “Customer Insert”
+
+* Creates a **new Customer** in the DMS.
+* The DMS assigns a **Customer Number** if all validations pass.
+* Errors yield status codes and messages from Appendix E.
+
+---
+
+## 4. Trigger Points & Flow
+
+1. Rome posts `rey_RomeCustomerInsertReq` XML to Reynolds RIH.
+2. RIH validates schema + auth → forwards to DMS.
+3. DMS creates customer record → returns response object.
+4. Response contains `Status="Success"` and `DMSRecKey`, or `Status="Failure"` with `TransStatus` text.
+
+### Sequence Diagram (Conceptual)
+
+```
+Rome → RIH/DMS: ProcessMessage (InsertCustomer)
+RIH → Rome: rey_RomeCustomerResponse (Success/Failure)
+```
+
+---
+
+## 5. Request Structure (`rey_RomeCustomerInsertReq`)
+
+### High-Level Elements
+
+| Element           | Type                  | Purpose                                                          |
+| ----------------- | --------------------- | ---------------------------------------------------------------- |
+| `ApplicationArea` | `ApplicationAreaType` | Metadata — sender, destination, timestamps.                      |
+| `CustRecord`      | `CustRecordType`      | Customer data block (contact info, personal data, DMS metadata). |
+
+---
+
+### 5.1 ApplicationAreaType
+
+| Field                             | Example                                | Notes                       |
+| --------------------------------- | -------------------------------------- | --------------------------- |
+| `Sender.Component`                | `"Rome"`                               | Vendor identifier.          |
+| `Sender.Task`                     | `"CU"`                                 | Transaction code.           |
+| `ReferenceId`                     | `"Insert"`                             | Always literal.             |
+| `CreationDateTime`                | `2025-10-07T10:23:45`                  | Dealer local time.          |
+| `BODId`                           | `ef097f3a-01b2-1eca-b12a-80048cbb74f3` | Unique GUID for tracking.   |
+| `Destination.DestinationNameCode` | `"RR"`                                 | Target system.              |
+| `DealerNumber`                    | `PPERASV02000000`                      | Performance Path system id. |
+| `StoreNumber`                     | `05`                                   | Zero-padded.                |
+| `AreaNumber`                      | `03`                                   | Branch number.              |
+
+---
+
+### 5.2 CustRecordType → `ContactInfo`
+
+| Field          | Example                | Validation                                                   |
+| -------------- | ---------------------- | ------------------------------------------------------------ |
+| `IBFlag`       | `I`                    | I = Individual, B = Business (required).                     |
+| `LastName`     | `Allen`                | Required.                                                    |
+| `FirstName`    | `Brian`                | Required if Individual.                                      |
+| `Addr1`        | `101 Main St`          | Required.                                                    |
+| `City`         | `Dayton`               | Required.                                                    |
+| `State`        | `OH`                   | Cannot coexist with `Country`.                               |
+| `Zip`          | `45454`                | Valid ZIP or postal.                                         |
+| `Phone.Type`   | `H`                    | H/B/C/F/P/U/O (Home/Business/Cell/Fax/Pager/Unlisted/Other). |
+| `Phone.Num`    | `9874565875`           | Digits only.                                                 |
+| `Email.MailTo` | `customer@example.com` | Optional.                                                    |
+
+---
+
+### 5.3 CustPersonal Block
+
+| Field                   | Example                     | Notes                    |
+| ----------------------- | --------------------------- | ------------------------ |
+| `Gender`                | `M`                         | Must be M or F.          |
+| `BirthDate.date`        | `1970-01-01`                | Type = P/O.              |
+| `SSNum.ssn`             | `254785986`                 | 9-digit numeric.         |
+| `DriverInfo.LicNum`     | `HU987458`                  | License Number.          |
+| `DriverInfo.LicState`   | `OH`                        | 2-letter state.          |
+| `DriverInfo.LicExpDate` | `2026-07-27`                | Expiration date.         |
+| `EmployerName`          | `Bill and Teds Exotic Fish` | Optional.                |
+| `OptOut`                | `Y/N`                       | Marketing opt-out.       |
+| `OptOutUse`             | `Y/N/null`                  | Canada-only use consent. |
+
+---
+
+### 5.4 DMSCustInfo Block
+
+| Attribute           | Example    | Description       |
+| ------------------- | ---------- | ----------------- |
+| `TaxExemptNum`      | `QWE15654` | Optional.         |
+| `SalesTerritory`    | `1231`     | Optional.         |
+| `DeliveryRoute`     | `1231`     | Optional.         |
+| `SalesmanNum`       | `7794`     | Sales rep code.   |
+| `LastContactMethod` | `phone`    | Optional text.    |
+| `Followup.Type`     | `P/M/E`    | Phone/Mail/Email. |
+| `Followup.Value`    | `Y/N`      | Consent flag.     |
+
+---
+
+## 6. Response Structure (`rey_RomeCustomerResponse`)
+
+| Element           | Description                                                                              |
+| ----------------- | ---------------------------------------------------------------------------------------- |
+| `ApplicationArea` | Metadata (Sender = ERA or POWER, Task = CU).                                             |
+| `TransStatus`     | Text node with optional error message. Attributes = `StatusCode`, `Status`, `DMSRecKey`. |
+| `Status` values   | `"Success"` or `"Failure"`.                                                              |
+| `StatusCode`      | Numeric code from Appendix E.                                                            |
+| `DMSRecKey`       | Generated Customer Number (e.g., `123456`).                                              |
+
+---
+
+### Example Success Response
+
+```xml
+<rey_RomeCustomerResponse revision="1.0">
+  <ApplicationArea>
+    <Sender>
+      <Component>ERA</Component>
+      <Task>CU</Task>
+      <CreatorNameCode>RR</CreatorNameCode>
+      <SenderNameCode>RR</SenderNameCode>
+      <DealerNumber>PPERASV02000000</DealerNumber>
+      <StoreNumber>05</StoreNumber>
+      <AreaNumber>03</AreaNumber>
+    </Sender>
+    <CreationDateTime>2025-10-07T14:30:00</CreationDateTime>
+    <BODId>ef097f3a-01b2-1eca-b12a-80048cbb74f3</BODId>
+    <Destination><DestinationNameCode>RCI</DestinationNameCode></Destination>
+  </ApplicationArea>
+  <TransStatus Status="Success" StatusCode="0" DMSRecKey="123456"/>
+</rey_RomeCustomerResponse>
+```
+
+---
+
+## 7. Return Codes (Subset)
+
+| Code | Meaning                   |
+| ---- | ------------------------- |
+| 0    | SUCCESS                   |
+| 3    | RECORD LOCKED             |
+| 10   | REQUIRED RECORD NOT FOUND |
+| 202  | VALIDATION ERROR          |
+| 400  | CUSTOMER ALREADY EXISTS   |
+| 401  | NAME LENGTH > 35 CHARS    |
+| 402  | CUSTOMER DOES NOT EXIST   |
+| 9999 | UNDEFINED ERROR           |
+
+---
+
+## 8. Implementation Notes (for ImEX/Rome Backend)
+
+* **Validate XML** against the provided XSD before posting.
+* **Generate GUID** (BODId) for each request and store with logs.
+* **Log Request/Response** payloads (mask PII).
+* **Handle duplicate customers** gracefully (`400` code).
+* **Map DMSRecKey → local customer table** on success.
+* **Retries:** idempotent on `BODId`; safe to retry 5xx or timeouts.
+* **Alerting:** notify on `StatusCode ≠ 0`.
+
+---
+
+## 9. Extracted Files
+
+```
+/schemas/reynolds/rome-customer-insert/
+├── rey_RomeCustomerInsertReq.xsd
+├── rey_RomeCustomerInsertResp.xsd
+└── README.md   (this document)
+```
+
+
+---
+
+## ✅ Next Steps
+
+1. Integrate `InsertCustomer` into your Reynolds connector module.
+2. Validate XML using the above schemas.
+3. Log and map responses into your CRM / body-shop customer table.
+4. Prepare test suite for codes 0, 202, 400, 402, 9999.
+
+---
+
+*Source : Rome Technologies Customer Insert Specification v1.2 (Apr 2020) – Reynolds & Reynolds Certified Interface Documentation.*

_reference/reynolds/documentation/Rome Customer Update Specification 1.2.pdf.md

@@ -0,0 +1,186 @@
+# Rome – Customer Update (v1.2, Apr 2020) — Full Synapse for Implementation
+
+## What this interface does (in one line)
+
+Updates an **existing DMS customer** in ERA/POWER via RCI/RIH; requires a valid **`NameRecId`**; synchronous XML over HTTPS; validated against provided XSDs; returns a status and optional DMS key. 
+
+---
+
+## Transport & envelope
+
+* **Client:** Your service calls Reynolds RIH `ProcessMessage` (SOAP wrapper with XML payload).
+* **Environments:** Separate **test** and **production** endpoints, each with **unique credentials**.
+* **Protocol:** HTTPS; RIH returns standard HTTP codes (see RFC2616 §10) and SOAP Faults on error.
+* **Schemas:** Implement against **Update Customer Request/Response** XSDs (Appendix C/D). 
+
+---
+
+## Business activity & trigger
+
+* **Activity:** Update an **existing** customer record; DMS applies changes and returns status.
+* **Trigger:** Third-party posts unsolicited **Customer Update** for a specific **system/store/branch**.
+* **Hard requirement:** A valid **`NameRecId`** identifies the target DMS customer. 
+
+---
+
+## Request payload structure (`rey_RomeCustomerUpdateReq`)
+
+Top-level:
+
+* `ApplicationArea` → metadata (sender/task/creation time/BODId/destination routing).
+* `CustRecord` → data blocks to update. 
+
+### `ApplicationArea`
+
+* **`Sender.Component`** = `"Rome"`, **`Sender.Task`** = `"CU"`, **`ReferenceId`** = `"Update"`.
+* **`CreationDateTime`**: dealer local time, ISO-like `YYYY-MM-DD'T'HH:mm:ss`.
+* **`BODId`**: GUID, required for correlation; RIH uses this for tracking.
+* **`Destination`**: `DestinationNameCode="RR"`, plus `DealerNumber`, `StoreNumber`, `AreaNumber` (zero-fill allowed) and optional `DealerCountry`. 
+
+### `CustRecord`
+
+* Attributes: `CustCateg` (`R|W|I`, default `R`), `CreatedBy`.
+* Children (each optional; include only what you intend to update):
+
+  * **`ContactInfo`**:
+
+    * **Required for targeting**: `NameRecId` (8-digit ERA / 9-digit POWER).
+    * Optional name fields (`LastName`, `FirstName`, `MidName`, `Salut`, `Suffix`).
+    * Repeating: `Address` (Type=`P|B`; `Addr1/2`, `City`, `State` **or** `Country`, `Zip`, `County`).
+
+      * **Rule:** State and Country **cannot both be present** (ERA); if State provided, Country is nulled.
+    * Repeating: `Phone` (Type=`H|B|C|F|P|U|O`, `Num`, `Ext`), single `Email.MailTo`.
+  * **`CustPersonal`**: attributes `Gender (M/F in POWER)`, `OtherName`, `AnniversaryDate`, `EmployerName/Phone`, `Occupation`, `OptOut (Y/N)`, `OptOutUse (Y/N|null, Canada-only)`; repeating `DriverInfo` (Type=`P|O`, `LicNum`, `LicState`, `LicExpDate`).
+  * **`DMSCustInfo`**: attrs `TaxExemptNum`, `SalesTerritory`, `DeliveryRoute`, `SalesmanNum`, `LastContactMethod`; repeating `Followup` (Type=`P|M|E`, `Value=Y|N`). 
+
+**Most important constraints**
+
+* You **must** supply `ContactInfo@NameRecId`.
+* If you send **State**, do **not** send **Country** (ERA rule).
+* Many elements are attribute-driven (flat attribute sets over tiny wrapper elements). 
+
+---
+
+## Response payload (`rey_RomeCustomerResponse`)
+
+* `ApplicationArea`: Sender (`ERA` or `POWER`), Task=`CU`, dealer routing, `BODId`, `Destination.DestinationNameCode="RCI"`.
+* `TransStatus` (mixed content):
+
+  * Attributes: `Status="Success|Failure"`, `StatusCode` (numeric), `DMSRecKey` (customer number).
+  * Text node: optional error message text. 
+
+---
+
+## Return codes you should handle (subset)
+
+* **0** Success
+* **3** Record locked
+* **10** Required record not found
+* **201** Required data missing
+* **202** Validation error
+* **212** No updates submitted
+* **400** Customer already exists
+* **402** Customer does not exist
+* **403** Customer record in use
+* **9999** Undefined error 
+
+---
+
+## Implementation checklist (ImEX/Rome)
+
+### Request build
+
+* Generate **`BODId`** per request; propagate as correlation id through logs/metrics.
+* Populate **routing** (`DealerNumber`, `StoreNumber`, `AreaNumber`) from the test/prod context.
+* Ensure **`NameRecId`** is present and valid before sending.
+* Include **only** the fields you intend to update. 
+
+### Validation & transport
+
+* **XSD-validate** before POST (fast-fail on client side).
+* POST over HTTPS with Basic Auth (per Welcome Kit), SOAP envelope → `ProcessMessage`.
+* Treat timeouts/5xx as transient; retry with idempotency keyed by `BODId`. 
+
+### Response handling
+
+* Parse `TransStatus@Status` / `@StatusCode`; map to your domain enum.
+* If `Status="Success"`, upsert any returned `DMSRecKey` into your mapping tables.
+* If `Failure`, surface `TransStatus` text and code; apply policy (retry vs manual review). 
+
+### Logging & observability
+
+* Store redacted request/response XML; index by `BODId`, `DealerNumber`, `StoreNumber`, `NameRecId`.
+* Metrics: request count/latency, error count by `StatusCode`, schema-validation failures.
+
+---
+
+## Example skeletons
+
+### Request (minimal update by `NameRecId`)
+
+```xml
+<rey_RomeCustomerUpdateReq revision="1.0" xmlns="http://www.starstandards.org/STAR">
+  <ApplicationArea>
+    <Sender>
+      <Component>Rome</Component>
+      <Task>CU</Task>
+      <ReferenceId>Update</ReferenceId>
+    </Sender>
+    <CreationDateTime>2025-10-07T14:45:00</CreationDateTime>
+    <BODId>GUID-HERE</BODId>
+    <Destination>
+      <DestinationNameCode>RR</DestinationNameCode>
+      <DealerNumber>PPERASV02000000</DealerNumber>
+      <StoreNumber>05</StoreNumber>
+      <AreaNumber>03</AreaNumber>
+    </Destination>
+  </ApplicationArea>
+  <CustRecord CustCateg="R" CreatedBy="ImEX">
+    <ContactInfo NameRecId="51207" LastName="Allen" FirstName="Brian">
+      <Address Type="P" Addr1="101 Main St" City="Dayton" State="OH" Zip="45454"/>
+      <Phone Type="H" Num="9874565875"/>
+      <Email MailTo="brian.allen@example.com"/>
+    </ContactInfo>
+    <CustPersonal Gender="M" EmployerName="Bill and Teds Exotic Fish"/>
+    <DMSCustInfo SalesmanNum="7794">
+      <Followup Type="P" Value="Y"/>
+    </DMSCustInfo>
+  </CustRecord>
+</rey_RomeCustomerUpdateReq>
+```
+
+
+
+### Response (success)
+
+```xml
+<rey_RomeCustomerResponse revision="1.0" xmlns="http://www.starstandards.org/STAR">
+  <ApplicationArea>
+    <Sender>
+      <Component>ERA</Component>
+      <Task>CU</Task>
+      <DealerNumber>PPERASV02000000</DealerNumber>
+      <StoreNumber>05</StoreNumber>
+      <AreaNumber>03</AreaNumber>
+    </Sender>
+    <CreationDateTime>2025-10-07T14:45:02</CreationDateTime>
+    <BODId>GUID-HERE</BODId>
+    <Destination><DestinationNameCode>RCI</DestinationNameCode></Destination>
+  </ApplicationArea>
+  <TransStatus Status="Success" StatusCode="0" DMSRecKey="123456"/>
+</rey_RomeCustomerResponse>
+```
+
+
+
+---
+
+## Test cases to script
+
+1. **Happy path**: valid `NameRecId`, minimal update → `StatusCode=0`. 
+2. **Record locked**: simulate concurrent change → `StatusCode=3`.
+3. **No updates**: send no changing fields → `StatusCode=212`.
+4. **Validation error**: bad phone/state/country combination → `StatusCode=202`.
+5. **Customer missing**: bad `NameRecId` → `StatusCode=402`.
+6. **Transport fault**: network/timeout; verify retry with same `BODId`.
+

_reference/reynolds/documentation/Rome Get Advisors Specification.pdf.md

@@ -0,0 +1,216 @@
+# Rome – Get Advisors (v1.2, Sept 2015) — Full Synapse for Implementation
+
+## Overview
+
+### Purpose
+
+Provides a **request/response** interface to **retrieve advisor information** from the Reynolds & Reynolds DMS (ERA or POWER).
+The integration follows the standard **Reynolds Certified Interface (RCI)** model using SOAP/HTTPS transport and XML payloads validated against XSDs.
+
+
+### Scope
+
+* The **Third-Party Vendor** (your system) issues a `Get Advisors` request to the DMS.
+* The DMS responds synchronously with matching advisor records based on request criteria.
+* Designed for **on-demand queries**, not for bulk advisor extractions.
+
+
+---
+
+## Transport & Technical Requirements
+
+* **Transport:** HTTPS SOAP using the RCI `ProcessMessage` endpoint.
+* **Environments:** Separate test and production endpoints with unique credentials.
+* **Response Codes:** Standard HTTP responses per [RFC 2616 §10](http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html).
+* **Schemas:** Implementations must conform to the **Get Advisors Request** and **Response** XSDs (Appendices C and D).
+
+
+---
+
+## Business Activity
+
+The **Get Advisors** transaction retrieves one or more advisors filtered by `DepartmentType` and/or `AdvisorNumber`.
+Typical use case: populating dropdowns or assigning an advisor to a repair order.
+
+Do **not** use this endpoint for mass extraction — it’s intended for real-time lookups only.
+
+
+---
+
+## Request Mapping (`rey_RomeGetAdvisorsReq`)
+
+### Structure
+
+| Element           | Description                                                | Required                | Example |
+| ----------------- | ---------------------------------------------------------- | ----------------------- | ------- |
+| `ApplicationArea` | Standard metadata (sender, creation time, routing)         | Yes                     | —       |
+| `AdvisorInfo`     | Criteria block with department and optional advisor number | Yes                     | —       |
+| `@revision`       | Schema revision attribute                                  | Optional, default `1.0` | `1.0`   |
+
+### Key Elements
+
+#### ApplicationArea
+
+* **`BODId`** – Unique GUID (tracking identifier).
+* **`CreationDateTime`** – `yyyy-MM-ddThh:mm:ssZ` (dealer local time).
+* **`Sender.Component`** – `"Rome"`.
+* **`Sender.Task`** – `"CU"`.
+* **`Sender.ReferenceId`** – `"Query"`.
+* **`Sender.CreatorNameCode`** – `"RCI"`.
+* **`Sender.SenderNameCode`** – `"RCI"`.
+* **`Destination.DestinationNameCode`** – `"RR"`.
+* **`Destination.DealerNumber`** – 15-char DMS system ID (e.g. `123456789012345`).
+* **`Destination.StoreNumber`** – 2-digit ERA or 6-digit POWER store code.
+* **`Destination.AreaNumber`** – 2-digit ERA or 6-digit POWER branch code.
+
+
+#### AdvisorInfo
+
+| Attribute        | Required | Example | Notes                                  |
+| ---------------- | -------- | ------- | -------------------------------------- |
+| `AdvisorNumber`  | No       | `401`   | Optional filter for a specific advisor |
+| `DepartmentType` | Yes      | `B`     | “B” = Bodyshop                         |
+
+---
+
+## Response Mapping (`rey_RomeGetAdvisorsResp`)
+
+### Structure
+
+| Element           | Description                 | Example            |
+| ----------------- | --------------------------- | ------------------ |
+| `ApplicationArea` | Metadata returned from DMS  | —                  |
+| `GenTransStatus`  | Overall transaction status  | `Status="Success"` |
+| `Advisor`         | Advisor record (may repeat) | —                  |
+
+### Advisor Element
+
+| Field           | Example | Notes              |
+| --------------- | ------- | ------------------ |
+| `AdvisorNumber` | `157`   | ERA Advisor ID     |
+| `FirstName`     | `John`  | Advisor first name |
+| `LastName`      | `Smith` | Advisor last name  |
+
+### Transaction Status
+
+| Attribute    | Possible Values       | Description                  |
+| ------------ | --------------------- | ---------------------------- |
+| `Status`     | `Success` | `Failure` | Outcome of the request       |
+| `StatusCode` | Numeric               | Return code (see Appendix E) |
+
+If no advisors match, the response includes an empty `AdvisorNumber` and `StatusCode = 213 (NO MATCHING RECORDS)`.
+
+
+---
+
+## Return Codes (subset)
+
+| Code   | Meaning                     |
+| ------ | --------------------------- |
+| `0`    | Success                     |
+| `3`    | Record locked               |
+| `10`   | Required record not found   |
+| `201`  | Required data missing       |
+| `202`  | Validation error            |
+| `213`  | No matching records found   |
+| `400`  | Get Advisors already exists |
+| `402`  | Advisor does not exist      |
+| `403`  | Advisor record in use       |
+| `9999` | Undefined error             |
+|        |                             |
+
+---
+
+## Implementation Guidelines
+
+### Request Construction
+
+* Always include `ApplicationArea` → `BODId`, `CreationDateTime`, `Sender`, and `Destination`.
+* `DepartmentType` is **mandatory**.
+* `AdvisorNumber` optional filter.
+* Generate a new GUID per request.
+* Match date/time to dealer local timezone.
+
+### Response Handling
+
+* Parse `GenTransStatus@Status` and `@StatusCode`.
+* On success, map advisors into your system.
+* On failure, use `StatusCode` and text node for error reporting.
+* If no advisors found, handle gracefully with empty result list.
+
+### Validation
+
+* Validate outbound XML against `rey_RomeGetAdvisorsReq.xsd`.
+* Validate inbound XML against `rey_RomeGetAdvisorsResp.xsd`.
+
+---
+
+## Example XMLs
+
+### Request
+
+```xml
+<rey_RomeGetAdvisorsReq revision="1.0" xmlns="http://www.starstandards.org/STAR">
+  <ApplicationArea>
+    <BODId>ef097f3a-01b2-1eca-b12a-80048cbb74f3</BODId>
+    <CreationDateTime>2025-10-07T16:00:00Z</CreationDateTime>
+    <Sender>
+      <Component>Rome</Component>
+      <Task>CU</Task>
+      <ReferenceId>Query</ReferenceId>
+      <CreatorNameCode>RCI</CreatorNameCode>
+      <SenderNameCode>RCI</SenderNameCode>
+    </Sender>
+    <Destination>
+      <DestinationNameCode>RR</DestinationNameCode>
+      <DealerNumber>PPERASV02000000</DealerNumber>
+      <StoreNumber>05</StoreNumber>
+      <AreaNumber>03</AreaNumber>
+    </Destination>
+  </ApplicationArea>
+  <AdvisorInfo DepartmentType="B"/>
+</rey_RomeGetAdvisorsReq>
+```
+
+### Response
+
+```xml
+<rey_RomeGetAdvisorsResp revision="1.0" xmlns="http://www.starstandards.org/STAR">
+  <ApplicationArea>
+    <BODId>ef097f3a-01b2-1eca-b12a-80048cbb74f3</BODId>
+    <CreationDateTime>2025-10-07T16:00:01Z</CreationDateTime>
+    <Sender>
+      <Component>Rome</Component>
+      <Task>CU</Task>
+      <ReferenceId>Update</ReferenceId>
+      <CreatorNameCode>RCI</CreatorNameCode>
+      <SenderNameCode>RCI</SenderNameCode>
+    </Sender>
+    <Destination>
+      <DestinationNameCode>RCI</DestinationNameCode>
+      <DealerNumber>PPERASV02000000</DealerNumber>
+      <StoreNumber>05</StoreNumber>
+      <AreaNumber>03</AreaNumber>
+    </Destination>
+  </ApplicationArea>
+  <GenTransStatus Status="Success" StatusCode="0"/>
+  <Advisor>
+    <AdvisorNumber>157</AdvisorNumber>
+    <FirstName>John</FirstName>
+    <LastName>Smith</LastName>
+  </Advisor>
+</rey_RomeGetAdvisorsResp>
+```
+
+---
+
+## Integration Checklist for ImEX/Rome
+
+* ✅ Map internal “Bodyshop Advisors” table → ERA Advisor IDs.
+* ✅ Use `DepartmentType="B"` for bodyshop context.
+* ✅ Cache responses short-term (e.g., 15 minutes) to minimize load.
+* ✅ Log all `BODId` ↔ Status ↔ ReturnCode triplets for audit.
+* ✅ Ensure XSD validation before and after transmission.
+
+---
+

_reference/reynolds/documentation/Rome Get Part Specification.pdf.md

@@ -0,0 +1,218 @@
+# Rome – Get Part (v1.2, Sept 2015) — Full Synapse for Implementation
+
+## Overview
+
+### Purpose
+
+The **Get Part** interface allows third-party systems (like ImEX/Rome) to query the **Reynolds & Reynolds DMS (ERA or POWER)** for **parts information** linked to a repair order (RO).
+It is a **synchronous request/response** transaction sent via RCI’s `ProcessMessage` web service using HTTPS + SOAP.
+
+---
+
+## Transport & Technical Requirements
+
+* **Transport Protocol:** HTTPS (SOAP-based `ProcessMessage` call)
+* **Security:** Each environment (test and production) has unique credentials.
+* **Response Codes:** Uses standard HTTP codes (per RFC 2616 §10).
+* **Schemas:** Defined in Appendices C (Request) and D (Response) — validated XML.
+* **Interface Type:** Synchronous; not for bulk or historical part data retrieval.
+
+---
+
+## Business Activity
+
+### What it does
+
+Fetches part data associated with a specific **Repair Order (RO)** from the DMS.
+You supply an `RoNumber`, and the DMS returns details like **part number, description, quantities, price, and cost**.
+
+### Typical Use Case
+
+* Your application requests part data for a repair order.
+* The DMS returns the current parts list for that RO.
+
+### Limitation
+
+⚠️ Not designed for mass extraction — one RO at a time only.
+
+---
+
+## Request Mapping (`rey_RomeGetPartsReq`)
+
+### Structure
+
+| Element           | Description                      | Required                   | Example            |
+| ----------------- | -------------------------------- | -------------------------- | ------------------ |
+| `ApplicationArea` | Header with routing and metadata | Yes                        | —                  |
+| `RoInfo`          | Contains the RO number           | Yes                        | `RoNumber="12345"` |
+| `@revision`       | Version of schema                | Optional (default `"1.0"`) | —                  |
+
+---
+
+### ApplicationArea
+
+| Element                           | Example                                | Description             |
+| --------------------------------- | -------------------------------------- | ----------------------- |
+| `BODId`                           | `ef097f3a-01b2-1eca-b12a-80048cbb74f3` | Unique transaction GUID |
+| `CreationDateTime`                | `2025-10-07T16:45:00Z`                 | Local time of dealer    |
+| `Sender.Component`                | `"Rome"`                               | Sending application     |
+| `Sender.Task`                     | `"RCT"`                                | Literal                 |
+| `Sender.ReferenceId`              | `"Query"`                              | Literal                 |
+| `Sender.CreatorNameCode`          | `"RCI"`                                | Literal                 |
+| `Sender.SenderNameCode`           | `"RCI"`                                | Literal                 |
+| `Destination.DestinationNameCode` | `"RR"`                                 | Literal                 |
+| `Destination.DealerNumber`        | `PPERASV02000000`                      | DMS routing ID          |
+| `Destination.StoreNumber`         | `05`                                   | ERA store code          |
+| `Destination.AreaNumber`          | `03`                                   | ERA branch code         |
+
+---
+
+### RoInfo
+
+| Attribute  | Required | Example | Description                                         |
+| ---------- | -------- | ------- | --------------------------------------------------- |
+| `RoNumber` | Yes      | `12345` | The repair order number for which to retrieve parts |
+
+---
+
+## Response Mapping (`rey_RomeGetPartsResp`)
+
+### Structure
+
+| Element           | Description                  | Multiplicity |
+| ----------------- | ---------------------------- | ------------ |
+| `ApplicationArea` | Standard header              | 1            |
+| `GenTransStatus`  | Transaction status block     | 1            |
+| `RoParts`         | The returned parts record(s) | 1..N         |
+
+---
+
+### RoParts Elements
+
+| Element           | Example    | Description                              |
+| ----------------- | ---------- | ---------------------------------------- |
+| `PartNumber`      | `FO12345`  | Part number                              |
+| `PartDescription` | `Gasket`   | Description                              |
+| `QuantityOrdered` | `2`        | Quantity ordered                         |
+| `QuantityShipped` | `2`        | Quantity shipped                         |
+| `Price`           | `35.00`    | Retail price                             |
+| `Cost`            | `25.00`    | Dealer cost                              |
+| `ProcessedFlag`   | `Y` or `N` | Indicates whether part processed into RO |
+| `AddOrDelete`     | `A` or `D` | Whether the part was added or deleted    |
+
+> **Note:** A `ProcessedFlag` of `"N"` indicates a part was added via the API but not yet finalized in ERA Program 2525 (not sold). These parts are “echoed” back so the client does not mistake them for deleted ones.
+
+---
+
+## Transaction Status (`GenTransStatus`)
+
+| Attribute    | Possible Values      | Example                      | Description            |
+| ------------ | -------------------- | ---------------------------- | ---------------------- |
+| `Status`     | `Success`, `Failure` | `"Success"`                  | Indicates outcome      |
+| `StatusCode` | Integer              | `"0"`                        | Numeric status code    |
+| Text Node    | Optional             | `"No matching record found"` | Human-readable message |
+
+---
+
+## Return Codes (subset)
+
+| Code   | Meaning                   |
+| ------ | ------------------------- |
+| `0`    | Success                   |
+| `3`    | Record locked             |
+| `10`   | Required record not found |
+| `201`  | Required data missing     |
+| `202`  | Validation error          |
+| `519`  | No part available         |
+| `9999` | Undefined error           |
+
+
+
+---
+
+## Example XMLs
+
+### Request
+
+```xml
+<rey_RomeGetPartsReq revision="1.0" xmlns="http://www.starstandards.org/STAR">
+  <ApplicationArea>
+    <BODId>ef097f3a-01b2-1eca-b12a-80048cbb74f3</BODId>
+    <CreationDateTime>2025-10-07T16:00:00Z</CreationDateTime>
+    <Sender>
+      <Component>Rome</Component>
+      <Task>RCT</Task>
+      <ReferenceId>Query</ReferenceId>
+      <CreatorNameCode>RCI</CreatorNameCode>
+      <SenderNameCode>RCI</SenderNameCode>
+    </Sender>
+    <Destination>
+      <DestinationNameCode>RR</DestinationNameCode>
+      <DealerNumber>PPERASV02000000</DealerNumber>
+      <StoreNumber>05</StoreNumber>
+      <AreaNumber>03</AreaNumber>
+    </Destination>
+  </ApplicationArea>
+  <RoInfo RoNumber="12345"/>
+</rey_RomeGetPartsReq>
+```
+
+### Response
+
+```xml
+<rey_RomeGetPartsResp revision="1.0" xmlns="http://www.starstandards.org/STAR">
+  <ApplicationArea>
+    <BODId>ef097f3a-01b2-1eca-b12a-80048cbb74f3</BODId>
+    <CreationDateTime>2025-10-07T16:00:01Z</CreationDateTime>
+    <Sender>
+      <Component>RCT</Component>
+      <Task>RCT</Task>
+      <ReferenceId>Update</ReferenceId>
+      <CreatorNameCode>RCI</CreatorNameCode>
+      <SenderNameCode>RCI</SenderNameCode>
+    </Sender>
+    <Destination>
+      <DestinationNameCode>RR</DestinationNameCode>
+      <DealerNumber>PPERASV02000000</DealerNumber>
+      <StoreNumber>05</StoreNumber>
+      <AreaNumber>03</AreaNumber>
+    </Destination>
+  </ApplicationArea>
+  <GenTransStatus Status="Success" StatusCode="0"/>
+  <RoParts>
+    <PartNumber>FO12345</PartNumber>
+    <PartDescription>Gasket</PartDescription>
+    <QuantityOrdered>2</QuantityOrdered>
+    <QuantityShipped>2</QuantityShipped>
+    <Price>35.00</Price>
+    <Cost>25.00</Cost>
+    <ProcessedFlag>Y</ProcessedFlag>
+    <AddOrDelete>A</AddOrDelete>
+  </RoParts>
+</rey_RomeGetPartsResp>
+```
+
+---
+
+## Implementation Notes for ImEX/Rome
+
+✅ **Request**
+
+* Always include `RoNumber`.
+* `BODId` must be a unique GUID.
+* Set correct DMS routing (dealer/store/branch).
+* Validate against XSD before sending.
+
+✅ **Response**
+
+* Parse `GenTransStatus.Status` and `StatusCode`.
+* If `519` (no part available), handle gracefully.
+* `ProcessedFlag="N"` parts should not be treated as active.
+* Cache parts data locally for quick access.
+
+✅ **Error Handling**
+
+* Log `BODId`, `StatusCode`, and XML payloads.
+* Retry transient network errors; not logical ones (e.g., 519, 10).
+
+---

_reference/reynolds/documentation/Rome Insert Service Vehicle Interface Specification.pdf.md

@@ -0,0 +1,84 @@
+## 🧩 **Rome Service Vehicle Insert — Developer Integration Summary**
+
+### **Purpose & Scope**
+
+This interface allows third-party systems (like your Rome middleware) to insert a new *Service Vehicle* record into the Reynolds & Reynolds DMS.
+The DMS will validate the provided vehicle and customer data, create the record if valid, and respond with a status of `Success` or `Failure`.
+
+---
+
+### **Core Workflow**
+
+1. **POST** a SOAP request to the Reynolds endpoint (`ProcessMessage`).
+2. Include the XML payload structured as `rey_RomeServVehicleInsertRequest`.
+3. Receive `rey_RomeServVehicleInsertResponse` with:
+
+   * Transmission status (`GenTransStatus`),
+   * Optional `StatusCode` from the return codes table (Appendix E).
+
+---
+
+### **Request (`rey_RomeServVehicleInsertRequest`)**
+
+**Sections:**
+
+* **ApplicationArea**
+
+  * Metadata such as `CreationDateTime`, `BODId`, and sender/destination details.
+* **Vehicle**
+
+  * Basic vehicle identity fields (`Vin`, `VehicleMake`, `VehicleYear`, etc.).
+  * Sub-element `VehicleDetail` for mechanical attributes (`Aircond`, `EngineConfig`, etc.).
+* **VehicleServInfo**
+
+  * Operational context: stock ID, customer number, advisor, warranty, production dates, etc.
+  * Includes sub-elements:
+
+    * `VehExtWarranty` (contract #, expiration date/mileage)
+    * `Advisor` → `ContactInfo` (NameRecId)
+
+**Required core fields**
+
+* `Vin` (validated via `GEVINVAL`)
+* `VehicleMake`, `VehicleYear`, `ModelDesc`, `Carline`
+* `CustomerNo` (must pre-exist)
+* `SalesmanNo` (valid advisor)
+* `InServiceDate` ≤ current date
+* `TeamCode` – must exist in `MECHANICS` file
+
+---
+
+### **Response (`rey_RomeServVehicleInsertResponse`)**
+
+**Elements:**
+
+* `ApplicationArea` – mirrors request metadata.
+* `GenTransStatus` – attributes:
+
+  * `Status` = `Success` | `Failure`
+  * `StatusCode` = numeric code (see Appendix E)
+
+---
+
+### **Error Codes (Appendix E Highlights)**
+
+| Code   | Meaning                                               |
+| ------ | ----------------------------------------------------- |
+| `0`    | Success                                               |
+| `300`  | Vehicle already exists                                |
+| `301`  | Invalid make or ownership not established             |
+| `502`  | Advisor was terminated                                |
+| `506`  | Mileage must be greater than last mileage             |
+| `513`  | VIN must be added to ERA2 before an RO can be created |
+| `9999` | Undefined error                                       |
+
+---
+
+### **Implementation Notes**
+
+* Endpoint authentication and URL differ between **test** and **production**.
+* Ensure all date fields follow format `MM/DD/YYYYThh:mm:ssZ(EST)` (local dealer time).
+* Use `GUID` for `BODId` to ensure message traceability.
+* Validate VIN before submission; rejected VINs halt insertion.
+
+---

_reference/reynolds/documentation/Rome Search Customer Service Vehicle Combined Specification.pdf.md

@@ -0,0 +1,59 @@
+# Rome – Search Customer Service Vehicle Combined (v1.1, May 2015) — Full Synapse
+
+**What it does:** one-shot search that returns **customer identity + all matching service vehicles** based on exactly **one** of the permitted search patterns (e.g., `NameRecId`, `FullName`, `Phone`, `Partial VIN`, `Stock #`, `License #`, or `FullName/LName + Model triple`). Results include customer contact info and each vehicle’s details and service metadata. 
+
+## Transport
+
+* **SOAP/HTTPS** to RCI `ProcessMessage`, separate **test** and **prod** endpoints/credentials.
+* Standard HTTP response codes; XML payloads validate against request/response XSDs. 
+
+## Trigger & allowed search modes
+
+Pick **exactly one** of these (no mixing):
+
+1. `Last Name + Partial VIN`
+2. `Full Name + Partial VIN`
+3. `Last Name + Phone`
+4. `Full Name + Phone`
+5. `Full Name` (alone)
+6. `NameRecId` (alone)
+7. `Phone` (alone)
+8. `Phone + Partial VIN`
+9. `Last Name + (Make, Model, Year)`
+10. `Full Name + (Make, Model, Year)`
+11. `Vehicle Stock #` (alone)
+12. `Vehicle License #` (alone)
+13. `Partial or Full VIN` (alone)
+    Business customers only match with `NameRecId`, `Phone`, `Stock #`, `License #`, `Phone+Partial VIN`, or `Partial/Full VIN`. 
+
+## Request (`rey_RomeCustServVehCombReq`)
+
+* **`ApplicationArea`**: `Sender` (Component=`Rome`, Task=`CVC`, CreatorNameCode=`RCI`, SenderNameCode=`RCI`), `CreationDateTime` (`yyyy-mm-ddThh:mm:ssZ`), optional `BODId` (GUID), `Destination` (DestinationNameCode=`RR`, plus dealer/store/area routing). 
+* **`CustServVehCombReq`**:
+
+  * `QueryData`: one of `LName`, `FullName(FName,LName,MName)`, `NameRecId(CustIdStart)`, `Phone(Num)`, `PartVIN(Vin)`, `StkNo(VehId)`, `LicenseNum(LicNo)`; optional `MaxRecs` (≤ 50).
+  * `VehData`: `MakePfx` (2-char make), `Model` (carline/description match), `Year` (2 or 4).
+  * `OtherCriteria` present but “not used”. 
+
+## Response (`rey_RomeCustServVehComb`)
+
+* **`ApplicationArea`** (Sender typically `RR`, Task=`CVC`, etc.) and **`TransStatus`** with `Status`=`Success|Failure`, `StatusCode` (numeric), and optional message text.
+* **`CustServVehComb`** records (0..n), each with:
+
+  * **`NameContactId`**: `NameId` (`IBFlag` `I|B`, individual or business name + optional `NameRecId`), plus repeating `Address`, `ContactOptions`, `Phone`, `Email`.
+  * **`ServVehicle`** (0..n): `Vehicle` (VIN, Make, Year, Model, Carline, color, detail attrs), and `VehicleServInfo` (attributes for StockID, CustomerNo, Service history fields; children: `VehExtWarranty`, `Advisor.ContactInfo@NameRecId`, `VehServComments*`). 
+
+## Return codes (subset)
+
+* `0` Success; `201` Required data missing; `202` Validation error; `213` No matching records; `9999` Undefined error. (Use `TransStatus@StatusCode` + text to decide UX.) 
+
+## Implementation checklist
+
+* Build one of the **allowed** queries; if multiple criteria are supplied, RCI treats it as invalid.
+* Generate **`BODId`** GUID per call; log it for tracing.
+* Fill **routing** (`DealerNumber`, `StoreNumber`, `AreaNumber`) for the target store/branch.
+* Enforce `MaxRecs` (default is 1; if >1 results and `MaxRecs` omitted, API returns “multiple exist” error).
+* XSD-validate request/response; map `TransStatus` to domain errors; return empty list on `213`. 
+
+---
+

_reference/reynolds/documentation/Rome Update Body Shop Management Repair Order Interface Specification.pdf.md

@@ -0,0 +1,76 @@
+# Rome – Update Body Shop Management Repair Order (v1.6, Jan 2016) — Full Synapse
+
+**Purpose**
+This interface allows a Body Shop Management (BSM) system to update an existing *Repair Order (RO)* in the Reynolds & Reynolds DMS. It covers updates to general RO details, labor operations, parts, GOG (gas, oil, grease) items, and miscellaneous charges .
+
+---
+
+## 🧩 Core Workflow
+
+1. **BSM System → RCI Gateway → Reynolds DMS**
+
+   * BSM sends a SOAP/XML request (`rey_RomeUpdateBSMRepairOrderReq`) to RCI.
+   * DMS validates and processes the update.
+   * DMS replies with `rey_RomeUpdateBSMRepairOrderResp`.
+
+2. **Supported updates**
+
+   * Comments, tax codes, and estimate type.
+   * Labor operation details (e.g., billing rates, opcodes).
+   * Parts (add, delete, modify).
+   * GOG and Misc items with financial attributes.
+
+---
+
+## 🧱 Request Structure — `rey_RomeUpdateBSMRepairOrderReq`
+
+| Section             | Description                                                                  |                                                                |
+| ------------------- | ---------------------------------------------------------------------------- | -------------------------------------------------------------- |
+| **ApplicationArea** | Identifies sender (`Rome/RCI`), creation time, and destination dealer/store. |                                                                |
+| **RoRecord**        | Main data payload, with attribute `FinalUpdate="Y                            | N"`. Includes general, labor, part, GOG, and misc subsections. |
+
+### RoRecord subsections
+
+* **Rogen:** Header data — `RoNo`, `CustNo`, `TagNo`, mileage, and optional `RoCommentInfo`, `EstimateInfo`, and `TaxCodeInfo`.
+* **Rolabor:** One or more `OpCodeLaborInfo` nodes containing:
+
+  * `OpCode`, `JobNo`, and pay type flags (`Cust`, `Intr`, `Warr`).
+  * Nested `BillTimeRateHrs`, `CCCStmts` (Cause/Complaint/Correction), and `RoAmts` (billing amounts).
+* **Ropart:** Job-linked `PartInfoByJob` with `OSDPartDetail` items.
+* **Rogog:** “Gas/Oil/Grease” lines (`AllGogOpCodeInfo` → `AllGogLineItmInfo`).
+* **Romisc:** Miscellaneous charge sections (`MiscOpCodeInfo` → `MiscLineItmInfo`).
+
+---
+
+## 📤 Response Structure — `rey_RomeUpdateBSMRepairOrderResp`
+
+| Element             | Description                                                                              |                                   |
+| ------------------- | ---------------------------------------------------------------------------------------- | --------------------------------- |
+| **ApplicationArea** | Mirrors the request metadata (sender now `ERA/RR`).                                      |                                   |
+| **GenTransStatus**  | `Status="Success                                                                         | Failure"`and numeric`StatusCode`. |
+| **RoRecordStatus**  | Attributes include `Status`, `Date`, `Time`, `OutsdRoNo`, `DMSRoNo`, and `ErrorMessage`. |                                   |
+
+---
+
+## ⚙️ Key Return Codes
+
+| Code   | Meaning                |
+| ------ | ---------------------- |
+| `0`    | Success                |
+| `300`  | RO not found           |
+| `301`  | Invalid RO number      |
+| `501`  | Invalid tax code       |
+| `503`  | Invalid opcode         |
+| `9999` | Undefined system error |
+
+---
+
+## 🧩 Implementation Notes
+
+* **FinalUpdate="Y"** signals the RO is finalized in the DMS.
+* The DMS uses **RO#, Dealer#, and Store#** to locate the target record.
+* **JobNo** groups labor and parts within the same operation.
+* Monetary and tax fields are sent as strings (DMS expects implicit decimal).
+* Every RO update must be uniquely identified by a **BODId** (GUID).
+* Validation failures trigger a response with `Status="Failure"` and `ErrorMessage` populated.
+

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

@@ -182,7 +182,7 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills, ref
       <Table
         loading={loading}
         dataSource={dataSource}
-        pagination={{ placement: "top", pageSize: exportPageLimit }}
+        pagination={{ placement: "top", pageSize: exportPageLimit, showSizeChanger: false }}
         columns={columns}
         rowKey="id"
         onChange={handleTableChange}

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

@@ -195,7 +195,7 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, payments,
       <Table
         loading={loading}
         dataSource={dataSource}
-        pagination={{ placement: "top", pageSize: exportPageLimit }}
+        pagination={{ placement: "top", pageSize: exportPageLimit, showSizeChanger: false }}
         columns={columns}
         rowKey="id"
         onChange={handleTableChange}

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

@@ -212,7 +212,7 @@ export function AccountingReceivablesTableComponent({ bodyshop, loading, jobs, r
       <Table
         loading={loading}
         dataSource={dataSource}
-        pagination={{ placement: "top", pageSize: exportPageLimit }}
+        pagination={{ placement: "top", pageSize: exportPageLimit, showSizeChanger: false }}
         columns={columns}
         rowKey="id"
         onChange={handleTableChange}

client/src/components/bill-form/bill-form.lines.component.jsx

@@ -336,7 +336,7 @@ export function BillEnterModalLinesComponent({
                     controls={false}
                     tabIndex={0}
                     style={{ width: "100%", height: CONTROL_HEIGHT }}
-                    // NOTE: No auto-fill on focus/blur; only triggered from Retail on Tab
+                    onFocus={() => autofillActualCost(index)}
                   />
                 </Form.Item>
               </div>

client/src/components/dms-customer-selector/dms-customer-selector.component.jsx

@@ -23,13 +23,13 @@ export default connect(mapStateToProps, mapDispatchToProps)(DmsCustomerSelector)
  * @constructor
  */
 export function DmsCustomerSelector(props) {
-  const { bodyshop, jobid, socket, rrOptions = {} } = props;
+  const { bodyshop, jobid, job, socket, rrOptions = {} } = props;
 
   // Centralized "mode" (provider + transport)
   const mode = props.mode;
 
   // Stable base props for children
-  const base = useMemo(() => ({ bodyshop, jobid, socket }), [bodyshop, jobid, socket]);
+  const base = useMemo(() => ({ bodyshop, jobid, job, socket }), [bodyshop, jobid, job, socket]);
 
   switch (mode) {
     case DMS_MAP.reynolds: {

client/src/components/dms-customer-selector/rr-customer-selector.jsx

@@ -1,4 +1,4 @@
-import { Alert, Button, Checkbox, Col, message, Space, Table } from "antd";
+import { Alert, Button, Checkbox, message, Modal, Space, Table } from "antd";
 import { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
@@ -47,6 +47,7 @@ const rrAddressToString = (addr) => {
 export default function RRCustomerSelector({
   jobid,
   socket,
+  job,
   rrOpenRoLimit = false,
   onRrOpenRoFinished,
   rrValidationPending = false,
@@ -59,15 +60,26 @@ export default function RRCustomerSelector({
   const [refreshing, setRefreshing] = useState(false);
 
   // Show dialog automatically when validation is pending
+  // BUT: skip this for early RO flow (job already has dms_id)
   useEffect(() => {
-    if (rrValidationPending) setOpen(true);
-  }, [rrValidationPending]);
+    if (rrValidationPending && !job?.dms_id) {
+      setOpen(true);
+    }
+  }, [rrValidationPending, job?.dms_id]);
 
   // Listen for RR customer selection list
   useEffect(() => {
     if (!socket) return;
     const handleRrSelectCustomer = (list) => {
       const normalized = normalizeRrList(list);
+      
+      // If list is empty, it means early RO exists and customer selection should be skipped
+      // Don't open the modal in this case
+      if (normalized.length === 0) {
+        setRefreshing(false);
+        return;
+      }
+      
       setOpen(true);
       setCustomerList(normalized);
       const firstOwner = normalized.find((r) => r.vinOwner)?.custNo;
@@ -127,6 +139,10 @@ export default function RRCustomerSelector({
     });
   };
 
+  const handleClose = () => {
+    setOpen(false);
+  };
+
   const refreshRrSearch = () => {
     setRefreshing(true);
     const to = setTimeout(() => setRefreshing(false), 12000);
@@ -141,8 +157,6 @@ export default function RRCustomerSelector({
     socket.emit("rr-export-job", { jobId: jobid });
   };
 
-  if (!open) return null;
-
   const columns = [
     { title: t("jobs.fields.dms.id"), dataIndex: "custNo", key: "custNo" },
     {
@@ -169,8 +183,45 @@ export default function RRCustomerSelector({
     return !rrOwnerSet.has(String(record.custNo));
   };
 
+  // For early RO flow: show validation banner even when modal is closed
+  if (!open) {
+    if (rrValidationPending && job?.dms_id) {
+      return (
+        <div style={{ marginBottom: 16 }}>
+          <Alert
+            type="info"
+            showIcon
+            title="Complete Validation in Reynolds"
+            description={
+              <div style={{ display: "flex", flexDirection: "column", gap: 8 }}>
+                <div>
+                  We created the Repair Order. Please validate the totals and taxes in the DMS system. When done,
+                  click <strong>Finished</strong> to finalize and mark this export as complete.
+                </div>
+                <div>
+                  <Space>
+                    <Button type="primary" onClick={onValidationFinished}>
+                      Finished
+                    </Button>
+                  </Space>
+                </div>
+              </div>
+            }
+          />
+        </div>
+      );
+    }
+    return null;
+  }
+
   return (
-    <Col span={24}>
+    <Modal
+      open={open}
+      onCancel={handleClose}
+      footer={null}
+      width={800}
+      title={t("dms.selectCustomer")}
+    >
       <Table
         title={() => (
           <div style={{ display: "flex", flexDirection: "column", gap: 8 }}>
@@ -196,8 +247,8 @@ export default function RRCustomerSelector({
               />
             )}
 
-            {/* Validation step banner */}
-            {rrValidationPending && (
+            {/* Validation step banner - only show for NON-early RO flow (legacy) */}
+            {rrValidationPending && !job?.dms_id && (
               <Alert
                 type="info"
                 showIcon
@@ -262,6 +313,6 @@ export default function RRCustomerSelector({
           getCheckboxProps: (record) => ({ disabled: rrDisableRow(record) })
         }}
       />
-    </Col>
+    </Modal>
   );
 }

client/src/components/dms-log-events/dms-log-events.component.jsx

@@ -69,7 +69,7 @@ export function DmsLogEvents({
         return {
           key: idx,
           color: logLevelColor(level),
-          children: (
+          content: (
             <Space orientation="vertical" size={4} style={{ display: "flex" }}>
               {/* Row 1: summary + inline "Details" toggle */}
               <Space wrap align="start">
@@ -113,7 +113,7 @@ export function DmsLogEvents({
     [logs, openSet, colorizeJson, isDarkMode, showDetails]
   );
 
-  return <Timeline pending reverse items={items} />;
+  return <Timeline reverse items={items} />;
 }
 
 /**

client/src/components/dms-post-form/rr-dms-post-form.jsx

@@ -208,8 +208,18 @@ export default function RRPostForm({
     });
   };
 
+  // Check if early RO was created (job has all early RO fields)
+  const hasEarlyRO = !!(job?.dms_id && job?.dms_customer_id && job?.dms_advisor_id);
+
   return (
     <Card title={t("jobs.labels.dms.postingform")}>
+      {hasEarlyRO && (
+        <Typography.Paragraph type="success" strong style={{ marginBottom: 16 }}>
+          ✅ {t("jobs.labels.dms.earlyro.created")} {job.dms_id}
+          <br />
+          <Typography.Text type="secondary">{t("jobs.labels.dms.earlyro.willupdate")}</Typography.Text>
+        </Typography.Paragraph>
+      )}
       <Form
         form={form}
         layout="vertical"
@@ -218,96 +228,96 @@ export default function RRPostForm({
         initialValues={initialValues}
       >
         <Row gutter={[16, 12]} align="bottom">
-          {/* Advisor + inline Refresh */}
-          <Col xs={24} sm={24} md={12} lg={8}>
-            <Form.Item label={t("jobs.fields.dms.advisor")} required>
-              <Space.Compact block>
-                <Form.Item
-                  name="advisorNo"
-                  noStyle
-                  rules={[{ required: true, message: t("general.validation.required") }]}
-                >
-                  <Select
-                    style={{ flex: 1 }}
-                    loading={advLoading}
-                    allowClear
-                    placeholder={t("general.actions.select", "Select...")}
-                    popupMatchSelectWidth
-                    options={advisors
-                      .map((a) => {
-                        const value = getAdvisorNumber(a);
-                        if (value == null) return null;
-                        return { value: String(value), label: getAdvisorLabel(a) || String(value) };
-                      })
-                      .filter(Boolean)}
-                    notFoundContent={advLoading ? t("general.labels.loading") : t("general.labels.none")}
-                  />
-                </Form.Item>
-                <Tooltip title={t("general.actions.refresh")}>
-                  <Button
-                    aria-label={t("general.actions.refresh")}
-                    icon={<ReloadOutlined />}
-                    onClick={() => fetchRrAdvisors(true)}
-                    loading={advLoading}
-                  />
-                </Tooltip>
-              </Space.Compact>
-            </Form.Item>
-          </Col>
-
-          {/* RR OpCode (prefix / base / suffix) */}
-          <Col xs={24} sm={12} md={12} lg={8}>
-            <Form.Item
-              required
-              label={
-                <Space size="small" align="center">
-                  {t("jobs.fields.dms.rr_opcode", "RR OpCode")}
-                  {isCustomOpCode && (
+          {/* Advisor + inline Refresh - Only show if no early RO */}
+          {!hasEarlyRO && (
+            <Col xs={24} sm={24} md={12} lg={8}>
+              <Form.Item label={t("jobs.fields.dms.advisor")} required>
+                <Space.Compact block>
+                  <Form.Item
+                    name="advisorNo"
+                    noStyle
+                    rules={[{ required: true, message: t("general.validation.required") }]}
+                  >
+                    <Select
+                      style={{ flex: 1 }}
+                      loading={advLoading}
+                      allowClear
+                      placeholder={t("general.actions.select", "Select...")}
+                      popupMatchSelectWidth
+                      options={advisors
+                        .map((a) => {
+                          const value = getAdvisorNumber(a);
+                          if (value == null) return null;
+                          return { value: String(value), label: getAdvisorLabel(a) || String(value) };
+                        })
+                        .filter(Boolean)}
+                      notFoundContent={advLoading ? t("general.labels.loading") : t("general.labels.none")}
+                    />
+                  </Form.Item>
+                  <Tooltip title={t("general.actions.refresh")}>
                     <Button
-                      type="link"
-                      size="small"
-                      icon={<RollbackOutlined />}
-                      onClick={handleResetOpCode}
-                      style={{ padding: 0 }}
-                    >
-                      {t("jobs.fields.dms.rr_opcode_reset", "Reset")}
-                    </Button>
-                  )}
-                </Space>
-              }
-            >
-              <Space.Compact block>
-                <Form.Item name="opPrefix" noStyle>
-                  <Input
-                    allowClear
-                    maxLength={4}
-                    style={{ width: "30%" }}
-                    placeholder={t("jobs.fields.dms.rr_opcode_prefix", "Prefix")}
-                  />
-                </Form.Item>
-                <Form.Item
-                  name="opBase"
-                  noStyle
-                  rules={[{ required: true, message: t("general.validation.required") }]}
-                >
-                  <Input
-                    allowClear
-                    maxLength={10}
-                    style={{ width: "40%" }}
-                    placeholder={t("jobs.fields.dms.rr_opcode_base", "Base")}
-                  />
-                </Form.Item>
-                <Form.Item name="opSuffix" noStyle>
-                  <Input
-                    allowClear
-                    maxLength={4}
-                    style={{ width: "30%" }}
-                    placeholder={t("jobs.fields.dms.rr_opcode_suffix", "Suffix")}
-                  />
-                </Form.Item>
-              </Space.Compact>
-            </Form.Item>
-          </Col>
+                      aria-label={t("general.actions.refresh")}
+                      icon={<ReloadOutlined />}
+                      onClick={() => fetchRrAdvisors(true)}
+                      loading={advLoading}
+                    />
+                  </Tooltip>
+                </Space.Compact>
+              </Form.Item>
+            </Col>
+          )}
+
+          {/* RR OpCode (prefix / base / suffix) - Only show if no early RO */}
+          {!hasEarlyRO && (
+            <Col xs={24} sm={12} md={12} lg={8}>
+              <Form.Item
+                required
+                label={
+                  <Space size="small" align="center">
+                    {t("jobs.fields.dms.rr_opcode", "RR OpCode")}
+                    {isCustomOpCode && (
+                      <Button
+                        type="link"
+                        size="small"
+                        icon={<RollbackOutlined />}
+                        onClick={handleResetOpCode}
+                        style={{ padding: 0 }}
+                      >
+                        {t("jobs.fields.dms.rr_opcode_reset", "Reset")}
+                      </Button>
+                    )}
+                  </Space>
+                }
+              >
+                <Space.Compact block>
+                  <Form.Item name="opPrefix" noStyle>
+                    <Input
+                      allowClear
+                      maxLength={4}
+                      style={{ width: "30%" }}
+                      placeholder={t("jobs.fields.dms.rr_opcode_prefix", "Prefix")}
+                    />
+                  </Form.Item>
+                  <Form.Item name="opBase" noStyle rules={[{ required: true }]}>
+                    <Input
+                      allowClear
+                      maxLength={10}
+                      style={{ width: "40%" }}
+                      placeholder={t("jobs.fields.dms.rr_opcode_base", "Base")}
+                    />
+                  </Form.Item>
+                  <Form.Item name="opSuffix" noStyle>
+                    <Input
+                      allowClear
+                      maxLength={4}
+                      style={{ width: "30%" }}
+                      placeholder={t("jobs.fields.dms.rr_opcode_suffix", "Suffix")}
+                    />
+                  </Form.Item>
+                </Space.Compact>
+              </Form.Item>
+            </Col>
+          )}
 
           <Col xs={12} sm={8} md={6} lg={4}>
             <Form.Item name="kmin" label={t("jobs.fields.kmin")} initialValue={job?.kmin} rules={[{ required: true }]}>
@@ -355,13 +365,14 @@ export default function RRPostForm({
         {/* Validation  */}
         <Form.Item shouldUpdate>
           {() => {
-            const advisorOk = !!form.getFieldValue("advisorNo");
+            // When early RO exists, advisor is already set, so we don't need to validate it
+            const advisorOk = hasEarlyRO ? true : !!form.getFieldValue("advisorNo");
             return (
               <Space size="large" wrap align="center">
                 <Statistic title={t("jobs.labels.subtotal")} value={totals.totalSale.toFormat()} />
                 <Typography.Title>=</Typography.Title>
-                <Button disabled={!advisorOk} htmlType="submit">
-                  {t("jobs.actions.dms.post")}
+                <Button disabled={!advisorOk} htmlType="submit" type={hasEarlyRO ? "default" : "primary"}>
+                  {hasEarlyRO ? t("jobs.actions.dms.update_ro") : t("jobs.actions.dms.post")}
                 </Button>
               </Space>
             );

client/src/components/dms-post-form/rr-early-ro-form.jsx

@@ -0,0 +1,367 @@
+import { ReloadOutlined } from "@ant-design/icons";
+import { Alert, Button, Form, Input, InputNumber, Modal, Radio, Select, Space, Table, Typography } from "antd";
+import { useEffect, useMemo, useState } from "react";
+
+// Simple customer selector table
+function CustomerSelectorTable({ customers, onSelect, isSubmitting }) {
+  const [selectedCustNo, setSelectedCustNo] = useState(null);
+
+  const columns = [
+    {
+      title: "Select",
+      key: "select",
+      width: 80,
+      render: (_, record) => (
+        <Radio checked={selectedCustNo === record.custNo} onChange={() => setSelectedCustNo(record.custNo)} />
+      )
+    },
+    { title: "Customer ID", dataIndex: "custNo", key: "custNo" },
+    { title: "Name", dataIndex: "name", key: "name" },
+    {
+      title: "VIN Owner",
+      key: "vinOwner",
+      render: (_, record) => (record.vinOwner || record.isVehicleOwner ? "Yes" : "No")
+    }
+  ];
+
+  return (
+    <div>
+      <Table columns={columns} dataSource={customers} rowKey="custNo" pagination={false} size="small" />
+      <div style={{ marginTop: 16, display: "flex", gap: 8 }}>
+        <Button
+          type="primary"
+          onClick={() => onSelect(selectedCustNo, false)}
+          disabled={!selectedCustNo || isSubmitting}
+          loading={isSubmitting}
+        >
+          Use Selected Customer
+        </Button>
+        <Button onClick={() => onSelect(null, true)} disabled={isSubmitting} loading={isSubmitting}>
+          Create New Customer
+        </Button>
+      </div>
+    </div>
+  );
+}
+
+/**
+ * RR Early RO Creation Form
+ * Used from convert button or admin page to create minimal RO before full export
+ * @param bodyshop
+ * @param socket
+ * @param job
+ * @param onSuccess - callback when RO is created successfully
+ * @param onCancel - callback to close modal
+ * @param showCancelButton - whether to show cancel button
+ * @returns {JSX.Element}
+ * @constructor
+ */
+export default function RREarlyROForm({ bodyshop, socket, job, onSuccess, onCancel, showCancelButton = true }) {
+  const [form] = Form.useForm();
+
+  // Advisors
+  const [advisors, setAdvisors] = useState([]);
+  const [advLoading, setAdvLoading] = useState(false);
+
+  // Customer selection
+  const [customerCandidates, setCustomerCandidates] = useState([]);
+  const [showCustomerSelector, setShowCustomerSelector] = useState(false);
+
+  // Loading and success states
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [earlyRoCreated, setEarlyRoCreated] = useState(!!job?.dms_id);
+  const [createdRoNumber, setCreatedRoNumber] = useState(job?.dms_id || null);
+
+  // Derive default OpCode parts from bodyshop config (matching dms.container.jsx logic)
+  const initialValues = useMemo(() => {
+    const cfg = bodyshop?.rr_configuration || {};
+    const defaults =
+      cfg.opCodeDefault ||
+      cfg.op_code_default ||
+      cfg.op_codes?.default ||
+      cfg.defaults?.opCode ||
+      cfg.defaults ||
+      cfg.default ||
+      {};
+
+    const prefix = defaults.prefix ?? defaults.opCodePrefix ?? "";
+    const base = defaults.base ?? defaults.opCodeBase ?? "";
+    const suffix = defaults.suffix ?? defaults.opCodeSuffix ?? "";
+
+    return {
+      kmin: job?.kmin || 0,
+      opPrefix: prefix,
+      opBase: base,
+      opSuffix: suffix
+    };
+  }, [bodyshop, job]);
+
+  const getAdvisorNumber = (a) => a?.advisorId;
+  const getAdvisorLabel = (a) => `${a?.firstName || ""} ${a?.lastName || ""}`.trim();
+
+  const fetchRrAdvisors = (refresh = false) => {
+    if (!socket) return;
+    setAdvLoading(true);
+
+    const onResult = (payload) => {
+      try {
+        const list = payload?.result ?? payload ?? [];
+        setAdvisors(Array.isArray(list) ? list : []);
+      } finally {
+        setAdvLoading(false);
+        socket.off("rr-get-advisors:result", onResult);
+      }
+    };
+
+    socket.once("rr-get-advisors:result", onResult);
+    socket.emit("rr-get-advisors", { departmentType: "B", refresh }, (ack) => {
+      if (ack?.ok) {
+        const list = ack.result ?? [];
+        setAdvisors(Array.isArray(list) ? list : []);
+      } else if (ack) {
+        console.error("Error fetching RR Advisors:", ack.error);
+      }
+      setAdvLoading(false);
+      socket.off("rr-get-advisors:result", onResult);
+    });
+  };
+
+  useEffect(() => {
+    fetchRrAdvisors(false);
+  }, [bodyshop?.id, socket]);
+
+  const handleStartEarlyRO = async (values) => {
+    if (!socket) {
+      console.error("Socket not available");
+      return;
+    }
+
+    setIsSubmitting(true);
+
+    const txEnvelope = {
+      advisorNo: values.advisorNo,
+      story: values.story || "",
+      kmin: values.kmin || job?.kmin || 0,
+      opPrefix: values.opPrefix || "",
+      opBase: values.opBase || "",
+      opSuffix: values.opSuffix || ""
+    };
+
+    // Emit the early RO creation request
+    socket.emit("rr-create-early-ro", {
+      jobId: job.id,
+      txEnvelope
+    });
+
+    // Wait for customer selection
+    const customerListener = (candidates) => {
+      console.log("Received rr-select-customer event with candidates:", candidates);
+      setCustomerCandidates(candidates || []);
+      setShowCustomerSelector(true);
+      setIsSubmitting(false);
+      socket.off("rr-select-customer", customerListener);
+    };
+
+    socket.once("rr-select-customer", customerListener);
+
+    // Handle failures
+    const failureListener = (payload) => {
+      if (payload?.jobId === job.id) {
+        console.error("Early RO creation failed:", payload.error);
+        alert(`Failed to create early RO: ${payload.error}`);
+        setIsSubmitting(false);
+        setShowCustomerSelector(false);
+        socket.off("export-failed", failureListener);
+        socket.off("rr-select-customer", customerListener);
+      }
+    };
+
+    socket.once("export-failed", failureListener);
+  };
+
+  const handleCustomerSelected = (custNo, createNew = false) => {
+    if (!socket) return;
+
+    console.log("handleCustomerSelected called:", { custNo, createNew, custNoType: typeof custNo });
+
+    setIsSubmitting(true);
+    setShowCustomerSelector(false);
+
+    const payload = {
+      jobId: job.id,
+      custNo: createNew ? null : custNo,
+      create: createNew
+    };
+
+    console.log("Emitting rr-early-customer-selected:", payload);
+
+    // Emit customer selection
+    socket.emit("rr-early-customer-selected", payload, (ack) => {
+      console.log("Received ack from rr-early-customer-selected:", ack);
+      setIsSubmitting(false);
+
+      if (ack?.ok) {
+        const roNumber = ack.dmsRoNo || ack.outsdRoNo;
+        setEarlyRoCreated(true);
+        setCreatedRoNumber(roNumber);
+        onSuccess?.({ roNumber, ...ack });
+      } else {
+        alert(`Failed to create early RO: ${ack?.error || "Unknown error"}`);
+      }
+    });
+
+    // Also listen for socket events
+    const successListener = (payload) => {
+      if (payload?.jobId === job.id) {
+        const roNumber = payload.dmsRoNo || payload.outsdRoNo;
+        console.log("Early RO created:", roNumber);
+        socket.off("rr-early-ro-created", successListener);
+        socket.off("export-failed", failureListener);
+      }
+    };
+
+    const failureListener = (payload) => {
+      if (payload?.jobId === job.id) {
+        console.error("Early RO creation failed:", payload.error);
+        setIsSubmitting(false);
+        setEarlyRoCreated(false);
+        socket.off("rr-early-ro-created", successListener);
+        socket.off("export-failed", failureListener);
+      }
+    };
+
+    socket.once("rr-early-ro-created", successListener);
+    socket.once("export-failed", failureListener);
+  };
+
+  // If early RO already created, show success message
+  if (earlyRoCreated) {
+    return (
+      <Alert
+        title="Early Reynolds RO Created"
+        description={`RO Number: ${createdRoNumber || "N/A"} - You can now convert the job.`}
+        type="success"
+        showIcon
+        style={{ marginBottom: 16 }}
+      />
+    );
+  }
+
+  // If showing customer selector, render modal
+  if (showCustomerSelector) {
+    return (
+      <>
+        <Typography.Title level={5}>Create Early Reynolds RO</Typography.Title>
+        <Typography.Paragraph type="secondary">Waiting for customer selection...</Typography.Paragraph>
+
+        <Modal
+          title="Select Customer for Early RO"
+          open={true}
+          width={800}
+          footer={null}
+          onCancel={() => {
+            setShowCustomerSelector(false);
+            setIsSubmitting(false);
+          }}
+        >
+          <CustomerSelectorTable
+            customers={customerCandidates}
+            onSelect={handleCustomerSelected}
+            isSubmitting={isSubmitting}
+          />
+        </Modal>
+      </>
+    );
+  }
+
+  // Handle manual submit (since we can't nest forms)
+  const handleManualSubmit = async () => {
+    try {
+      const values = await form.validateFields();
+      handleStartEarlyRO(values);
+    } catch (error) {
+      console.error("Validation failed:", error);
+    }
+  };
+
+  // Show the form
+  return (
+    <div style={{ marginTop: 16 }}>
+      <Typography.Title level={5}>Create Early Reynolds RO</Typography.Title>
+      <Typography.Paragraph type="secondary" style={{ fontSize: "12px" }}>
+        Complete this section to create a minimal RO in Reynolds before converting the job.
+      </Typography.Paragraph>
+
+      <Form form={form} layout="vertical" component={false} initialValues={initialValues}>
+        <Form.Item name="advisorNo" label="Advisor" rules={[{ required: true, message: "Please select an advisor" }]}>
+          <Select
+            showSearch={{
+              optionFilterProp: "children",
+              filterOption: (input, option) => (option?.children?.toLowerCase() ?? "").includes(input.toLowerCase())
+            }}
+            loading={advLoading}
+            placeholder="Select advisor..."
+            popupRender={(menu) => (
+              <>
+                {menu}
+                <Button
+                  type="link"
+                  icon={<ReloadOutlined />}
+                  onClick={() => fetchRrAdvisors(true)}
+                  style={{ width: "100%", textAlign: "left" }}
+                >
+                  Refresh Advisors
+                </Button>
+              </>
+            )}
+          >
+            {advisors.map((adv) => (
+              <Select.Option key={getAdvisorNumber(adv)} value={getAdvisorNumber(adv)}>
+                {getAdvisorLabel(adv)}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+
+        <Form.Item
+          name="kmin"
+          label="Mileage In"
+          rules={[
+            { required: true, message: "Please enter initial mileage" },
+            { type: "number", min: 1, message: "Mileage must be greater than 0" }
+          ]}
+        >
+          <InputNumber min={1} style={{ width: "100%" }} />
+        </Form.Item>
+
+        {/* RR OpCode (prefix / base / suffix) */}
+        <Form.Item required label="RR OpCode">
+          <Space.Compact block>
+            <Form.Item name="opPrefix" noStyle>
+              <Input allowClear maxLength={4} style={{ width: "30%" }} placeholder="Prefix" />
+            </Form.Item>
+            <Form.Item name="opBase" noStyle rules={[{ required: true, message: "Base Required" }]}>
+              <Input allowClear maxLength={10} style={{ width: "40%" }} placeholder="Base" />
+            </Form.Item>
+            <Form.Item name="opSuffix" noStyle>
+              <Input allowClear maxLength={4} style={{ width: "30%" }} placeholder="Suffix" />
+            </Form.Item>
+          </Space.Compact>
+        </Form.Item>
+
+        <Form.Item name="story" label="Comments / Story (Optional)">
+          <Input.TextArea rows={2} maxLength={240} showCount placeholder="Enter comments or story..." />
+        </Form.Item>
+
+        <div style={{ marginTop: 16 }}>
+          <Space>
+            <Button type="primary" onClick={handleManualSubmit} loading={isSubmitting} disabled={advLoading}>
+              Create Early RO
+            </Button>
+            {showCancelButton && <Button onClick={onCancel}>Cancel</Button>}
+          </Space>
+        </div>
+      </Form>
+    </div>
+  );
+}

client/src/components/dms-post-form/rr-early-ro-modal.jsx

@@ -0,0 +1,33 @@
+import { Modal } from "antd";
+import RREarlyROForm from "./rr-early-ro-form";
+
+/**
+ * Modal wrapper for RR Early RO Creation Form
+ * @param open - boolean to control modal visibility
+ * @param onClose - callback when modal is closed
+ * @param onSuccess - callback when RO is created successfully
+ * @param bodyshop - bodyshop object
+ * @param socket - socket.io connection
+ * @param job - job object
+ * @returns {JSX.Element}
+ * @constructor
+ */
+export default function RREarlyROModal({ open, onClose, onSuccess, bodyshop, socket, job }) {
+  const handleSuccess = (result) => {
+    onSuccess?.(result);
+    onClose?.();
+  };
+
+  return (
+    <Modal
+      open={open}
+      onCancel={onClose}
+      footer={null}
+      width={700}
+      destroyOnHidden
+      title="Create Reynolds Repair Order"
+    >
+      <RREarlyROForm bodyshop={bodyshop} socket={socket} job={job} onSuccess={handleSuccess} onCancel={onClose} />
+    </Modal>
+  );
+}

client/src/components/jobs-close-lines/jobs-close-lines.component.jsx

@@ -42,11 +42,11 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
               <tbody>
                 {fields.map((field, index) => (
                   <tr key={field.key}>
-                    {/* Hidden field to preserve jobline ID */}
-                    <Form.Item hidden name={[field.name, "id"]}>
-                      <input />
-                    </Form.Item>
                     <td>
+                      {/* Hidden field to preserve jobline ID without injecting a div under <tr> */}
+                      <Form.Item noStyle name={[field.name, "id"]}>
+                        <input type="hidden" />
+                      </Form.Item>
                       <Form.Item
                         //   label={t("joblines.fields.line_desc")}
                         key={`${index}line_desc`}

client/src/components/jobs-convert-button/jobs-convert-button.component.jsx

@@ -1,18 +1,22 @@
 import { useMutation } from "@apollo/client/react";
-import { Button, Form, Input, Popover, Select, Space, Switch } from "antd";
+import { Button, Divider, Form, Input, Modal, Select, Space, Switch } from "antd";
 import axios from "axios";
 import { some } from "lodash";
 import { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
 import { CONVERT_JOB_TO_RO } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import { DMS_MAP, getDmsMode } from "../../utils/dmsUtils";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
+import RREarlyROForm from "../dms-post-form/rr-early-ro-form";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -33,11 +37,27 @@ const mapDispatchToProps = (dispatch) => ({
 export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTrail, parentFormIsFieldsTouched }) {
   const [open, setOpen] = useState(false);
   const [loading, setLoading] = useState(false);
+  const [earlyRoCreated, setEarlyRoCreated] = useState(!!job?.dms_id); // Track early RO creation state
+  const [earlyRoCreatedThisSession, setEarlyRoCreatedThisSession] = useState(false); // Track if created in THIS modal session
   const [mutationConvertJob] = useMutation(CONVERT_JOB_TO_RO);
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const notification = useNotification();
   const allFormValues = Form.useWatch([], form);
+  const { socket } = useSocket(); // Extract socket from context
+
+  // Get Fortellis treatment for proper DMS mode detection
+  const {
+    treatments: { Fortellis }
+  } = useTreatmentsWithConfig({
+    attributes: {},
+    names: ["Fortellis"],
+    splitKey: bodyshop?.imexshopid
+  });
+
+  // Check if bodyshop has Reynolds integration using the proper getDmsMode function
+  const dmsMode = getDmsMode(bodyshop, Fortellis.treatment);
+  const isReynoldsMode = dmsMode === DMS_MAP.reynolds;
 
   const handleConvert = async ({ employee_csr, category, ...values }) => {
     if (parentFormIsFieldsTouched()) {
@@ -82,177 +102,227 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
 
   const submitDisabled = useCallback(() => some(allFormValues, (v) => v === undefined), [allFormValues]);
 
-  const popMenu = (
-    <div>
-      <Form
-        layout="vertical"
-        form={form}
-        onFinish={handleConvert}
-        initialValues={{
-          driveable: true,
-          towin: job.towin,
-          ca_gst_registrant: job.ca_gst_registrant,
-          employee_csr: job.employee_csr,
-          category: job.category,
-          referral_source: job.referral_source,
-          referral_source_extra: job.referral_source_extra ?? ""
+  const handleEarlyROSuccess = (result) => {
+    setEarlyRoCreated(true); // Mark early RO as created
+    setEarlyRoCreatedThisSession(true); // Mark as created in this session
+    notification.success({
+      title: t("jobs.successes.early_ro_created"),
+      description: `RO Number: ${result.roNumber || "N/A"}`
+    });
+    // Delay refetch to keep success message visible for 2 seconds
+    setTimeout(() => {
+      refetch?.();
+    }, 2000);
+  };
+
+  const handleModalClose = () => {
+    setOpen(false);
+  };
+
+  if (job.converted) return <></>;
+
+  return (
+    <>
+      <Button
+        key="convert"
+        type="primary"
+        danger
+        disabled={job.converted || jobRO}
+        loading={loading}
+        onClick={() => {
+          setEarlyRoCreated(!!job?.dms_id); // Initialize state based on current job
+          setEarlyRoCreatedThisSession(false); // Reset session state when opening modal
+          setOpen(true);
         }}
       >
-        <Form.Item
-          name={["ins_co_nm"]}
-          label={t("jobs.fields.ins_co_nm")}
-          rules={[
-            {
-              required: true
-              //message: t("general.validation.required"),
-            }
-          ]}
+        {t("jobs.actions.convert")}
+      </Button>
+
+      {/* Convert Job Modal */}
+      <Modal
+        open={open}
+        onCancel={handleModalClose}
+        closable={!(earlyRoCreatedThisSession && !job.converted)} // Only restrict if created in THIS session
+        maskClosable={!(earlyRoCreatedThisSession && !job.converted)} // Only restrict if created in THIS session
+        title={t("jobs.actions.convert")}
+        footer={null}
+        width={700}
+        destroyOnHidden
+      >
+        {/* Standard Convert Form */}
+        <Form
+          layout="vertical"
+          form={form}
+          onFinish={handleConvert}
+          initialValues={{
+            driveable: true,
+            towin: job.towin,
+            ca_gst_registrant: job.ca_gst_registrant,
+            employee_csr: job.employee_csr,
+            category: job.category,
+            referral_source: job.referral_source,
+            referral_source_extra: job.referral_source_extra ?? ""
+          }}
         >
-          <Select showSearch>
-            {bodyshop.md_ins_cos.map((s, i) => (
-              <Select.Option key={i} value={s.name}>
-                {s.name}
-              </Select.Option>
-            ))}
-          </Select>
-        </Form.Item>
-        {bodyshop.enforce_class && (
+          {/* Show Reynolds Early RO section at the top if applicable */}
+          {isReynoldsMode && !job.dms_id && !earlyRoCreated && (
+            <>
+              <RREarlyROForm
+                bodyshop={bodyshop}
+                socket={socket}
+                job={job}
+                onSuccess={handleEarlyROSuccess}
+                showCancelButton={false}
+              />
+              <Divider />
+            </>
+          )}
+
           <Form.Item
-            name={"class"}
-            label={t("jobs.fields.class")}
+            name={["ins_co_nm"]}
+            label={t("jobs.fields.ins_co_nm")}
             rules={[
               {
-                required: bodyshop.enforce_class
+                required: true
                 //message: t("general.validation.required"),
               }
             ]}
           >
-            <Select>
-              {bodyshop.md_classes.map((s) => (
-                <Select.Option key={s} value={s}>
-                  {s}
+            <Select showSearch>
+              {bodyshop.md_ins_cos.map((s, i) => (
+                <Select.Option key={i} value={s.name}>
+                  {s.name}
                 </Select.Option>
               ))}
             </Select>
           </Form.Item>
-        )}
-        {bodyshop.enforce_referral && (
-          <>
+          {bodyshop.enforce_class && (
             <Form.Item
-              name={"referral_source"}
-              label={t("jobs.fields.referralsource")}
+              name={"class"}
+              label={t("jobs.fields.class")}
               rules={[
                 {
-                  required: bodyshop.enforce_referral
+                  required: bodyshop.enforce_class
                   //message: t("general.validation.required"),
                 }
               ]}
             >
               <Select>
-                {bodyshop.md_referral_sources.map((s) => (
+                {bodyshop.md_classes.map((s) => (
                   <Select.Option key={s} value={s}>
                     {s}
                   </Select.Option>
                 ))}
               </Select>
             </Form.Item>
-            <Form.Item label={t("jobs.fields.referral_source_extra")} name="referral_source_extra">
-              <Input />
-            </Form.Item>
-          </>
-        )}
-        {bodyshop.enforce_conversion_csr && (
-          <Form.Item
-            name={"employee_csr"}
-            label={t(
-              InstanceRenderManager({
-                imex: "jobs.fields.employee_csr",
-                rome: "jobs.fields.employee_csr_writer"
-              })
-            )}
-            rules={[
-              {
-                required: bodyshop.enforce_conversion_csr
-                //message: t("general.validation.required"),
-              }
-            ]}
-          >
-            <Select
-              showSearch={{
-                optionFilterProp: "children",
-                filterOption: (input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-              }}
-              style={{ width: 200 }}
+          )}
+          {bodyshop.enforce_referral && (
+            <>
+              <Form.Item
+                name={"referral_source"}
+                label={t("jobs.fields.referralsource")}
+                rules={[
+                  {
+                    required: bodyshop.enforce_referral
+                    //message: t("general.validation.required"),
+                  }
+                ]}
+              >
+                <Select>
+                  {bodyshop.md_referral_sources.map((s) => (
+                    <Select.Option key={s} value={s}>
+                      {s}
+                    </Select.Option>
+                  ))}
+                </Select>
+              </Form.Item>
+              <Form.Item label={t("jobs.fields.referral_source_extra")} name="referral_source_extra">
+                <Input />
+              </Form.Item>
+            </>
+          )}
+          {bodyshop.enforce_conversion_csr && (
+            <Form.Item
+              name={"employee_csr"}
+              label={t(
+                InstanceRenderManager({
+                  imex: "jobs.fields.employee_csr",
+                  rome: "jobs.fields.employee_csr_writer"
+                })
+              )}
+              rules={[
+                {
+                  required: bodyshop.enforce_conversion_csr
+                  //message: t("general.validation.required"),
+                }
+              ]}
             >
-              {bodyshop.employees
-                .filter((emp) => emp.active)
-                .map((emp) => (
-                  <Select.Option value={emp.id} key={emp.id} name={`${emp.first_name} ${emp.last_name}`}>
-                    {`${emp.first_name} ${emp.last_name}`}
+              <Select
+                showSearch={{
+                  optionFilterProp: "children",
+                  filterOption: (input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                }}
+                style={{ width: 200 }}
+              >
+                {bodyshop.employees
+                  .filter((emp) => emp.active)
+                  .map((emp) => (
+                    <Select.Option value={emp.id} key={emp.id} name={`${emp.first_name} ${emp.last_name}`}>
+                      {`${emp.first_name} ${emp.last_name}`}
+                    </Select.Option>
+                  ))}
+              </Select>
+            </Form.Item>
+          )}
+          {bodyshop.enforce_conversion_category && (
+            <Form.Item
+              name={"category"}
+              label={t("jobs.fields.category")}
+              rules={[
+                {
+                  required: bodyshop.enforce_conversion_category
+                  //message: t("general.validation.required"),
+                }
+              ]}
+            >
+              <Select allowClear>
+                {bodyshop.md_categories.map((s) => (
+                  <Select.Option key={s} value={s}>
+                    {s}
                   </Select.Option>
                 ))}
-            </Select>
-          </Form.Item>
-        )}
-        {bodyshop.enforce_conversion_category && (
-          <Form.Item
-            name={"category"}
-            label={t("jobs.fields.category")}
-            rules={[
-              {
-                required: bodyshop.enforce_conversion_category
-                //message: t("general.validation.required"),
-              }
-            ]}
-          >
-            <Select allowClear>
-              {bodyshop.md_categories.map((s) => (
-                <Select.Option key={s} value={s}>
-                  {s}
-                </Select.Option>
-              ))}
-            </Select>
-          </Form.Item>
-        )}
-        {bodyshop.region_config.toLowerCase().startsWith("ca") && (
-          <Form.Item label={t("jobs.fields.ca_gst_registrant")} name="ca_gst_registrant" valuePropName="checked">
+              </Select>
+            </Form.Item>
+          )}
+          {bodyshop.region_config.toLowerCase().startsWith("ca") && (
+            <Form.Item label={t("jobs.fields.ca_gst_registrant")} name="ca_gst_registrant" valuePropName="checked">
+              <Switch />
+            </Form.Item>
+          )}
+          <Form.Item label={t("jobs.fields.driveable")} name="driveable" valuePropName="checked">
+            <Switch />
+          </Form.Item>
+          <Form.Item label={t("jobs.fields.towin")} name="towin" valuePropName="checked">
             <Switch />
           </Form.Item>
-        )}
-        <Form.Item label={t("jobs.fields.driveable")} name="driveable" valuePropName="checked">
-          <Switch />
-        </Form.Item>
-        <Form.Item label={t("jobs.fields.towin")} name="towin" valuePropName="checked">
-          <Switch />
-        </Form.Item>
-        <Space wrap>
-          <Button disabled={submitDisabled()} type="primary" danger onClick={() => form.submit()} loading={loading}>
-            {t("jobs.actions.convert")}
-          </Button>
-          <Button onClick={() => setOpen(false)}>{t("general.actions.close")}</Button>
-        </Space>
-      </Form>
-    </div>
-  );
 
-  if (job.converted) return <></>;
-
-  return (
-    <Popover open={open} content={popMenu}>
-      <Button
-        key="convert"
-        type="primary"
-        danger
-        // style={{ display: job.converted ? "none" : "" }}
-        disabled={job.converted || jobRO}
-        loading={loading}
-        onClick={() => {
-          setOpen(true);
-        }}
-      >
-        {t("jobs.actions.convert")}
-      </Button>
-    </Popover>
+          <Space wrap style={{ marginTop: 16 }}>
+            <Button
+              disabled={submitDisabled() || (isReynoldsMode && !job.dms_id && !earlyRoCreated)}
+              type="primary"
+              danger
+              onClick={() => form.submit()}
+              loading={loading}
+            >
+              {t("jobs.actions.convert")}
+            </Button>
+            <Button onClick={handleModalClose} disabled={earlyRoCreatedThisSession && !job.converted}>
+              {t("general.actions.close")}
+            </Button>
+          </Space>
+        </Form>
+      </Modal>
+    </>
   );
 }
 

client/src/components/jobs-detail-general/jobs-detail-general.component.jsx

@@ -251,7 +251,6 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
             ))}
           </Select>
         </Form.Item>
-
         <Form.Item label={t("jobs.fields.selling_dealer")} name="selling_dealer">
           <Input disabled={jobRO} />
         </Form.Item>
@@ -267,6 +266,21 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
         <Form.Item label={t("jobs.fields.lost_sale_reason")} name="lost_sale_reason">
           <Input disabled={jobRO} allowClear />
         </Form.Item>
+        {bodyshop.rr_dealerid && (
+          <Form.Item label={t("jobs.fields.dms.id")} name="dms_id">
+            <Input disabled />
+          </Form.Item>
+        )}
+        {bodyshop.rr_dealerid && (
+          <Form.Item label={t("jobs.fields.dms.advisor")} name="dms_advisor_id">
+            <Input disabled />
+          </Form.Item>
+        )}
+        {bodyshop.rr_dealerid && (
+          <Form.Item label={t("jobs.fields.dms.customer")} name="dms_customer_id">
+            <Input disabled />
+          </Form.Item>
+        )}
       </FormRow>
     </Card>
   );

client/src/contexts/SocketIO/socketProvider.jsx

@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import SocketIO from "socket.io-client";
 import { auth } from "../../firebase/firebase.utils";
 import { store } from "../../redux/store";
@@ -18,6 +18,7 @@ import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
 import { INITIAL_NOTIFICATIONS, SocketContext } from "./useSocket.js";
 
 const LIMIT = INITIAL_NOTIFICATIONS;
+const TOKEN_SYNC_INTERVAL_MS = 10 * 60 * 1000;
 
 /**
  * Socket Provider - Scenario Notifications / Web Socket related items
@@ -30,6 +31,7 @@ const LIMIT = INITIAL_NOTIFICATIONS;
  */
 const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
   const socketRef = useRef(null);
+  const tokenSyncIntervalRef = useRef(null);
   const [clientId, setClientId] = useState(null);
   const [isConnected, setIsConnected] = useState(false);
   const notification = useNotification();
@@ -147,6 +149,30 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
     onError: (err) => console.error("MARK_ALL_NOTIFICATIONS_READ error:", err)
   });
 
+  const reconnectSocket = useCallback(
+    async ({ forceRefreshToken = true } = {}) => {
+      const socketInstance = socketRef.current;
+      if (!socketInstance || !auth.currentUser || !bodyshop?.id) return false;
+
+      try {
+        const token = await auth.currentUser.getIdToken(forceRefreshToken);
+        socketInstance.auth = { token, bodyshopId: bodyshop.id };
+
+        if (socketInstance.connected) {
+          socketInstance.emit("update-token", { token, bodyshopId: bodyshop.id });
+        }
+
+        socketInstance.disconnect();
+        socketInstance.connect();
+        return true;
+      } catch (error) {
+        console.error("Socket reconnect failed:", error?.message || error);
+        return false;
+      }
+    },
+    [bodyshop?.id]
+  );
+
   useEffect(() => {
     const initializeSocket = async (token) => {
       if (!bodyshop?.id || socketRef.current) return;
@@ -254,25 +280,60 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
         }
       };
 
+      const syncCurrentTokenToSocket = async () => {
+        try {
+          if (!auth.currentUser || !bodyshop?.id) return;
+          const token = await auth.currentUser.getIdToken();
+          socketInstance.auth = { token, bodyshopId: bodyshop.id };
+          socketInstance.emit("update-token", { token, bodyshopId: bodyshop.id });
+        } catch (error) {
+          console.error("Failed to sync token to socket:", error?.message || error);
+        }
+      };
+
+      const forceRefreshAndSyncToken = async () => {
+        try {
+          if (!auth.currentUser || !bodyshop?.id) return;
+          const token = await auth.currentUser.getIdToken(true);
+          socketInstance.auth = { token, bodyshopId: bodyshop.id };
+          socketInstance.emit("update-token", { token, bodyshopId: bodyshop.id });
+        } catch (error) {
+          console.error("Failed to force-refresh token for socket:", error?.message || error);
+        }
+      };
+
       const handleConnect = () => {
         socketInstance.emit("join-bodyshop-room", bodyshop.id);
+        syncCurrentTokenToSocket();
         setClientId(socketInstance.id);
         setIsConnected(true);
         store.dispatch(setWssStatus("connected"));
       };
 
       const handleReconnect = () => {
+        forceRefreshAndSyncToken();
         setIsConnected(true);
         store.dispatch(setWssStatus("connected"));
       };
 
+      const handleTokenUpdated = ({ success, error }) => {
+        if (success) return;
+        const err = String(error || "");
+        if (/stale token|id-token-expired/i.test(err)) {
+          forceRefreshAndSyncToken();
+        }
+      };
+
       const handleConnectionError = (err) => {
         console.error("Socket connection error:", err);
         setIsConnected(false);
-        if (err.message.includes("auth/id-token-expired")) {
+        if (err?.message?.includes("auth/id-token-expired")) {
           console.warn("Token expired, refreshing...");
           auth.currentUser?.getIdToken(true).then((newToken) => {
-            socketInstance.auth = { token: newToken };
+            socketInstance.auth = { token: newToken, bodyshopId: bodyshop.id };
+            if (socketInstance.connected) {
+              socketInstance.emit("update-token", { token: newToken, bodyshopId: bodyshop.id });
+            }
             socketInstance.connect();
           });
         } else {
@@ -513,10 +574,23 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
       socketInstance.on("notification", handleNotification);
       socketInstance.on("sync-notification-read", handleSyncNotificationRead);
       socketInstance.on("sync-all-notifications-read", handleSyncAllNotificationsRead);
+      socketInstance.on("token-updated", handleTokenUpdated);
+
+      if (tokenSyncIntervalRef.current) {
+        clearInterval(tokenSyncIntervalRef.current);
+      }
+      tokenSyncIntervalRef.current = setInterval(() => {
+        if (!socketInstance.connected) return;
+        syncCurrentTokenToSocket();
+      }, TOKEN_SYNC_INTERVAL_MS);
     };
 
     const unsubscribe = auth.onIdTokenChanged(async (user) => {
       if (!user) {
+        if (tokenSyncIntervalRef.current) {
+          clearInterval(tokenSyncIntervalRef.current);
+          tokenSyncIntervalRef.current = null;
+        }
         socketRef.current?.disconnect();
         socketRef.current = null;
         setIsConnected(false);
@@ -525,7 +599,10 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
 
       const token = await user.getIdToken();
       if (socketRef.current) {
-        socketRef.current.emit("update-token", { token, bodyshopId: bodyshop.id });
+        socketRef.current.auth = { token, bodyshopId: bodyshop.id };
+        if (socketRef.current.connected) {
+          socketRef.current.emit("update-token", { token, bodyshopId: bodyshop.id });
+        }
       } else {
         initializeSocket(token).catch((err) =>
           console.error("Something went wrong Initializing Sockets:", err?.message || "")
@@ -535,6 +612,10 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
 
     return () => {
       unsubscribe();
+      if (tokenSyncIntervalRef.current) {
+        clearInterval(tokenSyncIntervalRef.current);
+        tokenSyncIntervalRef.current = null;
+      }
       if (socketRef.current) {
         socketRef.current.disconnect();
         socketRef.current = null;
@@ -549,6 +630,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
         socket: socketRef.current,
         clientId,
         isConnected,
+        reconnectSocket,
         markNotificationRead,
         markAllNotificationsRead,
         scenarioNotificationsOn: Realtime_Notifications_UI?.treatment === "on"

client/src/graphql/jobs.queries.js

@@ -470,6 +470,9 @@ export const GET_JOB_BY_PK = gql`
       clm_total
       comment
       converted
+      dms_id
+      dms_customer_id
+      dms_advisor_id
       csiinvites {
         completedon
         id
@@ -491,6 +494,9 @@ export const GET_JOB_BY_PK = gql`
       ded_status
       deliverchecklist
       depreciation_taxes
+      dms_id
+      dms_advisor_id
+      dms_customer_id
       driveable
       employee_body
       employee_body_rel {
@@ -1995,6 +2001,9 @@ export const QUERY_JOB_CLOSE_DETAILS = gql`
       qb_multiple_payers
       lbr_adjustments
       ownr_ea
+      dms_id
+      dms_customer_id
+      dms_advisor_id
       payments {
         amount
         created_at
@@ -2216,6 +2225,9 @@ export const QUERY_JOB_EXPORT_DMS = gql`
       plate_no
       plate_st
       ownr_co_nm
+      dms_id
+      dms_customer_id
+      dms_advisor_id
     }
   }
 `;

client/src/pages/dms/dms.container.jsx

@@ -77,6 +77,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
   const { t } = useTranslation();
   const [resetAfterReconnect, setResetAfterReconnect] = useState(false);
   const [allocationsSummary, setAllocationsSummary] = useState(null);
+  const [reconnectNonce, setReconnectNonce] = useState(0);
 
   // Compute a single normalized mode and pick the proper socket
   const mode = getDmsMode(bodyshop, Fortellis.treatment); // "rr" | "fortellis" | "cdk" | "pbs" | "none"
@@ -114,7 +115,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
 
   const notification = useNotification();
 
-  const { socket: wsssocket } = useSocket();
+  const { socket: wsssocket, reconnectSocket } = useSocket();
   const activeSocket = useMemo(() => (isWssMode(mode) ? wsssocket : legacySocket), [mode, wsssocket]);
 
   const [isConnected, setIsConnected] = useState(!!activeSocket?.connected);
@@ -178,6 +179,27 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
   }`;
 
   const resetKey = useMemo(() => `${mode || "none"}-${jobId || "none"}`, [mode, jobId]);
+  const customerSelectorKey = useMemo(() => `${resetKey}-${reconnectNonce}`, [resetKey, reconnectNonce]);
+
+  const handleReconnectClick = async () => {
+    setResetAfterReconnect(true);
+    setReconnectNonce((n) => n + 1);
+
+    if (!activeSocket) return;
+
+    if (isWssMode(mode)) {
+      setActiveLogLevel(logLevel);
+      const didReconnect = await reconnectSocket?.({ forceRefreshToken: true });
+      if (!didReconnect) {
+        activeSocket.disconnect();
+        setTimeout(() => activeSocket.connect(), 100);
+      }
+      return;
+    }
+
+    activeSocket.disconnect();
+    setTimeout(() => activeSocket.connect(), 100);
+  };
 
   // 🔄 Hard reset of local + server-side DMS context when the page/job loads
   useEffect(() => {
@@ -426,6 +448,24 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
 
   if (data.jobs_by_pk?.date_exported) return <Result status="warning" title={t("dms.errors.alreadyexported")} />;
 
+  // Check if Reynolds mode requires early RO
+  const hasEarlyRO = !!(data.jobs_by_pk?.dms_id && data.jobs_by_pk?.dms_customer_id && data.jobs_by_pk?.dms_advisor_id);
+
+  if (isRrMode && !hasEarlyRO) {
+    return (
+      <Result
+        status="warning"
+        title={t("dms.errors.earlyrorequired")}
+        subTitle={t("dms.errors.earlyrorequired.message")}
+        extra={
+          <Link to={`/manage/jobs/${jobId}/admin`}>
+            <Button type="primary">{t("general.actions.gotoadmin")}</Button>
+          </Link>
+        }
+      />
+    );
+  }
+
   return (
     <div>
       <AlertComponent style={{ marginBottom: 10 }} title={bannerMessage} type="warning" showIcon closable />
@@ -485,7 +525,9 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
         </Col>
 
         <DmsCustomerSelector
+          key={customerSelectorKey}
           jobid={jobId}
+          job={data?.jobs_by_pk}
           bodyshop={bodyshop}
           socket={activeSocket}
           mode={mode}
@@ -530,21 +572,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
                     <Select.Option key="ERROR">ERROR</Select.Option>
                   </Select>
                   <Button onClick={() => setLogs([])}>Clear Logs</Button>
-                  <Button
-                    onClick={() => {
-                      setLogs([]);
-                      setResetAfterReconnect(true);
-                      if (isWssMode(mode)) {
-                        setActiveLogLevel(logLevel);
-                      }
-                      if (activeSocket) {
-                        activeSocket.disconnect();
-                        setTimeout(() => activeSocket.connect(), 100);
-                      }
-                    }}
-                  >
-                    Reconnect
-                  </Button>
+                  <Button onClick={handleReconnectClick}>Reconnect</Button>
                 </Space>
               }
             >

client/src/pages/jobs-admin/jobs-admin.page.jsx

@@ -1,9 +1,12 @@
-import { useQuery } from "@apollo/client/react";
-import { Card, Col, Result, Row, Space, Typography } from "antd";
-import { useEffect } from "react";
+import { useMutation, useQuery } from "@apollo/client/react";
+import { Button, Card, Col, Form, Input, Modal, Result, Row, Select, Space, Switch, Typography } from "antd";
+import { useEffect, useState, useCallback } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useParams } from "react-router-dom";
+import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
+import { some } from "lodash";
+import axios from "axios";
 import AlertComponent from "../../components/alert/alert.component";
 import JobCalculateTotals from "../../components/job-calculate-totals/job-calculate-totals.component";
 import ScoreboardAddButton from "../../components/job-scoreboard-add-button/job-scoreboard-add-button.component";
@@ -19,13 +22,26 @@ import JobsAdminRemoveAR from "../../components/jobs-admin-remove-ar/jobs-admin-
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
 import NotFound from "../../components/not-found/not-found.component";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
-import { GET_JOB_BY_PK } from "../../graphql/jobs.queries";
+import RREarlyROModal from "../../components/dms-post-form/rr-early-ro-modal";
+import { GET_JOB_BY_PK, CONVERT_JOB_TO_RO } from "../../graphql/jobs.queries";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { createStructuredSelector } from "reselect";
+import { useSocket } from "../../contexts/SocketIO/useSocket";
+import { useNotification } from "../../contexts/Notifications/notificationContext";
+import { DMS_MAP, getDmsMode } from "../../utils/dmsUtils";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
-  setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
+  setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
+  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
 });
 
 const colSpan = {
@@ -39,14 +55,36 @@ const cardStyle = {
   height: "100%"
 };
 
-export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader }) {
+export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader, bodyshop, insertAuditTrail }) {
   const { jobId } = useParams();
-  const { loading, error, data } = useQuery(GET_JOB_BY_PK, {
+  const { loading, error, data, refetch } = useQuery(GET_JOB_BY_PK, {
     variables: { id: jobId },
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
   const { t } = useTranslation();
+  const { socket } = useSocket(); // Extract socket from context
+  const notification = useNotification();
+  const [showEarlyROModal, setShowEarlyROModal] = useState(false);
+  const [showConvertModal, setShowConvertModal] = useState(false);
+  const [convertLoading, setConvertLoading] = useState(false);
+  const [form] = Form.useForm();
+  const [mutationConvertJob] = useMutation(CONVERT_JOB_TO_RO);
+  const allFormValues = Form.useWatch([], form);
+
+  // Get Fortellis treatment for proper DMS mode detection
+  const {
+    treatments: { Fortellis }
+  } = useTreatmentsWithConfig({
+    attributes: {},
+    names: ["Fortellis"],
+    splitKey: bodyshop?.imexshopid
+  });
+
+  // Check if bodyshop has Reynolds integration using the proper getDmsMode function
+  const dmsMode = getDmsMode(bodyshop, Fortellis.treatment);
+  const isReynoldsMode = dmsMode === DMS_MAP.reynolds;
+  const job = data?.jobs_by_pk;
   useEffect(() => {
     setSelectedHeader("activejobs");
     document.title = t("titles.jobs-admin", {
@@ -75,6 +113,55 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader }) {
     ]);
   }, [setBreadcrumbs, t, jobId, data, setSelectedHeader]);
 
+  const handleEarlyROSuccess = (result) => {
+    notification.success({
+      title: t("jobs.successes.early_ro_created"),
+      description: `RO Number: ${result.roNumber || "N/A"}`
+    });
+    setShowEarlyROModal(false);
+    refetch?.();
+  };
+
+  const handleConvert = async ({ employee_csr, category, ...values }) => {
+    if (!job?.id) return;
+    setConvertLoading(true);
+    const res = await mutationConvertJob({
+      variables: {
+        jobId: job.id,
+        job: {
+          converted: true,
+          ...(bodyshop?.enforce_conversion_csr ? { employee_csr } : {}),
+          ...(bodyshop?.enforce_conversion_category ? { category } : {}),
+          ...values
+        }
+      }
+    });
+
+    if (values.ca_gst_registrant) {
+      await axios.post("/job/totalsssu", {
+        id: job.id
+      });
+    }
+
+    if (!res.errors) {
+      refetch();
+      notification.success({
+        title: t("jobs.successes.converted")
+      });
+
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.jobconverted(res.data.update_jobs.returning[0].ro_number),
+        type: "jobconverted"
+      });
+
+      setShowConvertModal(false);
+    }
+    setConvertLoading(false);
+  };
+
+  const submitDisabled = useCallback(() => some(allFormValues, (v) => v === undefined), [allFormValues]);
+
   if (loading) return <LoadingSpinner />;
   if (error) return <AlertComponent title={error.message} type="error" />;
   if (!data.jobs_by_pk) return <NotFound />;
@@ -99,6 +186,16 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader }) {
               <JobsAdminUnvoid job={data ? data.jobs_by_pk : {}} />
               <JobsAdminStatus job={data ? data.jobs_by_pk : {}} />
               <JobsAdminRemoveAR job={data ? data.jobs_by_pk : {}} />
+              {isReynoldsMode && job?.converted && !job?.dms_id && !job?.dms_customer_id && !job?.dms_advisor_id && (
+                <Button className="ant-btn ant-btn-default" onClick={() => setShowEarlyROModal(true)}>
+                  {t("jobs.actions.dms.createearlyro", "Create RR RO")}
+                </Button>
+              )}
+              {isReynoldsMode && !job?.converted && !job?.dms_id && (
+                <Button type="primary" danger onClick={() => setShowConvertModal(true)}>
+                  {t("jobs.actions.convertwithoutearlyro", "Convert without Early RO")}
+                </Button>
+              )}
             </Space>
           </Card>
         </Col>
@@ -124,8 +221,173 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader }) {
           </Card>
         </Col>
       </Row>
+
+      {/* Early RO Modal */}
+      <RREarlyROModal
+        open={showEarlyROModal}
+        onClose={() => setShowEarlyROModal(false)}
+        onSuccess={handleEarlyROSuccess}
+        bodyshop={bodyshop}
+        socket={socket}
+        job={job}
+      />
+
+      {/* Convert without Early RO Modal */}
+      <Modal
+        open={showConvertModal}
+        onCancel={() => setShowConvertModal(false)}
+        title={t("jobs.actions.convertwithoutearlyro", "Convert without Early RO")}
+        footer={null}
+        width={700}
+        destroyOnHidden
+      >
+        <Form
+          layout="vertical"
+          form={form}
+          onFinish={handleConvert}
+          initialValues={{
+            driveable: true,
+            towin: job?.towin,
+            ca_gst_registrant: job?.ca_gst_registrant,
+            employee_csr: job?.employee_csr,
+            category: job?.category,
+            referral_source: job?.referral_source,
+            referral_source_extra: job?.referral_source_extra ?? ""
+          }}
+        >
+          <Form.Item
+            name={["ins_co_nm"]}
+            label={t("jobs.fields.ins_co_nm")}
+            rules={[
+              {
+                required: true
+              }
+            ]}
+          >
+            <Select showSearch>
+              {bodyshop?.md_ins_cos?.map((s, i) => (
+                <Select.Option key={i} value={s.name}>
+                  {s.name}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          {bodyshop?.enforce_class && (
+            <Form.Item
+              name={"class"}
+              label={t("jobs.fields.class")}
+              rules={[
+                {
+                  required: bodyshop.enforce_class
+                }
+              ]}
+            >
+              <Select>
+                {bodyshop?.md_classes?.map((s) => (
+                  <Select.Option key={s} value={s}>
+                    {s}
+                  </Select.Option>
+                ))}
+              </Select>
+            </Form.Item>
+          )}
+          {bodyshop?.enforce_referral && (
+            <>
+              <Form.Item
+                name={"referral_source"}
+                label={t("jobs.fields.referralsource")}
+                rules={[
+                  {
+                    required: bodyshop.enforce_referral
+                  }
+                ]}
+              >
+                <Select>
+                  {bodyshop?.md_referral_sources?.map((s) => (
+                    <Select.Option key={s} value={s}>
+                      {s}
+                    </Select.Option>
+                  ))}
+                </Select>
+              </Form.Item>
+              <Form.Item label={t("jobs.fields.referral_source_extra")} name="referral_source_extra">
+                <Input />
+              </Form.Item>
+            </>
+          )}
+          {bodyshop?.enforce_conversion_csr && (
+            <Form.Item
+              name={"employee_csr"}
+              label={t(
+                InstanceRenderManager({
+                  imex: "jobs.fields.employee_csr",
+                  rome: "jobs.fields.employee_csr_writer"
+                })
+              )}
+              rules={[
+                {
+                  required: bodyshop.enforce_conversion_csr
+                }
+              ]}
+            >
+              <Select
+                showSearch={{
+                  optionFilterProp: "children",
+                  filterOption: (input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                }}
+                style={{ width: 200 }}
+              >
+                {bodyshop?.employees
+                  ?.filter((emp) => emp.active)
+                  ?.map((emp) => (
+                    <Select.Option value={emp.id} key={emp.id} name={`${emp.first_name} ${emp.last_name}`}>
+                      {`${emp.first_name} ${emp.last_name}`}
+                    </Select.Option>
+                  ))}
+              </Select>
+            </Form.Item>
+          )}
+          {bodyshop?.enforce_conversion_category && (
+            <Form.Item
+              name={"category"}
+              label={t("jobs.fields.category")}
+              rules={[
+                {
+                  required: bodyshop.enforce_conversion_category
+                }
+              ]}
+            >
+              <Select allowClear>
+                {bodyshop?.md_categories?.map((s) => (
+                  <Select.Option key={s} value={s}>
+                    {s}
+                  </Select.Option>
+                ))}
+              </Select>
+            </Form.Item>
+          )}
+          {bodyshop?.region_config?.toLowerCase().startsWith("ca") && (
+            <Form.Item label={t("jobs.fields.ca_gst_registrant")} name="ca_gst_registrant" valuePropName="checked">
+              <Switch />
+            </Form.Item>
+          )}
+          <Form.Item label={t("jobs.fields.driveable")} name="driveable" valuePropName="checked">
+            <Switch />
+          </Form.Item>
+          <Form.Item label={t("jobs.fields.towin")} name="towin" valuePropName="checked">
+            <Switch />
+          </Form.Item>
+
+          <Space wrap style={{ marginTop: 16 }}>
+            <Button disabled={submitDisabled()} type="primary" danger onClick={() => form.submit()} loading={convertLoading}>
+              {t("jobs.actions.convert")}
+            </Button>
+            <Button onClick={() => setShowConvertModal(false)}>{t("general.actions.close")}</Button>
+          </Space>
+        </Form>
+      </Modal>
     </RbacWrapper>
   );
 }
 
-export default connect(null, mapDispatchToProps)(JobsCloseContainer);
+export default connect(mapStateToProps, mapDispatchToProps)(JobsCloseContainer);

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -9,6 +9,7 @@ import {
   Form,
   Input,
   InputNumber,
+  Modal,
   Popconfirm,
   Row,
   Select,
@@ -42,7 +43,7 @@ import { setModalContext } from "../../redux/modals/modals.actions.js";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import dayjs from "../../utils/day";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
+import { bodyshopHasDmsKey, DMS_MAP, getDmsMode } from "../../utils/dmsUtils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -71,6 +72,11 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
   const notification = useNotification();
 
   const hasDMSKey = bodyshopHasDmsKey(bodyshop);
+  const dmsMode = getDmsMode(bodyshop, "off");
+  const isReynoldsMode = dmsMode === DMS_MAP.reynolds;
+  const hasEarlyRO = !!(job?.dms_id && job?.dms_customer_id && job?.dms_advisor_id);
+  const canSendToDMS = !isReynoldsMode || hasEarlyRO;
+  const [showEarlyROModal, setShowEarlyROModal] = useState(false);
 
   const {
     treatments: { Qb_Multi_Ar, ClosingPeriod }
@@ -82,18 +88,18 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
 
   const handleFinish = async ({ removefromproduction, ...values }) => {
     setLoading(true);
-    
+
     // Validate that all joblines have valid IDs
-    const joblinesWithIds = values.joblines.filter(jl => jl && jl.id);
+    const joblinesWithIds = values.joblines.filter((jl) => jl && jl.id);
     if (joblinesWithIds.length !== values.joblines.length) {
       notification.error({
         title: t("jobs.errors.invalidjoblines"),
-        message: t("jobs.errors.missingjoblineids")
+        description: t("jobs.errors.missingjoblineids")
       });
       setLoading(false);
       return;
     }
-    
+
     const result = await client.mutate({
       mutation: generateJobLinesUpdatesForInvoicing(values.joblines)
     });
@@ -208,9 +214,17 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
                 </Button>
               </Popconfirm>
               {bodyshopHasDmsKey(bodyshop) && (
-                <Link to={`/manage/dms?jobId=${job.id}`}>
-                  <Button disabled={job.date_exported || !jobRO}>{t("jobs.actions.sendtodms")}</Button>
-                </Link>
+                <>
+                  {canSendToDMS ? (
+                    <Link to={`/manage/dms?jobId=${job.id}`}>
+                      <Button disabled={job.date_exported || !jobRO}>{t("jobs.actions.sendtodms")}</Button>
+                    </Link>
+                  ) : (
+                    <Button disabled={job.date_exported || !jobRO} onClick={() => setShowEarlyROModal(true)}>
+                      {t("jobs.actions.sendtodms")}
+                    </Button>
+                  )}
+                </>
               )}
               <Button
                 onClick={() => {
@@ -527,6 +541,30 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
         <Divider />
         <JobsCloseLines job={job} />
       </Form>
+
+      {/* Early RO Required Modal */}
+      <Modal
+        open={showEarlyROModal}
+        onCancel={() => setShowEarlyROModal(false)}
+        footer={null}
+        title={
+          <Space>
+            <Typography.Text type="warning" style={{ fontSize: "1.2em" }}>
+              ⚠️
+            </Typography.Text>
+            <span>{t("dms.errors.earlyrorequired")}</span>
+          </Space>
+        }
+      >
+        <Space orientation="vertical" size="large" style={{ width: "100%" }}>
+          <Typography.Paragraph>{t("dms.errors.earlyrorequired.message")}</Typography.Paragraph>
+          <Link to={`/manage/jobs/${job.id}/admin`}>
+            <Button type="primary" block onClick={() => setShowEarlyROModal(false)}>
+              {t("general.actions.gotoadmin")}
+            </Button>
+          </Link>
+        </Space>
+      </Modal>
     </div>
   );
 }

client/src/translations/en_us/common.json

@@ -1047,7 +1047,9 @@
     },
     "dms": {
       "errors": {
-        "alreadyexported": "This job has already been sent to the DMS. If you need to resend it, please use admin permissions to mark the job for re-export."
+        "alreadyexported": "This job has already been sent to the DMS. If you need to resend it, please use admin permissions to mark the job for re-export.",
+        "earlyrorequired": "Early RO Required",
+        "earlyrorequired.message": "This job requires an early Repair Order to be created before posting to Reynolds. Please use the admin panel to create the early RO first."
       },
       "labels": {
         "refreshallocations": "Refresh to see DMS Allocations."
@@ -1244,6 +1246,7 @@
         "deselectall": "Deselect All",
         "download": "Download",
         "edit": "Edit",
+        "gotoadmin": "Go to Admin Panel",
         "login": "Login",
         "next": "Next",
         "ok": "Ok",
@@ -1622,11 +1625,13 @@
         "changestatus": "Change Status",
         "changestimator": "Change Estimator",
         "convert": "Convert",
+        "convertwithoutearlyro": "Convert without Early RO",
         "createiou": "Create IOU",
         "deliver": "Deliver",
         "deliver_quick": "Quick Deliver",
         "dms": {
           "addpayer": "Add Payer",
+          "createearlyro": "Create RR RO",
           "createnewcustomer": "Create New Customer",
           "findmakemodelcode": "Find Make/Model Code",
           "getmakes": "Get Makes",
@@ -1635,6 +1640,7 @@
           },
           "post": "Post",
           "refetchmakesmodels": "Refetch Make and Model Codes",
+          "update_ro": "Update RO",
           "usegeneric": "Use Generic Customer",
           "useselected": "Use Selected Customer"
         },
@@ -1794,6 +1800,7 @@
           },
           "cost": "Cost",
           "cost_dms_acctnumber": "Cost DMS Acct #",
+          "customer": "Customer #",
           "dms_make": "DMS Make",
           "dms_model": "DMS Model",
           "dms_model_override": "Override DMS Make/Model",
@@ -1818,7 +1825,11 @@
           "sale": "Sale",
           "sale_dms_acctnumber": "Sale DMS Acct #",
           "story": "Story",
-          "vinowner": "VIN Owner"
+          "vinowner": "VIN Owner",
+          "rr_opcode": "RR OpCode",
+          "rr_opcode_prefix": "Prefix",
+          "rr_opcode_suffix": "Suffix",
+          "rr_opcode_base": "Base"
         },
         "dms_allocation": "DMS Allocation",
         "driveable": "Driveable",
@@ -2103,6 +2114,11 @@
           "damageto": "Damage to $t(jobs.fields.area_of_damage_impact.{{area_of_damage}}).",
           "defaultstory": "B/S RO: {{ro_number}}. Owner: {{ownr_nm}}. Insurance Co: {{ins_co_nm}}. Claim/PO #: {{clm_po}}",
           "disablebillwip": "Cost and WIP for bills has been ignored per shop configuration.",
+          "earlyro": {
+            "created": "Early RO Created:",
+            "fields": "Required fields:",
+            "willupdate": "This will update the existing RO with full job data."
+          },
           "invoicedatefuture": "Invoice date must be today or in the future for CDK posting.",
           "kmoutnotgreaterthankmin": "Mileage out must be greater than mileage in.",
           "logs": "Logs",
@@ -2260,6 +2276,7 @@
         "delete": "Job deleted successfully.",
         "deleted": "Job deleted successfully.",
         "duplicated": "Job duplicated successfully. ",
+        "early_ro_created": "Early RO Created",
         "exported": "Job(s) exported successfully. ",
         "invoiced": "Job closed and invoiced successfully.",
         "ioucreated": "IOU created successfully.  Click to see.",

client/src/translations/es/common.json

@@ -1047,7 +1047,9 @@
     },
     "dms": {
       "errors": {
-        "alreadyexported": ""
+        "alreadyexported": "",
+        "earlyrorequired": "",
+        "earlyrorequired.message": ""
       },
       "labels": {
         "refreshallocations": ""
@@ -1244,6 +1246,7 @@
         "deselectall": "",
         "download": "",
         "edit": "Editar",
+        "gotoadmin": "",
         "login": "",
         "next": "",
         "ok": "",
@@ -1622,11 +1625,13 @@
         "changestatus": "Cambiar Estado",
         "changestimator": "",
         "convert": "Convertir",
+        "convertwithoutearlyro": "",
         "createiou": "",
         "deliver": "",
         "deliver_quick": "",
         "dms": {
           "addpayer": "",
+          "createearlyro": "",
           "createnewcustomer": "",
           "findmakemodelcode": "",
           "getmakes": "",
@@ -1635,6 +1640,7 @@
           },
           "post": "",
           "refetchmakesmodels": "",
+          "update_ro": "",
           "usegeneric": "",
           "useselected": ""
         },
@@ -1794,6 +1800,7 @@
           },
           "cost": "",
           "cost_dms_acctnumber": "",
+          "customer": "",
           "dms_make": "",
           "dms_model": "",
           "dms_model_override": "",
@@ -1818,7 +1825,11 @@
           "sale": "",
           "sale_dms_acctnumber": "",
           "story": "",
-          "vinowner": ""
+          "vinowner": "",
+          "rr_opcode": "",
+          "rr_opcode_prefix": "",
+          "rr_opcode_suffix": "",
+          "rr_opcode_base": ""
         },
         "dms_allocation": "",
         "driveable": "",
@@ -2103,6 +2114,11 @@
           "damageto": "",
           "defaultstory": "",
           "disablebillwip": "",
+          "earlyro": {
+            "created": "",
+            "fields": "",
+            "willupdate": ""
+          },
           "invoicedatefuture": "",
           "kmoutnotgreaterthankmin": "",
           "logs": "",
@@ -2260,6 +2276,7 @@
         "delete": "",
         "deleted": "Trabajo eliminado con éxito.",
         "duplicated": "",
+        "early_ro_created": "",
         "exported": "",
         "invoiced": "",
         "ioucreated": "",

client/src/translations/fr/common.json

@@ -1047,7 +1047,9 @@
     },
     "dms": {
       "errors": {
-        "alreadyexported": ""
+        "alreadyexported": "",
+        "earlyrorequired": "",
+        "earlyrorequired.message": ""
       },
       "labels": {
         "refreshallocations": ""
@@ -1244,6 +1246,7 @@
         "deselectall": "",
         "download": "",
         "edit": "modifier",
+        "gotoadmin": "",
         "login": "",
         "next": "",
         "ok": "",
@@ -1622,11 +1625,13 @@
         "changestatus": "Changer le statut",
         "changestimator": "",
         "convert": "Convertir",
+        "convertwithoutearlyro": "",
         "createiou": "",
         "deliver": "",
         "deliver_quick": "",
         "dms": {
           "addpayer": "",
+          "createearlyro": "",
           "createnewcustomer": "",
           "findmakemodelcode": "",
           "getmakes": "",
@@ -1635,6 +1640,7 @@
           },
           "post": "",
           "refetchmakesmodels": "",
+          "update_ro": "",
           "usegeneric": "",
           "useselected": ""
         },
@@ -1794,6 +1800,7 @@
           },
           "cost": "",
           "cost_dms_acctnumber": "",
+          "customer": "",
           "dms_make": "",
           "dms_model": "",
           "dms_model_override": "",
@@ -1818,7 +1825,11 @@
           "sale": "",
           "sale_dms_acctnumber": "",
           "story": "",
-          "vinowner": ""
+          "vinowner": "",
+          "rr_opcode": "",
+          "rr_opcode_prefix": "",
+          "rr_opcode_suffix": "",
+          "rr_opcode_base": ""
         },
         "dms_allocation": "",
         "driveable": "",
@@ -2103,6 +2114,11 @@
           "damageto": "",
           "defaultstory": "",
           "disablebillwip": "",
+          "earlyro": {
+            "created": "",
+            "fields": "",
+            "willupdate": ""
+          },
           "invoicedatefuture": "",
           "kmoutnotgreaterthankmin": "",
           "logs": "",
@@ -2260,6 +2276,7 @@
         "delete": "",
         "deleted": "Le travail a bien été supprimé.",
         "duplicated": "",
+        "early_ro_created": "",
         "exported": "",
         "invoiced": "",
         "ioucreated": "",

client/src/utils/graphQLmodifier.js

@@ -146,7 +146,8 @@ export async function generateTemplate(
   if (templateQueryToExecute) {
     const { data } = await client.query({
       query: gql(finalQuery),
-      variables: { ...templateObject.variables }
+      variables: { ...templateObject.variables },
+      fetchPolicy: "no-cache"
     });
     contextData = data;
   }

hasura/metadata/tables.yaml

@@ -3704,7 +3704,9 @@
           - ded_status
           - deliverchecklist
           - depreciation_taxes
+          - dms_advisor_id
           - dms_allocation
+          - dms_customer_id
           - dms_id
           - driveable
           - employee_body
@@ -3985,7 +3987,9 @@
           - ded_status
           - deliverchecklist
           - depreciation_taxes
+          - dms_advisor_id
           - dms_allocation
+          - dms_customer_id
           - dms_id
           - driveable
           - employee_body
@@ -4278,7 +4282,9 @@
           - ded_status
           - deliverchecklist
           - depreciation_taxes
+          - dms_advisor_id
           - dms_allocation
+          - dms_customer_id
           - dms_id
           - driveable
           - employee_body

hasura/migrations/1770837989352_alter_table_public_jobs_add_column_dms_customer_id/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "dms_customer_id" text
+--  null;

hasura/migrations/1770837989352_alter_table_public_jobs_add_column_dms_customer_id/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "dms_customer_id" text
+ null;

hasura/migrations/1770838205706_alter_table_public_jobs_add_column_dms_advisor_id/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "dms_advisor_id" text
+--  null;

hasura/migrations/1770838205706_alter_table_public_jobs_add_column_dms_advisor_id/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "dms_advisor_id" text
+ null;

server/data/autohouse.js

@@ -221,6 +221,8 @@ const CreateRepairOrderTag = (job, errorCallback) => {
 
   const repairCosts = CreateCosts(job);
 
+  const LaborDetailLines = generateLaborLines(job.timetickets);
+
   //Calculate detail only lines.
   const detailAdjustments = job.joblines
     .filter((jl) => jl.ah_detail_line && jl.mod_lbr_ty)
@@ -606,12 +608,14 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         // CSIID: null,
         InsGroupCode: null
       },
-
       DetailLines: {
         DetailLine:
           job.joblines.length > 0
             ? job.joblines.map((jl) => GenerateDetailLines(job, jl, job.bodyshop.md_order_statuses))
             : [generateNullDetailLine()]
+      },
+      LaborDetailLines: {
+        LaborDetailLine: LaborDetailLines
       }
     };
     return ret;
@@ -787,6 +791,76 @@ const CreateCosts = (job) => {
   };
 };
 
+const generateLaborLines = (timetickets) => {
+  if (!timetickets || timetickets.length === 0) return [];
+
+  const codeToProps = {
+    LAB: { actual: "LaborBodyActualHours", flag: "LaborBodyFlagHours", cost: "LaborBodyCost" },
+    LAM: { actual: "LaborMechanicalActualHours", flag: "LaborMechanicalFlagHours", cost: "LaborMechanicalCost" },
+    LAG: { actual: "LaborGlassActualHours", flag: "LaborGlassFlagHours", cost: "LaborGlassCost" },
+    LAS: { actual: "LaborStructuralActualHours", flag: "LaborStructuralFlagHours", cost: "LaborStructuralCost" },
+    LAE: { actual: "LaborElectricalActualHours", flag: "LaborElectricalFlagHours", cost: "LaborElectricalCost" },
+    LAA: { actual: "LaborAluminumActualHours", flag: "LaborAluminumFlagHours", cost: "LaborAluminumCost" },
+    LAR: { actual: "LaborRefinishActualHours", flag: "LaborRefinishFlagHours", cost: "LaborRefinishCost" },
+    LAU: { actual: "LaborDetailActualHours", flag: "LaborDetailFlagHours", cost: "LaborDetailCost" },
+    LA1: { actual: "LaborOtherActualHours", flag: "LaborOtherFlagHours", cost: "LaborOtherCost" },
+    LA2: { actual: "LaborOtherActualHours", flag: "LaborOtherFlagHours", cost: "LaborOtherCost" },
+    LA3: { actual: "LaborOtherActualHours", flag: "LaborOtherFlagHours", cost: "LaborOtherCost" },
+    LA4: { actual: "LaborOtherActualHours", flag: "LaborOtherFlagHours", cost: "LaborOtherCost" }
+  };
+
+  return timetickets.map((ticket, idx) => {
+    const { ciecacode, employee, actualhrs = 0, productivehrs = 0, rate = 0 } = ticket;
+    const isFlatRate = employee?.flat_rate;
+    const hours = isFlatRate ? productivehrs : actualhrs;
+    const cost = rate * hours;
+
+    const laborDetail = {
+      LaborDetailLineNumber: idx + 1,
+      TechnicianNameFirst: employee?.first_name || "",
+      TechnicianNameLast: employee?.last_name || "",
+      LaborBodyActualHours: 0,
+      LaborMechanicalActualHours: 0,
+      LaborGlassActualHours: 0,
+      LaborStructuralActualHours: 0,
+      LaborElectricalActualHours: 0,
+      LaborAluminumActualHours: 0,
+      LaborRefinishActualHours: 0,
+      LaborDetailActualHours: 0,
+      LaborOtherActualHours: 0,
+      LaborBodyFlagHours: 0,
+      LaborMechanicalFlagHours: 0,
+      LaborGlassFlagHours: 0,
+      LaborStructuralFlagHours: 0,
+      LaborElectricalFlagHours: 0,
+      LaborAluminumFlagHours: 0,
+      LaborRefinishFlagHours: 0,
+      LaborDetailFlagHours: 0,
+      LaborOtherFlagHours: 0,
+      LaborBodyCost: 0,
+      LaborMechanicalCost: 0,
+      LaborGlassCost: 0,
+      LaborStructuralCost: 0,
+      LaborElectricalCost: 0,
+      LaborAluminumCost: 0,
+      LaborRefinishCost: 0,
+      LaborDetailCost: 0,
+      LaborOtherCost: 0
+    };
+
+    const effectiveCiecacode = ciecacode || "LA4";
+
+    if (codeToProps[effectiveCiecacode]) {
+      const { actual, flag, cost: costProp } = codeToProps[effectiveCiecacode];
+      laborDetail[actual] = actualhrs;
+      laborDetail[flag] = productivehrs;
+      laborDetail[costProp] = cost;
+    }
+
+    return laborDetail;
+  });
+};
+
 const StatusMapping = (status, md_ro_statuses) => {
   //Possible return statuses EST, SCH, ARR, IPR, RDY, DEL, CLO, CAN, UNDEFINED.
   const {

server/data/kaizen.js

@@ -264,29 +264,30 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         }${job.est_ct_fn ? job.est_ct_fn : ""}`
       },
       Dates: {
-        DateEstimated: (job.date_estimated && moment(job.date_estimated).format(DateFormat)) || "",
-        DateOpened: (job.date_opened && moment(job.date_opened).format(DateFormat)) || "",
-        DateScheduled:
-          (job.scheduled_in && moment(job.scheduled_in).tz(job.bodyshop.timezone).format(DateFormat)) || "",
-        DateArrived: (job.actual_in && moment(job.actual_in).tz(job.bodyshop.timezone).format(DateFormat)) || "",
+        DateEstimated: job.date_estimated ? moment(job.date_estimated).format(DateFormat) : "",
+        DateOpened: job.date_open ? moment(job.date_open).tz(job.bodyshop.timezone).format(DateFormat) : "",
+        DateScheduled: job.scheduled_in ? moment(job.scheduled_in).tz(job.bodyshop.timezone).format(DateFormat) : "",
+        DateArrived: job.actual_in ? moment(job.actual_in).tz(job.bodyshop.timezone).format(DateFormat) : "",
         DateStart: job.date_repairstarted
-          ? (job.date_repairstarted && moment(job.date_repairstarted).tz(job.bodyshop.timezone).format(DateFormat)) ||
-            ""
-          : (job.actual_in && moment(job.actual_in).tz(job.bodyshop.timezone).format(DateFormat)) || "",
-        DateScheduledCompletion:
-          (job.scheduled_completion && moment(job.scheduled_completion).tz(job.bodyshop.timezone).format(DateFormat)) ||
-          "",
-        DateCompleted:
-          (job.actual_completion && moment(job.actual_completion).tz(job.bodyshop.timezone).format(DateFormat)) || "",
-        DateScheduledDelivery:
-          (job.scheduled_delivery && moment(job.scheduled_delivery).tz(job.bodyshop.timezone).format(DateFormat)) || "",
-        DateDelivered:
-          (job.actual_delivery && moment(job.actual_delivery).tz(job.bodyshop.timezone).format(DateFormat)) || "",
-        DateInvoiced:
-          (job.date_invoiced && moment(job.date_invoiced).tz(job.bodyshop.timezone).format(DateFormat)) || "",
-        DateExported:
-          (job.date_exported && moment(job.date_exported).tz(job.bodyshop.timezone).format(DateFormat)) || "",
-        DateVoid: (job.date_void && moment(job.date_void).tz(job.bodyshop.timezone).format(DateFormat)) || ""
+          ? moment(job.date_repairstarted).tz(job.bodyshop.timezone).format(DateFormat)
+          : job.actual_in
+            ? moment(job.actual_in).tz(job.bodyshop.timezone).format(DateFormat)
+            : "",
+        DateScheduledCompletion: job.scheduled_completion
+          ? moment(job.scheduled_completion).tz(job.bodyshop.timezone).format(DateFormat)
+          : "",
+        DateCompleted: job.actual_completion
+          ? moment(job.actual_completion).tz(job.bodyshop.timezone).format(DateFormat)
+          : "",
+        DateScheduledDelivery: job.scheduled_delivery
+          ? moment(job.scheduled_delivery).tz(job.bodyshop.timezone).format(DateFormat)
+          : "",
+        DateDelivered: job.actual_delivery
+          ? moment(job.actual_delivery).tz(job.bodyshop.timezone).format(DateFormat)
+          : "",
+        DateInvoiced: job.date_invoiced ? moment(job.date_invoiced).tz(job.bodyshop.timezone).format(DateFormat) : "",
+        DateExported: job.date_exported ? moment(job.date_exported).tz(job.bodyshop.timezone).format(DateFormat) : "",
+        DateVoid: job.date_void ? moment(job.date_void).tz(job.bodyshop.timezone).format(DateFormat) : ""
       },
       JobLineDetails: (function () {
         const joblineSource = Array.isArray(job.joblines) ? job.joblines : job.joblines ? [job.joblines] : [];

server/fortellis/fortellis-helpers.js

@@ -86,6 +86,9 @@ async function FetchSubscriptions({ redisHelpers, socket, jobid, SubscriptionObj
         logRequest: false
       });
       const SubscriptionMeta = subscriptions.data.subscriptions.find((s) => s.subscriptionId === SubscriptionID);
+      if (!SubscriptionMeta) {
+        throw new Error(`Subscription metadata not found for SubscriptionID: ${SubscriptionID}`);
+      }
       if (setSessionTransactionData) {
         await setSessionTransactionData(
           socket.id,
@@ -102,11 +105,15 @@ async function FetchSubscriptions({ redisHelpers, socket, jobid, SubscriptionObj
       error: error.message,
       stack: error.stack
     });
+    throw error;
   }
 }
 
 async function GetDepartmentId({ apiName, debug = false, SubscriptionMeta, overrideDepartmentId }) {
   if (!apiName) throw new Error("apiName not provided. Unable to get department without apiName.");
+  if (!SubscriptionMeta || !Array.isArray(SubscriptionMeta.apiDmsInfo)) {
+    throw new Error("Subscription metadata missing apiDmsInfo.");
+  }
   if (debug) {
     console.log("API Names & Departments ");
     console.log("===========");
@@ -118,9 +125,8 @@ async function GetDepartmentId({ apiName, debug = false, SubscriptionMeta, overr
     .find((info) => info.name === apiName)?.departments; //Departments are categorized by API name and have an array of departments.
 
   if (overrideDepartmentId) {
-    return departmentIds && departmentIds.find(d => d.id === overrideDepartmentId)?.id
+    return departmentIds && departmentIds.find((d) => d.id === overrideDepartmentId)?.id;
   } else {
-
     return departmentIds && departmentIds[0] && departmentIds[0].id; //TODO: This makes the assumption that there is only 1 department.
   }
 }
@@ -235,18 +241,6 @@ async function MakeFortellisCall({
     //   jobid: socket?.recordid
     // });
 
-    if (result.data.checkStatusAfterSeconds) {
-      return DelayedCallback({
-        delayMeta: result.data,
-        access_token,
-        SubscriptionID: SubscriptionMeta.subscriptionId,
-        ReqId,
-        departmentIds: DepartmentId
-      });
-    }
-
-
-
     logger.log(
       "fortellis-log-event-json",
       "DEBUG",
@@ -261,6 +255,18 @@ async function MakeFortellisCall({
       },
     );
 
+    if (result.data.checkStatusAfterSeconds) {
+      return DelayedCallback({
+        delayMeta: result.data,
+        access_token,
+        SubscriptionID: SubscriptionMeta.subscriptionId,
+        ReqId,
+        departmentIds: DepartmentId,
+        jobid,
+        socket
+      });
+    }
+
     return result.data;
   } catch (error) {
     const errorDetails = {
@@ -310,7 +316,7 @@ async function MakeFortellisCall({
 //Some Fortellis calls return a batch result that isn't ready immediately.
 //This function will check the status of the call and wait until it is ready.
 //It will try 5 times before giving up.
-async function DelayedCallback({ delayMeta, access_token, SubscriptionID, ReqId, departmentIds }) {
+async function DelayedCallback({ delayMeta, access_token, SubscriptionID, ReqId, departmentIds, jobid, socket }) {
   for (let index = 0; index < 5; index++) {
     await sleep(delayMeta.checkStatusAfterSeconds * 1000);
     //Check to see if the call is ready.
@@ -334,6 +340,19 @@ async function DelayedCallback({ delayMeta, access_token, SubscriptionID, ReqId,
           //"Department-Id": departmentIds[0].id
         }
       });
+      logger.log(
+      "fortellis-log-event-json-DelayedCallback",
+      "DEBUG",
+      socket?.user?.email,
+      jobid,
+      {
+        requestcurl: batchResult.config.curlCommand,
+        reqid: batchResult.config.headers["Request-Id"] || null,
+        subscriptionId: batchResult.config.headers["Subscription-Id"] || null,
+        resultdata: batchResult.data,
+        resultStatus: batchResult.status
+      },
+    );
       // await writeFortellisLogToFile({
       //   timestamp: new Date().toISOString(),
       //   reqId: ReqId,

server/fortellis/fortellis.js

@@ -14,7 +14,7 @@ const {
 const _ = require("lodash");
 const moment = require("moment-timezone");
 
-const replaceSpecialRegex = /[^a-zA-Z0-9 .,\n #]+/g;
+const replaceSpecialRegex = /[^a-zA-Z0-9 ]+/g;
 
 // Helper function to handle FortellisApiError logging
 function handleFortellisApiError(socket, error, functionName, additionalDetails = {}) {
@@ -180,25 +180,55 @@ async function FortellisSelectedCustomer({ socket, redisHelpers, selectedCustome
     getTransactionType(jobid),
     FortellisCacheEnums.txEnvelope
   );
-  const DMSVid = await redisHelpers.getSessionTransactionData(
-    socket.id,
-    getTransactionType(JobData.id),
-    FortellisCacheEnums.DMSVid
-  );
+  if (!JobData || !txEnvelope) {
+    const friendlyMessage =
+      "Fortellis export context was lost after reconnect. Click Post again to restart the Fortellis flow.";
+    CreateFortellisLogEvent(socket, "WARN", friendlyMessage, {
+      jobid,
+      hasJobData: !!JobData,
+      hasTxEnvelope: !!txEnvelope
+    });
+    socket.emit("export-failed", {
+      title: "Fortellis",
+      severity: "warning",
+      errorCode: "FORTELLIS_CONTEXT_MISSING",
+      friendlyMessage
+    });
+    return;
+  }
+
   try {
+    const DMSVid = await redisHelpers.getSessionTransactionData(
+      socket.id,
+      getTransactionType(JobData.id),
+      FortellisCacheEnums.DMSVid
+    );
+    if (!DMSVid) {
+      const friendlyMessage =
+        "Fortellis vehicle context is missing after reconnect. Click Post again to restart the Fortellis flow.";
+      CreateFortellisLogEvent(socket, "WARN", friendlyMessage, {
+        jobid,
+        hasDMSVid: !!DMSVid
+      });
+      socket.emit("export-failed", {
+        title: "Fortellis",
+        severity: "warning",
+        errorCode: "FORTELLIS_CONTEXT_MISSING",
+        friendlyMessage
+      });
+      return;
+    }
+
     let DMSCust;
     if (selectedCustomerId) {
       CreateFortellisLogEvent(socket, "DEBUG", `{3.1} Querying the Customer using Customer ID: ${selectedCustomerId}`);
 
       //Get cust list from Redis. Return the item
-      const DMSCustList = await getSessionTransactionData(
-        socket.id,
-        getTransactionType(jobid),
-        FortellisCacheEnums.DMSCustList
-      );
+      const DMSCustList =
+        (await getSessionTransactionData(socket.id, getTransactionType(jobid), FortellisCacheEnums.DMSCustList)) || [];
       const existingCustomerInDMSCustList = DMSCustList.find((c) => c.customerId === selectedCustomerId);
       DMSCust = existingCustomerInDMSCustList || {
-        customerId: selectedCustomerId //This is the fall back in case it is the generic customer. 
+        customerId: selectedCustomerId //This is the fall back in case it is the generic customer.
       };
       await setSessionTransactionData(
         socket.id,
@@ -207,8 +237,6 @@ async function FortellisSelectedCustomer({ socket, redisHelpers, selectedCustome
         DMSCust,
         defaultFortellisTTL
       );
-
-
     } else {
       CreateFortellisLogEvent(socket, "DEBUG", `{3.2} Creating new customer.`);
       const DMSCustomerInsertResponse = await InsertDmsCustomer({ socket, redisHelpers, JobData });
@@ -227,14 +255,10 @@ async function FortellisSelectedCustomer({ socket, redisHelpers, selectedCustome
       CreateFortellisLogEvent(socket, "DEBUG", `{4.1} Inserting new vehicle with ID: ID ${DMSVid.vehiclesVehId}`);
       DMSVeh = await InsertDmsVehicle({ socket, redisHelpers, JobData, txEnvelope, DMSVid, DMSCust });
     } else {
-      DMSVeh = await getSessionTransactionData(
-        socket.id,
-        getTransactionType(jobid),
-        FortellisCacheEnums.DMSVeh
-      )
+      DMSVeh = await getSessionTransactionData(socket.id, getTransactionType(jobid), FortellisCacheEnums.DMSVeh);
       CreateFortellisLogEvent(socket, "DEBUG", `{4.3} Updating Existing Vehicle to associate to owner.`);
 
-      //Check to see if the vehicle needs to be updated - i.e. the owner is not the selected customer. 
+      //Check to see if the vehicle needs to be updated - i.e. the owner is not the selected customer.
       if (!DMSVeh?.owners.find((o) => o.id.value === DMSCust.customerId && o.id.assigningPartyId === "CURRENT")) {
         DMSVeh = await UpdateDmsVehicle({
           socket,
@@ -271,7 +295,11 @@ async function FortellisSelectedCustomer({ socket, redisHelpers, selectedCustome
 
     if (DMSTransHeader.rtnCode === "0") {
       try {
-        CreateFortellisLogEvent(socket, "DEBUG", `{6} Attempting to post Transaction with ID ${DMSTransHeader.transID}`);
+        CreateFortellisLogEvent(
+          socket,
+          "DEBUG",
+          `{6} Attempting to post Transaction with ID ${DMSTransHeader.transID}`
+        );
 
         const DmsBatchTxnPost = await PostDmsBatchWip({ socket, redisHelpers, JobData }); // 2 in 1 call that includes a post and the transactions.
         await setSessionTransactionData(
@@ -282,16 +310,14 @@ async function FortellisSelectedCustomer({ socket, redisHelpers, selectedCustome
           defaultFortellisTTL
         );
 
-
         if (DmsBatchTxnPost.rtnCode === "0") {
           //TODO: Validate this is a string and not #
           //something
           CreateFortellisLogEvent(socket, "DEBUG", `{6} Successfully posted transaction to DMS.`);
 
-          await MarkJobExported({ socket, jobid: JobData.id, JobData });
+          await MarkJobExported({ socket, jobid: JobData.id, JobData, redisHelpers });
 
           try {
-
             CreateFortellisLogEvent(socket, "DEBUG", `{7} Updating Service Vehicle History.`);
             const DMSVehHistory = await InsertServiceVehicleHistory({ socket, redisHelpers, JobData });
             await setSessionTransactionData(
@@ -302,24 +328,19 @@ async function FortellisSelectedCustomer({ socket, redisHelpers, selectedCustome
               defaultFortellisTTL
             );
           } catch (error) {
-
             CreateFortellisLogEvent(socket, "ERROR", `{7.1} Error posting vehicle service history. ${error.message}`);
           }
 
           socket.emit("export-success", JobData.id);
         } else {
-          //There was something wrong. Throw an error to trigger clean up. 
+          //There was something wrong. Throw an error to trigger clean up.
           //throw new Error("Error posting DMS Batch Transaction");
-
         }
-
-
-      } catch (error) {
+      } catch {
         //Clean up the transaction and insert a faild error code
         // //Get the error code
         CreateFortellisLogEvent(socket, "DEBUG", `{6.1} Getting errors for Transaction ID ${DMSTransHeader.transID}`);
 
-
         const DmsError = await QueryDmsErrWip({ socket, redisHelpers, JobData });
         //   //Delete the transaction
         CreateFortellisLogEvent(socket, "DEBUG", `{6.2} Deleting Transaction ID ${DMSTransHeader.transID}`);
@@ -345,7 +366,17 @@ async function FortellisSelectedCustomer({ socket, redisHelpers, selectedCustome
       stack: error.stack,
       data: error.errorData
     });
-    await InsertFailedExportLog({ socket, JobData, error: error.errorData?.issues || [JSON.stringify(error.errorData)] });
+    socket.emit("export-failed", {
+      title: "Fortellis",
+      severity: "error",
+      error: error.message,
+      friendlyMessage: "Fortellis export failed. Please click Post again to retry."
+    });
+    await InsertFailedExportLog({
+      socket,
+      JobData,
+      error: error.errorData?.issues || [JSON.stringify(error.errorData)]
+    });
   } finally {
     //Ensure we always insert logEvents
     //GQL to insert logevents.
@@ -374,7 +405,7 @@ async function CalculateDmsVid({ socket, JobData, redisHelpers }) {
       jobid: JobData.id,
       body: {}
     });
-    return result;
+    return Array.isArray(result) ? result.filter((v) => v.vehiclesVehId !== null && v.vehiclesVehId !== "") : [];
   } catch (error) {
     handleFortellisApiError(socket, error, "CalculateDmsVid", {
       vin: JobData.v_vin,
@@ -429,12 +460,12 @@ async function QueryDmsCustomerById({ socket, redisHelpers, JobData, CustomerId
 async function QueryDmsCustomerByName({ socket, redisHelpers, JobData }) {
   const ownerName =
     JobData.ownr_co_nm && JobData.ownr_co_nm.trim() !== ""
-      //? [["firstName", JobData.ownr_co_nm.replace(replaceSpecialRegex, "").toUpperCase()]] // Commented out until we receive direction. 
-      ? [["phone", JobData.ownr_ph1?.replace(replaceSpecialRegex, "")]]
+      ? //? [["firstName", JobData.ownr_co_nm.replace(replaceSpecialRegex, "").toUpperCase()]] // Commented out until we receive direction.
+        [["phone", JobData.ownr_ph1?.replace(/[^0-9]/g, "")]]
       : [
-        ["firstName", JobData.ownr_fn?.replace(replaceSpecialRegex, "").toUpperCase()],
-        ["lastName", JobData.ownr_ln?.replace(replaceSpecialRegex, "").toUpperCase()]
-      ];
+          ["firstName", JobData.ownr_fn?.replace(/[^a-zA-Z0-9]/g, "").toUpperCase()],
+          ["lastName", JobData.ownr_ln?.replace(/[^a-zA-Z0-9]/g, "").toUpperCase()]
+        ];
   try {
     const result = await MakeFortellisCall({
       ...FortellisActions.QueryCustomerByName,
@@ -457,7 +488,7 @@ async function QueryDmsCustomerByName({ socket, redisHelpers, JobData }) {
 
 async function InsertDmsCustomer({ socket, redisHelpers, JobData }) {
   try {
-    const isBusiness = (JobData.ownr_co_nm && JobData.ownr_co_nm.replace(replaceSpecialRegex, "").trim() !== "")
+    const isBusiness = JobData.ownr_co_nm && JobData.ownr_co_nm.replace(replaceSpecialRegex, "").trim() !== "";
     const result = await MakeFortellisCall({
       ...FortellisActions.CreateCustomer,
       headers: {},
@@ -466,21 +497,23 @@ async function InsertDmsCustomer({ socket, redisHelpers, JobData }) {
       jobid: JobData.id,
       body: {
         customerType: isBusiness ? "BUSINESS" : "INDIVIDUAL",
-        ...isBusiness ? {
-          companyName: JobData.ownr_co_nm && JobData.ownr_co_nm.replace(replaceSpecialRegex, "").toUpperCase(),
-          secondaryCustomerName: {
-            //lastName: JobData.ownr_co_nm && JobData.ownr_co_nm.replace(replaceSpecialRegex, "").toUpperCase()
-          }
-        } : {
-          customerName: {
-            //"suffix": "Mr.",
-            firstName: JobData.ownr_fn && JobData.ownr_fn.replace(replaceSpecialRegex, "").toUpperCase(),
-            //"middleName": "",
-            lastName: JobData.ownr_ln && JobData.ownr_ln.replace(replaceSpecialRegex, "").toUpperCase()
-            //"title": "",
-            //"nickName": ""
-          }
-        },
+        ...(isBusiness
+          ? {
+              companyName: JobData.ownr_co_nm && JobData.ownr_co_nm.replace(replaceSpecialRegex, "").toUpperCase(),
+              secondaryCustomerName: {
+                //lastName: JobData.ownr_co_nm && JobData.ownr_co_nm.replace(replaceSpecialRegex, "").toUpperCase()
+              }
+            }
+          : {
+              customerName: {
+                //"suffix": "Mr.",
+                firstName: JobData.ownr_fn && JobData.ownr_fn.replace(/[^a-zA-Z0-9]/g, "").toUpperCase(),
+                //"middleName": "",
+                lastName: JobData.ownr_ln && JobData.ownr_ln.replace(/[^a-zA-Z0-9]/g, "").toUpperCase()
+                //"title": "",
+                //"nickName": ""
+              }
+            }),
         postalAddress: {
           addressLine1: JobData.ownr_addr1?.replace(replaceSpecialRegex, "").trim().toUpperCase(),
           addressLine2: JobData.ownr_addr2?.replace(replaceSpecialRegex, "").trim().toUpperCase(),
@@ -490,7 +523,7 @@ async function InsertDmsCustomer({ socket, redisHelpers, JobData }) {
             rome: JobData.ownr_zip
           }),
           state: JobData.ownr_st?.replace(replaceSpecialRegex, "").trim().toUpperCase(),
-          country: JobData.ownr_ctry?.replace(replaceSpecialRegex, "").trim().toUpperCase(),
+          country: JobData.ownr_ctry?.replace(replaceSpecialRegex, "").trim().toUpperCase()
           //"territory": ""
         },
         // "birthDate": {
@@ -504,7 +537,7 @@ async function InsertDmsCustomer({ socket, redisHelpers, JobData }) {
           phones: [
             {
               //"uuid": "",
-              number: JobData.ownr_ph1?.replace(replaceSpecialRegex, ""),
+              number: JobData.ownr_ph1?.replace(/[^0-9]/g, ""),
               type: "HOME"
               // "doNotCallIndicator": true,
               // "doNotCallIndicatorDate": `null,
@@ -540,18 +573,18 @@ async function InsertDmsCustomer({ socket, redisHelpers, JobData }) {
           emailAddresses: [
             ...(!_.isEmpty(JobData.ownr_ea)
               ? [
-                {
-                  //"uuid": "",
-                  address: JobData.ownr_ea.toUpperCase(),
-                  type: "PERSONAL"
-                  // "doNotEmailSource": "",
-                  // "doNotEmail": false,
-                  // "isPreferred": true,
-                  // "transactionEmailNotificationOptIn": false,
-                  // "optInRequestDate": null,
-                  // "optInDate": null
-                }
-              ]
+                  {
+                    //"uuid": "",
+                    address: JobData.ownr_ea.toUpperCase(),
+                    type: "PERSONAL"
+                    // "doNotEmailSource": "",
+                    // "doNotEmail": false,
+                    // "isPreferred": true,
+                    // "transactionEmailNotificationOptIn": false,
+                    // "optInRequestDate": null,
+                    // "optInDate": null
+                  }
+                ]
               : [])
             // {
             //   "uuid": "",
@@ -691,9 +724,9 @@ async function InsertDmsVehicle({ socket, redisHelpers, JobData, txEnvelope, DMS
               txEnvelope.dms_unsold === true
                 ? ""
                 : moment(txEnvelope.inservicedate)
-                  //.tz(JobData.bodyshop.timezone)
-                  .startOf("day")
-                  .toISOString()
+                    //.tz(JobData.bodyshop.timezone)
+                    .startOf("day")
+                    .toISOString()
           }),
           //"lastServiceDate": "2011-11-23",
           vehicleId: DMSVid.vehiclesVehId
@@ -735,8 +768,8 @@ async function InsertDmsVehicle({ socket, redisHelpers, JobData, txEnvelope, DMS
             txEnvelope.dms_unsold === true
               ? ""
               : moment()
-                // .tz(JobData.bodyshop.timezone)
-                .format("YYYY-MM-DD"),
+                  // .tz(JobData.bodyshop.timezone)
+                  .format("YYYY-MM-DD"),
           // "deliveryMileage": 4,
           // "doorsQuantity": 4,
           // "engineNumber": "",
@@ -753,8 +786,8 @@ async function InsertDmsVehicle({ socket, redisHelpers, JobData, txEnvelope, DMS
               : String(JobData.plate_no).replace(/([^\w]|_)/g, "").length === 0
                 ? null
                 : String(JobData.plate_no)
-                  .replace(/([^\w]|_)/g, "")
-                  .toUpperCase(),
+                    .replace(/([^\w]|_)/g, "")
+                    .toUpperCase(),
           make: txEnvelope.dms_make,
           // "model": "CC10753",
           modelAbrev: txEnvelope.dms_model,
@@ -900,13 +933,13 @@ async function UpdateDmsVehicle({ socket, redisHelpers, JobData, DMSVeh, DMSCust
           },
           ...(oldOwner
             ? [
-              {
-                id: {
-                  assigningPartyId: "PREVIOUS",
-                  value: oldOwner.id.value
+                {
+                  id: {
+                    assigningPartyId: "PREVIOUS",
+                    value: oldOwner.id.value
+                  }
                 }
-              }
-            ]
+              ]
             : [])
         ];
       }
@@ -936,24 +969,24 @@ async function UpdateDmsVehicle({ socket, redisHelpers, JobData, DMSVeh, DMSCust
               txEnvelope.dms_unsold === true
                 ? ""
                 : moment(DMSVehToSend.dealer.inServiceDate || txEnvelope.inservicedate)
-                  // .tz(JobData.bodyshop.timezone)
-                  .toISOString()
+                    // .tz(JobData.bodyshop.timezone)
+                    .toISOString()
           })
         },
         vehicle: {
           ...DMSVehToSend.vehicle,
           ...(txEnvelope.dms_model_override
             ? {
-              make: txEnvelope.dms_make,
-              modelAbrev: txEnvelope.dms_model
-            }
+                make: txEnvelope.dms_make,
+                modelAbrev: txEnvelope.dms_model
+              }
             : {}),
           deliveryDate:
             txEnvelope.dms_unsold === true
               ? ""
               : moment(DMSVehToSend.vehicle.deliveryDate)
-                //.tz(JobData.bodyshop.timezone)
-                .toISOString()
+                  //.tz(JobData.bodyshop.timezone)
+                  .toISOString()
         },
         owners: ids
       }
@@ -1061,7 +1094,7 @@ async function InsertDmsStartWip({ socket, redisHelpers, JobData }) {
         // transID: "",
         // userID: "partprgm",
         // userName: "PROGRAM, PARTNER"
-      },
+      }
     });
     return result;
   } catch (error) {
@@ -1091,9 +1124,9 @@ async function GenerateTransWips({ socket, redisHelpers, JobData }) {
         acct: alloc.profitCenter.dms_acctnumber,
         cntl:
           alloc.profitCenter.dms_control_override &&
-            alloc.profitCenter.dms_control_override !== null &&
-            alloc.profitCenter.dms_control_override !== undefined &&
-            alloc.profitCenter.dms_control_override?.trim() !== ""
+          alloc.profitCenter.dms_control_override !== null &&
+          alloc.profitCenter.dms_control_override !== undefined &&
+          alloc.profitCenter.dms_control_override?.trim() !== ""
             ? alloc.profitCenter.dms_control_override
             : JobData.ro_number,
         cntl2: null,
@@ -1114,9 +1147,9 @@ async function GenerateTransWips({ socket, redisHelpers, JobData }) {
         acct: alloc.costCenter.dms_acctnumber,
         cntl:
           alloc.costCenter.dms_control_override &&
-            alloc.costCenter.dms_control_override !== null &&
-            alloc.costCenter.dms_control_override !== undefined &&
-            alloc.costCenter.dms_control_override?.trim() !== ""
+          alloc.costCenter.dms_control_override !== null &&
+          alloc.costCenter.dms_control_override !== undefined &&
+          alloc.costCenter.dms_control_override?.trim() !== ""
             ? alloc.costCenter.dms_control_override
             : JobData.ro_number,
         cntl2: null,
@@ -1134,9 +1167,9 @@ async function GenerateTransWips({ socket, redisHelpers, JobData }) {
         acct: alloc.costCenter.dms_wip_acctnumber,
         cntl:
           alloc.costCenter.dms_control_override &&
-            alloc.costCenter.dms_control_override !== null &&
-            alloc.costCenter.dms_control_override !== undefined &&
-            alloc.costCenter.dms_control_override?.trim() !== ""
+          alloc.costCenter.dms_control_override !== null &&
+          alloc.costCenter.dms_control_override !== undefined &&
+          alloc.costCenter.dms_control_override?.trim() !== ""
             ? alloc.costCenter.dms_control_override
             : JobData.ro_number,
         cntl2: null,
@@ -1158,9 +1191,9 @@ async function GenerateTransWips({ socket, redisHelpers, JobData }) {
           acct: alloc.profitCenter.dms_acctnumber,
           cntl:
             alloc.profitCenter.dms_control_override &&
-              alloc.profitCenter.dms_control_override !== null &&
-              alloc.profitCenter.dms_control_override !== undefined &&
-              alloc.profitCenter.dms_control_override?.trim() !== ""
+            alloc.profitCenter.dms_control_override !== null &&
+            alloc.profitCenter.dms_control_override !== undefined &&
+            alloc.profitCenter.dms_control_override?.trim() !== ""
               ? alloc.profitCenter.dms_control_override
               : JobData.ro_number,
           cntl2: null,
@@ -1228,7 +1261,7 @@ async function PostDmsBatchWip({ socket, redisHelpers, JobData }) {
         opCode: "P",
         transID: DMSTransHeader.transID,
         transWipReqList: await GenerateTransWips({ socket, redisHelpers, JobData })
-      },
+      }
     });
     return result;
   } catch (error) {
@@ -1256,7 +1289,7 @@ async function QueryDmsErrWip({ socket, redisHelpers, JobData }) {
       socket,
       jobid: JobData.id,
       requestPathParams: DMSTransHeader.transID,
-      body: {},
+      body: {}
     });
     return result;
   } catch (error) {
@@ -1286,7 +1319,7 @@ async function DeleteDmsWip({ socket, redisHelpers, JobData }) {
       body: {
         opCode: "D",
         transID: DMSTransHeader.transID
-      },
+      }
     });
     return result;
   } catch (error) {
@@ -1298,9 +1331,15 @@ async function DeleteDmsWip({ socket, redisHelpers, JobData }) {
   }
 }
 
-async function MarkJobExported({ socket, jobid, JobData }) {
+async function MarkJobExported({ socket, jobid, JobData, redisHelpers }) {
   CreateFortellisLogEvent(socket, "DEBUG", `Marking job as exported for id ${jobid}`);
 
+  const transwips = await redisHelpers.getSessionTransactionData(
+    socket.id,
+    getTransactionType(JobData.id),
+    FortellisCacheEnums.transWips
+  );
+
   const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
   const currentToken =
     (socket?.data && socket.data.authToken) || (socket?.handshake?.auth && socket.handshake.auth.token);
@@ -1318,7 +1357,7 @@ async function MarkJobExported({ socket, jobid, JobData }) {
         jobid: jobid,
         successful: true,
         useremail: socket.user.email,
-        metadata: socket.transWips
+        metadata: transwips
       },
       bill: {
         exported: true,
@@ -1338,13 +1377,15 @@ async function InsertFailedExportLog({ socket, JobData, error }) {
     const result = await client
       .setHeaders({ Authorization: `Bearer ${currentToken}` })
       .request(queries.INSERT_EXPORT_LOG, {
-        logs: [{
-          bodyshopid: JobData.bodyshop.id,
-          jobid: JobData.id,
-          successful: false,
-          message: JSON.stringify(error),
-          useremail: socket.user.email
-        }]
+        logs: [
+          {
+            bodyshopid: JobData.bodyshop.id,
+            jobid: JobData.id,
+            successful: false,
+            message: JSON.stringify(error),
+            useremail: socket.user.email
+          }
+        ]
       });
 
     return result;

server/graphql-client/queries.js

@@ -827,13 +827,21 @@ exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshop
         quantity
       }
     }
-    timetickets {
+    timetickets(where: {cost_center: {_neq: "timetickets.labels.shift"}}) {
       id
       rate
+      ciecacode
       cost_center
       actualhrs
       productivehrs
       flat_rate
+      employeeid
+      employee {
+        employee_number
+        flat_rate
+        first_name
+        last_name
+      }
     }
     area_of_damage
     employee_prep_rel {
@@ -1612,6 +1620,9 @@ exports.GET_JOB_BY_PK = `query GET_JOB_BY_PK($id: uuid!) {
       rate_ats
       flat_rate_ats
       rate_ats_flat
+      dms_id
+      dms_customer_id
+      dms_advisor_id
       joblines(where: { removed: { _eq: false } }){
         id
         line_no
@@ -3228,9 +3239,12 @@ exports.UPDATE_USER_FCM_TOKENS_BY_EMAIL = /* GraphQL */ `
   }
 `;
 
-exports.SET_JOB_DMS_ID = `mutation SetJobDmsId($id: uuid!, $dms_id: String!) {
-    update_jobs_by_pk(pk_columns: { id: $id }, _set: { dms_id: $dms_id }) {
+exports.SET_JOB_DMS_ID = `mutation SetJobDmsId($id: uuid!, $dms_id: String!, $dms_customer_id: String, $dms_advisor_id: String, $kmin: Int) {
+    update_jobs_by_pk(pk_columns: { id: $id }, _set: { dms_id: $dms_id, dms_customer_id: $dms_customer_id, dms_advisor_id: $dms_advisor_id, kmin: $kmin }) {
       id
       dms_id
+      dms_customer_id
+      dms_advisor_id
+      kmin
     }
   }`;

server/job/job-costing.js

@@ -13,6 +13,9 @@ const { DiscountNotAlreadyCounted } = InstanceManager({
 // Dinero.globalLocale = "en-CA";
 Dinero.globalRoundingMode = "HALF_EVEN";
 
+const isImEX = InstanceManager({ imex: true, rome: false });
+const isRome = InstanceManager({ imex: false, rome: true });
+
 async function JobCosting(req, res) {
   const { jobid } = req.body;
 
@@ -266,9 +269,7 @@ function GenerateCostingData(job) {
   );
 
   const materialsHours = { mapaHrs: 0, mashHrs: 0 };
-  let mashOpCodes = InstanceManager({
-    rome: ParseCalopCode(job.materials["MASH"]?.cal_opcode)
-  });
+  let mashOpCodes = isRome && ParseCalopCode(job.materials["MASH"]?.cal_opcode);
   let hasMapaLine = false;
   let hasMashLine = false;
 
@@ -355,7 +356,7 @@ function GenerateCostingData(job) {
           if (val.mod_lbr_ty === "LAR") {
             materialsHours.mapaHrs += val.mod_lb_hrs || 0;
           }
-          if (InstanceManager({ imex: true, rome: false })) {
+          if (isImEX) {
             if (val.mod_lbr_ty !== "LAR") {
               materialsHours.mashHrs += val.mod_lb_hrs || 0;
             }
@@ -363,7 +364,7 @@ function GenerateCostingData(job) {
             if (val.mod_lbr_ty !== "LAR" && mashOpCodes.includes(val.lbr_op)) {
               materialsHours.mashHrs += val.mod_lb_hrs || 0;
             }
-            if (val.manual_line === true && !mashOpCodes.includes(val.lbr_op) && val.mod_lbr_ty !== "LAR" ) {
+            if (val.manual_line === true && !mashOpCodes.includes(val.lbr_op) && val.mod_lbr_ty !== "LAR") {
               materialsHours.mashHrs += val.mod_lb_hrs || 0;
             }
           }
@@ -525,14 +526,15 @@ function GenerateCostingData(job) {
       }
     }
 
-    if (InstanceManager({ rome: true })) {
+    if (isRome) {
       if (convertedKey) {
         const correspondingCiecaStlTotalLine = job.cieca_stl?.data.find(
           (c) => c.ttl_typecd === convertedKey.toUpperCase()
         );
         if (
           correspondingCiecaStlTotalLine &&
-          Math.abs(jobLineTotalsByProfitCenter.parts[key].getAmount() - correspondingCiecaStlTotalLine.ttl_amt * 100) > 1
+          Math.abs(jobLineTotalsByProfitCenter.parts[key].getAmount() - correspondingCiecaStlTotalLine.ttl_amt * 100) >
+            1
         ) {
           jobLineTotalsByProfitCenter.parts[key] = jobLineTotalsByProfitCenter.parts[key].add(disc).add(markup);
         }
@@ -545,7 +547,7 @@ function GenerateCostingData(job) {
     if (
       job.materials["MAPA"] &&
       job.materials["MAPA"].cal_maxdlr !== undefined &&
-      job.materials["MAPA"].cal_maxdlr >= 0
+      (isRome ? job.materials["MAPA"].cal_maxdlr >= 0 : job.materials["MAPA"].cal_maxdlr > 0)
     ) {
       //It has an upper threshhold.
       threshold = Dinero({
@@ -595,7 +597,7 @@ function GenerateCostingData(job) {
     if (
       job.materials["MASH"] &&
       job.materials["MASH"].cal_maxdlr !== undefined &&
-      job.materials["MASH"].cal_maxdlr >= 0
+      (isRome ? job.materials["MASH"].cal_maxdlr >= 0 : job.materials["MASH"].cal_maxdlr > 0)
     ) {
       //It has an upper threshhold.
       threshold = Dinero({
@@ -641,7 +643,7 @@ function GenerateCostingData(job) {
     }
   }
 
-  if (InstanceManager({ imex: false, rome: true })) {
+  if (isRome) {
     const stlTowing = job.cieca_stl?.data.find((c) => c.ttl_type === "OTTW");
     const stlStorage = job.cieca_stl?.data.find((c) => c.ttl_type === "OTST");
 

server/rr/rr-export-logs.js

@@ -86,8 +86,9 @@ const buildMessageJSONString = ({ error, classification, result, fallback }) =>
 /**
  * Success: mark job exported + (optionally) insert a success log.
  * Uses queries.MARK_JOB_EXPORTED (same shape as Fortellis/PBS).
+ * @param {boolean} isEarlyRo - If true, only logs success but does NOT change job status (for early RO creation)
  */
-const markRRExportSuccess = async ({ socket, jobId, job, bodyshop, result, metaExtra = {} }) => {
+const markRRExportSuccess = async ({ socket, jobId, job, bodyshop, result, metaExtra = {}, isEarlyRo = false }) => {
   const endpoint = process.env.GRAPHQL_ENDPOINT;
   if (!endpoint) throw new Error("GRAPHQL_ENDPOINT not configured");
   const token = getAuthToken(socket);
@@ -96,11 +97,40 @@ const markRRExportSuccess = async ({ socket, jobId, job, bodyshop, result, metaE
   const client = new GraphQLClient(endpoint, {});
   client.setHeaders({ Authorization: `Bearer ${token}` });
 
+  const meta = buildRRExportMeta({ result, extra: metaExtra });
+
+  // For early RO, we only insert a log but do NOT change job status or mark as exported
+  if (isEarlyRo) {
+    try {
+      await client.request(queries.INSERT_EXPORT_LOG, {
+        logs: [
+          {
+            bodyshopid: bodyshop?.id || job?.bodyshop?.id,
+            jobid: jobId,
+            successful: true,
+            useremail: socket?.user?.email || null,
+            metadata: meta,
+            message: buildMessageJSONString({ result, fallback: "RR early RO created" })
+          }
+        ]
+      });
+
+      CreateRRLogEvent(socket, "INFO", "RR early RO: success log inserted (job status unchanged)", {
+        jobId
+      });
+    } catch (e) {
+      CreateRRLogEvent(socket, "ERROR", "RR early RO: failed to insert success log", {
+        jobId,
+        error: e?.message
+      });
+    }
+    return;
+  }
+
+  // Full export: mark job as exported and insert success log
   const exportedStatus =
     job?.bodyshop?.md_ro_statuses?.default_exported || bodyshop?.md_ro_statuses?.default_exported || "Exported*";
 
-  const meta = buildRRExportMeta({ result, extra: metaExtra });
-
   try {
     await client.request(queries.MARK_JOB_EXPORTED, {
       jobId,

server/rr/rr-job-export.js

@@ -56,7 +56,324 @@ const deriveRRStatus = (rrRes = {}) => {
 };
 
 /**
- * Step 1: Export a job to RR as a new Repair Order.
+ * Early RO Creation: Create a minimal RR Repair Order with basic info (customer, advisor, mileage, story).
+ * Used when creating RO from convert button or admin page before full job export.
+ * @param args
+ * @returns {Promise<{success: boolean, data: *, roStatus: {status: *, statusCode: *|undefined, message}, statusBlocks: *|{}, customerNo: string, svId: *, roNo: *, xml: *}>}
+ */
+const createMinimalRRRepairOrder = async (args) => {
+  const { bodyshop, job, advisorNo, selectedCustomer, txEnvelope, socket, svId } = args || {};
+
+  if (!bodyshop) throw new Error("createMinimalRRRepairOrder: bodyshop is required");
+  if (!job) throw new Error("createMinimalRRRepairOrder: job is required");
+  if (advisorNo == null || String(advisorNo).trim() === "") {
+    throw new Error("createMinimalRRRepairOrder: advisorNo is required for RR");
+  }
+
+  // Resolve customer number (accept multiple shapes)
+  const selected = selectedCustomer?.customerNo || selectedCustomer?.custNo;
+  if (!selected) throw new Error("createMinimalRRRepairOrder: selectedCustomer.custNo/customerNo is required");
+
+  const { client, opts } = buildClientAndOpts(bodyshop);
+
+  // For early RO creation we always "Insert" (create minimal RO)
+  const finalOpts = {
+    ...opts,
+    envelope: {
+      ...(opts?.envelope || {}),
+      sender: {
+        ...(opts?.envelope?.sender || {}),
+        task: "BSMRO",
+        referenceId: "Insert"
+      }
+    }
+  };
+
+  const story = txEnvelope?.story ? String(txEnvelope.story).trim() : null;
+  const makeOverride = txEnvelope?.makeOverride ? String(txEnvelope.makeOverride).trim() : null;
+
+  // Build minimal RO payload - just header, no allocations/parts/labor
+  const cleanVin =
+    (job?.v_vin || "")
+      .toString()
+      .replace(/[^A-Za-z0-9]/g, "")
+      .toUpperCase()
+      .slice(0, 17) || undefined;
+
+  // Resolve mileage - must be a positive number
+  let mileageIn = txEnvelope?.kmin ?? job?.kmin ?? null;
+  if (mileageIn != null) {
+    mileageIn = parseInt(mileageIn, 10);
+    if (isNaN(mileageIn) || mileageIn < 0) {
+      mileageIn = null;
+    }
+  }
+
+  CreateRRLogEvent(socket, "DEBUG", "Resolved mileage for early RO", {
+    txEnvelopeKmin: txEnvelope?.kmin,
+    jobKmin: job?.kmin,
+    resolvedMileageIn: mileageIn
+  });
+
+  const payload = {
+    customerNo: String(selected),
+    advisorNo: String(advisorNo),
+    vin: cleanVin,
+    departmentType: "B",
+    outsdRoNo: job?.ro_number || job?.id || undefined,
+    estimate: {
+      parts: "0",
+      labor: "0",
+      total: "0.00"
+    }
+  };
+
+  // Only add mileageIn if we have a valid value
+  if (mileageIn != null && mileageIn >= 0) {
+    payload.mileageIn = mileageIn;
+  }
+
+  // Add optional fields if present
+  if (story) {
+    payload.roComment = story;
+  }
+  if (makeOverride) {
+    payload.makeOverride = makeOverride;
+  }
+
+  CreateRRLogEvent(socket, "INFO", "Creating minimal RR Repair Order (early creation)", {
+    payload
+  });
+
+  const response = await client.createRepairOrder(payload, finalOpts);
+
+  CreateRRLogEvent(socket, "INFO", "RR minimal Repair Order created", {
+    payload,
+    response
+  });
+
+  const data = response?.data || null;
+  const statusBlocks = response?.statusBlocks || {};
+  const roStatus = deriveRRStatus(response);
+
+  const statusUpper = roStatus?.status ? String(roStatus.status).toUpperCase() : null;
+
+  let success = false;
+
+  if (statusUpper) {
+    // Treat explicit FAILURE / ERROR as hard failures
+    success = !["FAILURE", "ERROR"].includes(statusUpper);
+  } else if (typeof response?.success === "boolean") {
+    // Fallback to library boolean if no explicit status
+    success = response.success;
+  } else if (roStatus?.status) {
+    success = String(roStatus.status).toUpperCase() === "SUCCESS";
+  }
+
+  // Extract canonical roNo for later updates
+  const roNo = data?.dmsRoNo ?? data?.outsdRoNo ?? roStatus?.dmsRoNo ?? null;
+
+  return {
+    success,
+    data,
+    roStatus,
+    statusBlocks,
+    customerNo: String(selected),
+    svId,
+    roNo,
+    xml: response?.xml // expose XML for logging/diagnostics
+  };
+};
+
+/**
+ * Full Data Update: Update an existing RR Repair Order with complete job data (allocations, parts, labor).
+ * Used during DMS post form when an early RO was already created.
+ * @param args
+ * @returns {Promise<{success: boolean, data: *, roStatus: {status: *, statusCode: *|undefined, message}, statusBlocks: *|{}, customerNo: string, svId: *, roNo: *, xml: *}>}
+ */
+const updateRRRepairOrderWithFullData = async (args) => {
+  const { bodyshop, job, advisorNo, selectedCustomer, txEnvelope, socket, svId, roNo } = args || {};
+
+  if (!bodyshop) throw new Error("updateRRRepairOrderWithFullData: bodyshop is required");
+  if (!job) throw new Error("updateRRRepairOrderWithFullData: job is required");
+  if (advisorNo == null || String(advisorNo).trim() === "") {
+    throw new Error("updateRRRepairOrderWithFullData: advisorNo is required for RR");
+  }
+  if (!roNo) throw new Error("updateRRRepairOrderWithFullData: roNo is required for update");
+
+  // Resolve customer number (accept multiple shapes)
+  const selected = selectedCustomer?.customerNo || selectedCustomer?.custNo;
+  if (!selected) throw new Error("updateRRRepairOrderWithFullData: selectedCustomer.custNo/customerNo is required");
+
+  const { client, opts } = buildClientAndOpts(bodyshop);
+
+  // For full data update after early RO, we still use "Insert" referenceId
+  // because we're inserting the job operations for the first time
+  const finalOpts = {
+    ...opts,
+    envelope: {
+      ...(opts?.envelope || {}),
+      sender: {
+        ...(opts?.envelope?.sender || {}),
+        task: "BSMRO",
+        referenceId: "Insert"
+      }
+    }
+  };
+
+  const story = txEnvelope?.story ? String(txEnvelope.story).trim() : null;
+  const makeOverride = txEnvelope?.makeOverride ? String(txEnvelope.makeOverride).trim() : null;
+
+  // Optional RR OpCode segments coming from the FE (RRPostForm)
+  const opPrefix = txEnvelope?.opPrefix ?? txEnvelope?.op_prefix ?? null;
+  const opBase = txEnvelope?.opBase ?? txEnvelope?.op_base ?? null;
+  const opSuffix = txEnvelope?.opSuffix ?? txEnvelope?.op_suffix ?? null;
+
+  // RR-only extras
+  let rrCentersConfig = null;
+  let allocations = null;
+  let opCode = null;
+
+  // 1) Responsibility center config (for visibility / debugging)
+  try {
+    rrCentersConfig = extractRrResponsibilityCenters(bodyshop);
+
+    CreateRRLogEvent(socket, "SILLY", "RR responsibility centers resolved", {
+      hasCenters: !!bodyshop.md_responsibility_centers,
+      profitCenters: Object.keys(rrCentersConfig?.profitsByName || {}),
+      costCenters: Object.keys(rrCentersConfig?.costsByName || {}),
+      dmsCostDefaults: rrCentersConfig?.dmsCostDefaults || {},
+      dmsProfitDefaults: rrCentersConfig?.dmsProfitDefaults || {}
+    });
+  } catch (e) {
+    CreateRRLogEvent(socket, "ERROR", "Failed to resolve RR responsibility centers", {
+      message: e?.message,
+      stack: e?.stack
+    });
+  }
+
+  // 2) Allocations (sales + cost by center, with rr_* metadata already attached)
+  try {
+    const allocResult = await CdkCalculateAllocations(socket, job.id);
+
+    // We only need the per-center job allocations for RO.GOG / ROLABOR.
+    allocations = Array.isArray(allocResult?.jobAllocations) ? allocResult.jobAllocations : [];
+
+    CreateRRLogEvent(socket, "INFO", "RR allocations resolved for update", {
+      hasAllocations: allocations.length > 0,
+      count: allocations.length,
+      allocationsPreview: allocations.slice(0, 2).map((a) => ({
+        type: a?.type,
+        code: a?.code,
+        laborSale: a?.laborSale,
+        laborCost: a?.laborCost,
+        partsSale: a?.partsSale,
+        partsCost: a?.partsCost
+      })),
+      taxAllocCount: Array.isArray(allocResult?.taxAllocArray) ? allocResult.taxAllocArray.length : 0,
+      ttlAdjCount: Array.isArray(allocResult?.ttlAdjArray) ? allocResult.ttlAdjArray.length : 0,
+      ttlTaxAdjCount: Array.isArray(allocResult?.ttlTaxAdjArray) ? allocResult.ttlTaxAdjArray.length : 0
+    });
+  } catch (e) {
+    CreateRRLogEvent(socket, "ERROR", "Failed to calculate RR allocations", {
+      message: e?.message,
+      stack: e?.stack
+    });
+    // Proceed with a header-only update if allocations fail.
+    allocations = [];
+  }
+
+  const resolvedBaseOpCode = resolveRROpCodeFromBodyshop(bodyshop);
+
+  let opCodeOverride = txEnvelope?.opCode || txEnvelope?.opcode || txEnvelope?.op_code || null;
+
+  // If the FE only sends segments, combine them here.
+  if (!opCodeOverride && (opPrefix || opBase || opSuffix)) {
+    const combined = `${opPrefix || ""}${opBase || ""}${opSuffix || ""}`.trim();
+    if (combined) {
+      opCodeOverride = combined;
+    }
+  }
+
+  if (opCodeOverride || resolvedBaseOpCode) {
+    opCode = String(opCodeOverride || resolvedBaseOpCode).trim() || null;
+  }
+
+  CreateRRLogEvent(socket, "SILLY", "RR OP config resolved", {
+    opCode,
+    baseFromConfig: resolvedBaseOpCode,
+    opPrefix,
+    opBase,
+    opSuffix
+  });
+
+  // Build full RO payload for update with allocations
+  const payload = buildRRRepairOrderPayload({
+    bodyshop,
+    job,
+    selectedCustomer: { customerNo: String(selected), custNo: String(selected) },
+    advisorNo: String(advisorNo),
+    story,
+    makeOverride,
+    allocations,
+    opCode
+  });
+
+  // Add roNo for linking to existing RO
+  payload.roNo = String(roNo);
+  payload.outsdRoNo = job?.ro_number || job?.id || undefined;
+
+  // Keep rolabor - it's needed to register the job/OpCode accounts in Reynolds
+  // Without this, Reynolds won't recognize the OpCode when we send rogg operations
+  // The rolabor section tells Reynolds "these jobs exist" even with minimal data
+
+  CreateRRLogEvent(socket, "INFO", "Sending full data for early RO (using create with roNo)", {
+    roNo: String(roNo),
+    hasRolabor: !!payload.rolabor,
+    hasRogg: !!payload.rogg,
+    payload
+  });
+
+  // Use createRepairOrder (not update) with the roNo to link to the existing early RO
+  // Reynolds will merge this with the existing RO header
+  const response = await client.createRepairOrder(payload, finalOpts);
+
+  CreateRRLogEvent(socket, "INFO", "RR Repair Order full data sent", {
+    payload,
+    response
+  });
+
+  const data = response?.data || null;
+  const statusBlocks = response?.statusBlocks || {};
+  const roStatus = deriveRRStatus(response);
+
+  const statusUpper = roStatus?.status ? String(roStatus.status).toUpperCase() : null;
+
+  let success = false;
+
+  if (statusUpper) {
+    success = !["FAILURE", "ERROR"].includes(statusUpper);
+  } else if (typeof response?.success === "boolean") {
+    success = response.success;
+  } else if (roStatus?.status) {
+    success = String(roStatus.status).toUpperCase() === "SUCCESS";
+  }
+
+  return {
+    success,
+    data,
+    roStatus,
+    statusBlocks,
+    customerNo: String(selected),
+    svId,
+    roNo: String(roNo),
+    xml: response?.xml
+  };
+};
+
+/**
+ * LEGACY: Step 1: Export a job to RR as a new Repair Order with full data.
+ * This is the original function - kept for backward compatibility if shops don't use early RO creation.
  * @param args
  * @returns {Promise<{success: boolean, data: *, roStatus: {status: *, statusCode: *|undefined, message}, statusBlocks: *|{}, customerNo: string, svId: *, roNo: *, xml: *}>}
  */
@@ -315,4 +632,10 @@ const finalizeRRRepairOrder = async (args) => {
   };
 };
 
-module.exports = { exportJobToRR, finalizeRRRepairOrder, deriveRRStatus };
+module.exports = {
+  exportJobToRR,
+  createMinimalRRRepairOrder,
+  updateRRRepairOrderWithFullData,
+  finalizeRRRepairOrder,
+  deriveRRStatus
+};

server/rr/rr-job-helpers.js

@@ -52,6 +52,122 @@ const asN2 = (dineroLike) => {
   return amount.toFixed(2);
 };
 
+/**
+ * Normalize various "money-like" shapes to integer cents.
+ * Supports:
+ *  - Dinero instances (getAmount / toUnit)
+ *  - { cents }
+ *  - { amount, precision }
+ *  - plain numbers (treated as units, e.g. dollars)
+ *  - numeric strings (treated as units, e.g. "123.45")
+ * @param value
+ * @returns {number}
+ */
+const toMoneyCents = (value) => {
+  if (value == null || value === "") return 0;
+
+  if (typeof value.getAmount === "function") {
+    return value.getAmount();
+  }
+
+  if (typeof value.toUnit === "function") {
+    const unit = value.toUnit();
+    return Number.isFinite(unit) ? Math.round(unit * 100) : 0;
+  }
+
+  if (typeof value.cents === "number") {
+    return value.cents;
+  }
+
+  if (typeof value.amount === "number") {
+    const precision = typeof value.precision === "number" ? value.precision : 2;
+    if (precision === 2) return value.amount;
+    const factor = Math.pow(10, 2 - precision);
+    return Math.round(value.amount * factor);
+  }
+
+  if (typeof value === "number") {
+    return Math.round(value * 100);
+  }
+
+  if (typeof value === "string") {
+    const parsed = Number.parseFloat(value);
+    return Number.isFinite(parsed) ? Math.round(parsed * 100) : 0;
+  }
+
+  return 0;
+};
+
+const asN2FromCents = (cents) => asN2({ amount: Number.isFinite(cents) ? cents : 0, precision: 2 });
+
+/**
+ * Build RR estimate block from allocation totals.
+ * @param {Array} allocations
+ * @returns {{parts: string, labor: string, total: string}|null}
+ */
+const buildEstimateFromAllocations = (allocations) => {
+  if (!Array.isArray(allocations) || allocations.length === 0) return null;
+
+  const totals = allocations.reduce(
+    (acc, alloc) => {
+      acc.parts += toMoneyCents(alloc?.partsSale);
+      acc.labor += toMoneyCents(alloc?.laborTaxableSale);
+      acc.labor += toMoneyCents(alloc?.laborNonTaxableSale);
+      acc.total += toMoneyCents(alloc?.totalSale);
+      return acc;
+    },
+    { parts: 0, labor: 0, total: 0 }
+  );
+
+  // If totalSale wasn't provided, keep total coherent with parts + labor.
+  if (!totals.total) {
+    totals.total = totals.parts + totals.labor;
+  }
+
+  return {
+    parts: asN2FromCents(totals.parts),
+    labor: asN2FromCents(totals.labor),
+    total: asN2FromCents(totals.total)
+  };
+};
+
+/**
+ * Build RR estimate block from precomputed job totals.
+ * @param job
+ * @returns {{parts: string, labor: string, total: string}|null}
+ */
+const buildEstimateFromJobTotals = (job) => {
+  const totals = job?.job_totals;
+  if (!totals) return null;
+
+  const partsCents = toMoneyCents(totals?.parts?.parts?.total) + toMoneyCents(totals?.parts?.sublets?.total);
+  const laborCents = toMoneyCents(totals?.rates?.rates_subtotal ?? totals?.rates?.subtotal);
+  let totalCents = toMoneyCents(totals?.totals?.subtotal);
+
+  if (!totalCents) {
+    totalCents = partsCents + laborCents;
+  }
+
+  // If we truly have no numbers from totals, omit estimate entirely.
+  if (!partsCents && !laborCents && !totalCents) return null;
+
+  return {
+    parts: asN2FromCents(partsCents),
+    labor: asN2FromCents(laborCents),
+    total: asN2FromCents(totalCents)
+  };
+};
+
+/**
+ * Build RR estimate block from the best available source.
+ * @param job
+ * @param allocations
+ * @returns {{parts: string, labor: string, total: string}|null}
+ */
+const buildRREstimate = ({ job, allocations } = {}) => {
+  return buildEstimateFromAllocations(allocations) || buildEstimateFromJobTotals(job);
+};
+
 /**
  * Build RO.GOG structure for the reynolds-rome-client `createRepairOrder` payload
  * from allocations.
@@ -103,44 +219,6 @@ const buildRogogFromAllocations = (allocations, { opCode, payType = "Cust", roNo
 
   const ops = [];
 
-  /**
-   * Normalize various "money-like" shapes to integer cents.
-   * Supports:
-   *  - Dinero instances (getAmount / toUnit)
-   *  - { cents }
-   *  - { amount, precision }
-   *  - plain numbers (treated as units, e.g. dollars)
-   */
-  const toCents = (value) => {
-    if (!value) return 0;
-
-    if (typeof value.getAmount === "function") {
-      return value.getAmount();
-    }
-
-    if (typeof value.toUnit === "function") {
-      const unit = value.toUnit();
-      return Number.isFinite(unit) ? Math.round(unit * 100) : 0;
-    }
-
-    if (typeof value.cents === "number") {
-      return value.cents;
-    }
-
-    if (typeof value.amount === "number") {
-      const precision = typeof value.precision === "number" ? value.precision : 2;
-      if (precision === 2) return value.amount;
-      const factor = Math.pow(10, 2 - precision);
-      return Math.round(value.amount * factor);
-    }
-
-    if (typeof value === "number") {
-      return Math.round(value * 100);
-    }
-
-    return 0;
-  };
-
   const asMoneyLike = (amountCents) => ({
     amount: amountCents || 0,
     precision: 2
@@ -154,13 +232,13 @@ const buildRogogFromAllocations = (allocations, { opCode, payType = "Cust", roNo
     // Only centers configured for RR GOG are included
     if (!breakOut || !itemType) continue;
 
-    const partsTaxableCents = toCents(alloc.partsTaxableSale);
-    const partsNonTaxableCents = toCents(alloc.partsNonTaxableSale);
-    const extrasTaxableCents = toCents(alloc.extrasTaxableSale);
-    const extrasNonTaxableCents = toCents(alloc.extrasNonTaxableSale);
-    const laborTaxableCents = toCents(alloc.laborTaxableSale);
-    const laborNonTaxableCents = toCents(alloc.laborNonTaxableSale);
-    const costCents = toCents(alloc.cost);
+    const partsTaxableCents = toMoneyCents(alloc.partsTaxableSale);
+    const partsNonTaxableCents = toMoneyCents(alloc.partsNonTaxableSale);
+    const extrasTaxableCents = toMoneyCents(alloc.extrasTaxableSale);
+    const extrasNonTaxableCents = toMoneyCents(alloc.extrasNonTaxableSale);
+    const laborTaxableCents = toMoneyCents(alloc.laborTaxableSale);
+    const laborNonTaxableCents = toMoneyCents(alloc.laborNonTaxableSale);
+    const costCents = toMoneyCents(alloc.cost);
 
     const segments = [];
 
@@ -418,6 +496,11 @@ const buildRRRepairOrderPayload = ({
     mileageIn: job.kmin
   };
 
+  const estimate = buildRREstimate({ job, allocations });
+  if (estimate) {
+    payload.estimate = estimate;
+  }
+
   if (story) {
     payload.roComment = String(story).trim();
   }

server/rr/rr-register-socket-events.js

@@ -1,7 +1,12 @@
 const CreateRRLogEvent = require("./rr-logger-event");
 const { rrCombinedSearch, rrGetAdvisors, buildClientAndOpts } = require("./rr-lookup");
 const { QueryJobData, buildRogogFromAllocations, buildRolaborFromRogog } = require("./rr-job-helpers");
-const { exportJobToRR, finalizeRRRepairOrder } = require("./rr-job-export");
+const {
+  exportJobToRR,
+  createMinimalRRRepairOrder,
+  updateRRRepairOrderWithFullData,
+  finalizeRRRepairOrder
+} = require("./rr-job-export");
 const RRCalculateAllocations = require("./rr-calculate-allocations").default;
 const { createRRCustomer } = require("./rr-customers");
 const { ensureRRServiceVehicle } = require("./rr-service-vehicles");
@@ -124,13 +129,15 @@ const getBodyshopForSocket = async ({ bodyshopId, socket }) => {
 };
 
 /**
- * GraphQL mutation to set job.dms_id
+ * GraphQL mutation to set job.dms_id, dms_customer_id, and dms_advisor_id
  * @param socket
  * @param jobId
  * @param dmsId
+ * @param dmsCustomerId
+ * @param dmsAdvisorId
  * @returns {Promise<void>}
  */
-const setJobDmsIdForSocket = async ({ socket, jobId, dmsId }) => {
+const setJobDmsIdForSocket = async ({ socket, jobId, dmsId, dmsCustomerId, dmsAdvisorId, mileageIn }) => {
   if (!jobId || !dmsId) {
     CreateRRLogEvent(socket, "WARN", "setJobDmsIdForSocket called without jobId or dmsId", {
       jobId,
@@ -149,16 +156,28 @@ const setJobDmsIdForSocket = async ({ socket, jobId, dmsId }) => {
     const client = new GraphQLClient(endpoint, {});
     await client
       .setHeaders({ Authorization: `Bearer ${token}` })
-      .request(queries.SET_JOB_DMS_ID, { id: jobId, dms_id: String(dmsId) });
+      .request(queries.SET_JOB_DMS_ID, { 
+        id: jobId, 
+        dms_id: String(dmsId),
+        dms_customer_id: dmsCustomerId ? String(dmsCustomerId) : null,
+        dms_advisor_id: dmsAdvisorId ? String(dmsAdvisorId) : null,
+        kmin: mileageIn != null && mileageIn > 0 ? parseInt(mileageIn, 10) : null
+      });
 
     CreateRRLogEvent(socket, "INFO", "Linked job.dms_id to RR RO", {
       jobId,
-      dmsId: String(dmsId)
+      dmsId: String(dmsId),
+      dmsCustomerId,
+      dmsAdvisorId,
+      mileageIn
     });
   } catch (err) {
     CreateRRLogEvent(socket, "ERROR", "Failed to set job.dms_id after RR create/update", {
       jobId,
       dmsId,
+      dmsCustomerId,
+      dmsAdvisorId,
+      mileageIn,
       message: err?.message || String(err),
       stack: err?.stack
     });
@@ -373,7 +392,504 @@ const registerRREvents = ({ socket, redisHelpers }) => {
     }
   });
 
-  socket.on("rr-export-job", async ({ jobid, jobId, txEnvelope } = {}) => {
+  /**
+   * NEW: Early RO Creation Event
+   * Creates a minimal RO from convert button or admin page with customer selection,
+   * advisor, mileage, and optional story/overrides.
+   */
+  socket.on("rr-create-early-ro", async ({ jobid, jobId, txEnvelope } = {}) => {
+    const rid = resolveJobId(jobid || jobId, { jobId, jobid }, null);
+
+    try {
+      if (!rid) throw new Error("RR early create: jobid required");
+
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-1} Received RR early RO creation request`, { jobid: rid });
+
+      // Cache txEnvelope (contains advisor, mileage, story, overrides)
+      await redisHelpers.setSessionTransactionData(
+        socket.id,
+        getTransactionType(rid),
+        RRCacheEnums.txEnvelope,
+        txEnvelope || {},
+        defaultRRTTL
+      );
+
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-1.1} Cached txEnvelope`, { hasTxEnvelope: !!txEnvelope });
+
+      const job = await QueryJobData({ redisHelpers }, rid);
+      await redisHelpers.setSessionTransactionData(
+        socket.id,
+        getTransactionType(rid),
+        RRCacheEnums.JobData,
+        job,
+        defaultRRTTL
+      );
+
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-1.2} Cached JobData`, { vin: job?.v_vin, ro: job?.ro_number });
+
+      const adv = readAdvisorNo(
+        { txEnvelope },
+        await redisHelpers.getSessionTransactionData(socket.id, getTransactionType(rid), RRCacheEnums.AdvisorNo)
+      );
+
+      if (adv) {
+        await redisHelpers.setSessionTransactionData(
+          socket.id,
+          getTransactionType(rid),
+          RRCacheEnums.AdvisorNo,
+          String(adv),
+          defaultRRTTL
+        );
+
+        CreateRRLogEvent(socket, "DEBUG", `{EARLY-1.3} Cached advisorNo`, { advisorNo: String(adv) });
+      }
+
+      const { bodyshopId } = await getSessionOrSocket(redisHelpers, socket);
+      const bodyshop = await getBodyshopForSocket({ bodyshopId, socket });
+
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-2} Running multi-search (Full Name + VIN)`);
+
+      const candidates = await rrMultiCustomerSearch({ bodyshop, job, socket, redisHelpers });
+      const decorated = candidates.map((c) => (c.vinOwner != null ? c : { ...c, vinOwner: !!c.isVehicleOwner }));
+
+      socket.emit("rr-select-customer", decorated);
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-2.1} Emitted rr-select-customer for early RO`, {
+        count: decorated.length,
+        anyOwner: decorated.some((c) => c.vinOwner || c.isVehicleOwner)
+      });
+    } catch (error) {
+      CreateRRLogEvent(socket, "ERROR", `Error during RR early RO creation (prepare)`, {
+        error: error.message,
+        stack: error.stack,
+        jobid: rid
+      });
+
+      try {
+        socket.emit("export-failed", { vendor: "rr", jobId: rid, error: error.message });
+      } catch {
+        //
+      }
+    }
+  });
+
+  /**
+   * NEW: Early RO Customer Selected Event
+   * Handles customer selection for early RO creation and creates minimal RO.
+   */
+  socket.on("rr-early-customer-selected", async ({ jobid, jobId, selectedCustomerId, custNo, create } = {}, ack) => {
+    const rid = resolveJobId(jobid || jobId, { jobid, jobId }, null);
+    let bodyshop = null;
+    let job = null;
+    let createdCustomer = false;
+
+    try {
+      if (!rid) throw new Error("jobid required");
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-3} rr-early-customer-selected`, {
+        jobid: rid,
+        custNo,
+        selectedCustomerId,
+        create: !!create
+      });
+
+      const ns = getTransactionType(rid);
+
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-3.0a} Raw parameters received`, {
+        custNo: custNo,
+        custNoType: typeof custNo,
+        selectedCustomerId: selectedCustomerId,
+        create: create
+      });
+
+      let selectedCustNo =
+        (custNo && String(custNo)) ||
+        (selectedCustomerId && String(selectedCustomerId)) ||
+        (await redisHelpers.getSessionTransactionData(socket.id, ns, RRCacheEnums.SelectedCustomer));
+
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-3.0b} After initial resolution`, {
+        selectedCustNo,
+        selectedCustNoType: typeof selectedCustNo
+      });
+
+      // Filter out invalid values
+      if (selectedCustNo === "undefined" || selectedCustNo === "null" || (selectedCustNo && selectedCustNo.trim() === "")) {
+        selectedCustNo = null;
+      }
+
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-3.0} Resolved customer selection`, {
+        selectedCustNo,
+        willCreateNew: create === true || !selectedCustNo
+      });
+
+      job = await redisHelpers.getSessionTransactionData(socket.id, ns, RRCacheEnums.JobData);
+
+      const txEnvelope = (await redisHelpers.getSessionTransactionData(socket.id, ns, RRCacheEnums.txEnvelope)) || {};
+
+      if (!job) throw new Error("Staged JobData not found (run rr-create-early-ro first).");
+
+      const { bodyshopId } = await getSessionOrSocket(redisHelpers, socket);
+
+      bodyshop = await getBodyshopForSocket({ bodyshopId, socket });
+
+      // Create customer (if requested or none chosen)
+      if (create === true || !selectedCustNo) {
+        CreateRRLogEvent(socket, "DEBUG", `{EARLY-3.1} Creating RR customer`);
+
+        const created = await createRRCustomer({ bodyshop, job, socket });
+        selectedCustNo = String(created?.customerNo || "");
+
+        CreateRRLogEvent(socket, "DEBUG", `{EARLY-3.2} Created customer`, {
+          custNo: selectedCustNo,
+          createdCustomerNo: created?.customerNo
+        });
+
+        if (!selectedCustNo || selectedCustNo === "undefined" || selectedCustNo.trim() === "") {
+          throw new Error("RR create customer returned no valid custNo");
+        }
+
+        createdCustomer = true;
+      }
+
+      // VIN owner pre-check
+      try {
+        const vehQ = makeVehicleSearchPayloadFromJob(job);
+        if (vehQ && vehQ.kind === "vin" && job?.v_vin) {
+          const vinResponse = await rrCombinedSearch(bodyshop, vehQ);
+
+          CreateRRLogEvent(socket, "SILLY", `VIN owner pre-check response (early RO)`, { response: vinResponse });
+
+          const vinBlocks = Array.isArray(vinResponse?.data) ? vinResponse.data : [];
+
+          try {
+            await redisHelpers.setSessionTransactionData(
+              socket.id,
+              ns,
+              RRCacheEnums.VINCandidates,
+              vinBlocks,
+              defaultRRTTL
+            );
+          } catch {
+            //
+          }
+
+          const ownersSet = ownersFromVinBlocks(vinBlocks, job.v_vin);
+
+          if (ownersSet?.size) {
+            const sel = String(selectedCustNo);
+
+            if (!ownersSet.has(sel)) {
+              const [existingOwner] = Array.from(ownersSet).map(String);
+              CreateRRLogEvent(socket, "DEBUG", `{EARLY-3.2a} VIN exists; switching to VIN owner`, {
+                vin: job.v_vin,
+                selected: sel,
+                existingOwner
+              });
+              selectedCustNo = existingOwner;
+            }
+          }
+        }
+      } catch (e) {
+        CreateRRLogEvent(socket, "WARN", `VIN owner pre-check failed; continuing with selected customer (early RO)`, {
+          error: e?.message
+        });
+      }
+
+      // Cache final/effective customer selection
+      const effectiveCustNo = String(selectedCustNo);
+
+      await redisHelpers.setSessionTransactionData(
+        socket.id,
+        ns,
+        RRCacheEnums.SelectedCustomer,
+        effectiveCustNo,
+        defaultRRTTL
+      );
+
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-3.3} Cached selected customer`, { custNo: effectiveCustNo });
+
+      // Build client & routing
+      const { client, opts } = await buildClientAndOpts(bodyshop);
+      const routing = opts?.routing || client?.opts?.routing || null;
+      if (!routing?.dealerNumber) throw new Error("ensureRRServiceVehicle: routing.dealerNumber required");
+
+      // Reconstruct a lightweight tx object
+      const tx = {
+        jobData: {
+          ...job,
+          vin: job?.v_vin
+        },
+        txEnvelope
+      };
+
+      const vin = resolveVin({ tx, job });
+
+      if (!vin) {
+        CreateRRLogEvent(socket, "ERROR", "{EARLY-3.x} No VIN found for ensureRRServiceVehicle", { jobid: rid });
+        throw new Error("ensureRRServiceVehicle: vin required");
+      }
+
+      CreateRRLogEvent(socket, "DEBUG", "{EARLY-3.4} ensureRRServiceVehicle: starting", {
+        jobid: rid,
+        selectedCustomerNo: effectiveCustNo,
+        vin,
+        dealerNumber: routing.dealerNumber,
+        storeNumber: routing.storeNumber,
+        areaNumber: routing.areaNumber
+      });
+
+      const ensured = await ensureRRServiceVehicle({
+        client,
+        routing,
+        bodyshop,
+        selectedCustomerNo: effectiveCustNo,
+        custNo: effectiveCustNo,
+        customerNo: effectiveCustNo,
+        vin,
+        job,
+        socket,
+        redisHelpers
+      });
+
+      CreateRRLogEvent(socket, "DEBUG", "{EARLY-3.5} ensureRRServiceVehicle: done", ensured);
+
+      const cachedAdvisor = await redisHelpers.getSessionTransactionData(socket.id, ns, RRCacheEnums.AdvisorNo);
+      const advisorNo = readAdvisorNo({ txEnvelope }, cachedAdvisor);
+
+      if (!advisorNo) {
+        CreateRRLogEvent(socket, "ERROR", `Advisor is required (advisorNo) for early RO`);
+        await insertRRFailedExportLog({
+          socket,
+          jobId: rid,
+          job,
+          bodyshop,
+          error: new Error("Advisor is required (advisorNo)."),
+          classification: { errorCode: "RR_MISSING_ADVISOR", friendlyMessage: "Advisor is required." }
+        });
+        socket.emit("export-failed", { vendor: "rr", jobId: rid, error: "Advisor is required (advisorNo)." });
+        return ack?.({ ok: false, error: "Advisor is required (advisorNo)." });
+      }
+
+      await redisHelpers.setSessionTransactionData(
+        socket.id,
+        ns,
+        RRCacheEnums.AdvisorNo,
+        String(advisorNo),
+        defaultRRTTL
+      );
+
+      // CREATE MINIMAL RO (early creation)
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-4} Creating minimal RR RO`);
+      const result = await createMinimalRRRepairOrder({
+        bodyshop,
+        job,
+        selectedCustomer: { customerNo: effectiveCustNo, custNo: effectiveCustNo },
+        advisorNo: String(advisorNo),
+        txEnvelope,
+        socket,
+        svId: ensured?.svId || null
+      });
+
+      // Cache raw export result + pending RO number
+      await redisHelpers.setSessionTransactionData(
+        socket.id,
+        ns,
+        RRCacheEnums.ExportResult,
+        result || {},
+        defaultRRTTL
+      );
+
+      if (result?.success) {
+        const data = result?.data || {};
+
+        // Prefer explicit return from export function; then fall back to fields
+        const dmsRoNo = result?.roNo ?? data?.dmsRoNo ?? null;
+
+        const outsdRoNo = data?.outsdRoNo ?? job?.ro_number ?? job?.id ?? null;
+
+        CreateRRLogEvent(socket, "DEBUG", "Early RO created - checking dmsRoNo", {
+          dmsRoNo,
+          resultRoNo: result?.roNo,
+          dataRoNo: data?.dmsRoNo,
+          jobId: rid
+        });
+
+        // ✅ Persist DMS RO number, customer ID, advisor ID, and mileage on the job
+        if (dmsRoNo) {
+          const mileageIn = txEnvelope?.kmin ?? null;
+          CreateRRLogEvent(socket, "DEBUG", "Calling setJobDmsIdForSocket", { 
+            jobId: rid, 
+            dmsId: dmsRoNo,
+            customerId: effectiveCustNo,
+            advisorId: String(advisorNo),
+            mileageIn
+          });
+          await setJobDmsIdForSocket({ 
+            socket, 
+            jobId: rid, 
+            dmsId: dmsRoNo,
+            dmsCustomerId: effectiveCustNo,
+            dmsAdvisorId: String(advisorNo),
+            mileageIn
+          });
+        } else {
+          CreateRRLogEvent(socket, "WARN", "RR early RO creation succeeded but no DMS RO number was returned", {
+            jobId: rid,
+            resultPreview: {
+              roNo: result?.roNo,
+              data: {
+                dmsRoNo: data?.dmsRoNo,
+                outsdRoNo: data?.outsdRoNo
+              }
+            }
+          });
+        }
+
+        await redisHelpers.setSessionTransactionData(
+          socket.id,
+          ns,
+          RRCacheEnums.PendingRO,
+          {
+            outsdRoNo,
+            dmsRoNo,
+            customerNo: String(effectiveCustNo),
+            advisorNo: String(advisorNo),
+            vin: job?.v_vin || null,
+            earlyRoCreated: true // Flag to indicate this was an early RO
+          },
+          defaultRRTTL
+        );
+
+        CreateRRLogEvent(socket, "INFO", `{EARLY-5} Minimal RO created successfully`, {
+          dmsRoNo: dmsRoNo || null,
+          outsdRoNo: outsdRoNo || null
+        });
+
+        // Mark success in export logs
+        await markRRExportSuccess({
+          socket,
+          jobId: rid,
+          job,
+          bodyshop,
+          result,
+          isEarlyRo: true
+        });
+
+        // Tell FE that early RO was created
+        socket.emit("rr-early-ro-created", { jobId: rid, dmsRoNo, outsdRoNo });
+
+        // Emit result
+        socket.emit("rr-create-early-ro:result", { jobId: rid, bodyshopId: bodyshop?.id, result });
+
+        // ACK with RO details
+        ack?.({
+          ok: true,
+          dmsRoNo,
+          outsdRoNo,
+          result,
+          custNo: String(effectiveCustNo),
+          createdCustomer,
+          earlyRoCreated: true
+        });
+      } else {
+        // classify & fail
+        const tx = result?.statusBlocks?.transaction;
+
+        const vendorStatusCode = Number(
+          result?.roStatus?.statusCode ?? result?.roStatus?.StatusCode ?? tx?.statusCode ?? tx?.StatusCode
+        );
+
+        const vendorMessage =
+          result?.roStatus?.message ??
+          result?.roStatus?.Message ??
+          tx?.message ??
+          tx?.Message ??
+          result?.error ??
+          "RR early RO creation failed";
+
+        const cls = classifyRRVendorError({
+          code: vendorStatusCode,
+          message: vendorMessage
+        });
+
+        CreateRRLogEvent(socket, "ERROR", `Early RO creation failed`, {
+          roStatus: result?.roStatus,
+          statusBlocks: result?.statusBlocks,
+          classification: cls
+        });
+
+        await insertRRFailedExportLog({
+          socket,
+          jobId: rid,
+          job,
+          bodyshop,
+          error: new Error(cls.friendlyMessage || result?.error || "RR early RO creation failed"),
+          classification: cls,
+          result
+        });
+
+        socket.emit("export-failed", {
+          vendor: "rr",
+          jobId: rid,
+          error: cls?.friendlyMessage || result?.error || "RR early RO creation failed",
+          ...cls
+        });
+
+        ack?.({
+          ok: false,
+          error: cls.friendlyMessage || result?.error || "RR early RO creation failed",
+          result,
+          classification: cls
+        });
+      }
+    } catch (error) {
+      const cls = classifyRRVendorError(error);
+
+      CreateRRLogEvent(socket, "ERROR", `Error during RR early RO creation (customer-selected)`, {
+        error: error.message,
+        vendorStatusCode: cls.vendorStatusCode,
+        code: cls.errorCode,
+        friendly: cls.friendlyMessage,
+        stack: error.stack,
+        jobid: rid
+      });
+
+      try {
+        if (!bodyshop || !job) {
+          const { bodyshopId } = await getSessionOrSocket(redisHelpers, socket);
+          bodyshop = bodyshop || (await getBodyshopForSocket({ bodyshopId, socket }));
+          job =
+            job ||
+            (await redisHelpers.getSessionTransactionData(socket.id, getTransactionType(rid), RRCacheEnums.JobData));
+        }
+      } catch {
+        //
+      }
+
+      await insertRRFailedExportLog({
+        socket,
+        jobId: rid,
+        job,
+        bodyshop,
+        error,
+        classification: cls
+      });
+
+      try {
+        socket.emit("export-failed", {
+          vendor: "rr",
+          jobId: rid,
+          error: error.message,
+          ...cls
+        });
+        socket.emit("rr-user-notice", { jobId: rid, ...cls });
+      } catch {
+        //
+      }
+
+      ack?.({ ok: false, error: cls.friendlyMessage || error.message, classification: cls });
+    }
+  });
+
+  socket.on("rr-export-job", async ({ jobid, jobId, txEnvelope } = {}, ack) => {
     const rid = resolveJobId(jobid || jobId, { jobId, jobid }, null);
 
     try {
@@ -422,6 +938,139 @@ const registerRREvents = ({ socket, redisHelpers }) => {
       const { bodyshopId } = await getSessionOrSocket(redisHelpers, socket);
       const bodyshop = await getBodyshopForSocket({ bodyshopId, socket });
 
+      // Check if this job already has an early RO - if so, use stored IDs and skip customer search
+      const hasEarlyRO = !!job?.dms_id;
+      
+      if (hasEarlyRO) {
+        CreateRRLogEvent(socket, "DEBUG", `{2} Early RO exists - using stored customer/advisor`, {
+          dms_id: job.dms_id,
+          dms_customer_id: job.dms_customer_id,
+          dms_advisor_id: job.dms_advisor_id
+        });
+        
+        // Cache the stored customer/advisor IDs for the next step
+        if (job.dms_customer_id) {
+          await redisHelpers.setSessionTransactionData(
+            socket.id,
+            getTransactionType(rid),
+            RRCacheEnums.SelectedCustomer,
+            String(job.dms_customer_id),
+            defaultRRTTL
+          );
+        }
+        if (job.dms_advisor_id) {
+          await redisHelpers.setSessionTransactionData(
+            socket.id,
+            getTransactionType(rid),
+            RRCacheEnums.AdvisorNo,
+            String(job.dms_advisor_id),
+            defaultRRTTL
+          );
+        }
+        
+        // Emit empty customer list to frontend (won't show modal)
+        socket.emit("rr-select-customer", []);
+        
+        // Continue directly with the export by calling the selected customer handler logic inline
+        // This is essentially the same as if user selected the stored customer
+        const selectedCustNo = job.dms_customer_id;
+        
+        if (!selectedCustNo) {
+          throw new Error("Early RO exists but no customer ID stored");
+        }
+        
+        // Continue with ensureRRServiceVehicle and export (same as rr-selected-customer handler)
+        const { client, opts } = await buildClientAndOpts(bodyshop);
+        const routing = opts?.routing || client?.opts?.routing || null;
+        if (!routing?.dealerNumber) throw new Error("ensureRRServiceVehicle: routing.dealerNumber required");
+
+        const tx = {
+          jobData: {
+            ...job,
+            vin: job?.v_vin
+          },
+          txEnvelope
+        };
+
+        const vin = resolveVin({ tx, job });
+        if (!vin) {
+          CreateRRLogEvent(socket, "ERROR", "{3.x} No VIN found for ensureRRServiceVehicle", { jobid: rid });
+          throw new Error("ensureRRServiceVehicle: vin required");
+        }
+
+        const ensured = await ensureRRServiceVehicle({
+          client,
+          routing,
+          bodyshop,
+          selectedCustomerNo: String(selectedCustNo),
+          custNo: String(selectedCustNo),
+          customerNo: String(selectedCustNo),
+          vin,
+          job,
+          socket,
+          redisHelpers
+        });
+
+        const advisorNo = job.dms_advisor_id || readAdvisorNo({ txEnvelope }, await redisHelpers.getSessionTransactionData(socket.id, getTransactionType(rid), RRCacheEnums.AdvisorNo));
+
+        if (!advisorNo) {
+          throw new Error("Advisor is required (advisorNo).");
+        }
+
+        // UPDATE existing RO with full data
+        CreateRRLogEvent(socket, "DEBUG", `{4} Updating existing RR RO with full data`, { dmsRoNo: job.dms_id });
+        const result = await updateRRRepairOrderWithFullData({
+          bodyshop,
+          job,
+          selectedCustomer: { customerNo: String(selectedCustNo), custNo: String(selectedCustNo) },
+          advisorNo: String(advisorNo),
+          txEnvelope,
+          socket,
+          svId: ensured?.svId || null,
+          roNo: job.dms_id
+        });
+
+        if (!result?.success) {
+          throw new Error(result?.roStatus?.message || "Failed to update RR Repair Order");
+        }
+
+        const dmsRoNo = result?.roNo ?? result?.data?.dmsRoNo ?? job.dms_id;
+
+        await redisHelpers.setSessionTransactionData(
+          socket.id,
+          getTransactionType(rid),
+          RRCacheEnums.ExportResult,
+          result || {},
+          defaultRRTTL
+        );
+
+        await redisHelpers.setSessionTransactionData(
+          socket.id,
+          getTransactionType(rid),
+          RRCacheEnums.PendingRO,
+          {
+            outsdRoNo: result?.data?.outsdRoNo ?? job?.ro_number ?? job?.id ?? null,
+            dmsRoNo,
+            customerNo: String(selectedCustNo),
+            advisorNo: String(advisorNo),
+            vin: job?.v_vin || null,
+            isUpdate: true
+          },
+          defaultRRTTL
+        );
+
+        CreateRRLogEvent(socket, "INFO", `RR Repair Order updated successfully`, {
+          dmsRoNo,
+          jobId: rid
+        });
+
+        // For early RO flow, only emit validation-required (not export-job:result)
+        // since the export is not complete yet - we're just waiting for validation
+        socket.emit("rr-validation-required", { dmsRoNo, jobId: rid });
+        
+        return ack?.({ ok: true, skipCustomerSelection: true, dmsRoNo });
+      }
+
       CreateRRLogEvent(socket, "DEBUG", `{2} Running multi-search (Full Name + VIN)`);
 
       const candidates = await rrMultiCustomerSearch({ bodyshop, job, socket, redisHelpers });
@@ -620,17 +1269,59 @@ const registerRREvents = ({ socket, redisHelpers }) => {
         defaultRRTTL
       );
 
-      // CREATE/UPDATE (first step only)
-      CreateRRLogEvent(socket, "DEBUG", `{4} Performing RR create/update (step 1)`);
-      const result = await exportJobToRR({
-        bodyshop,
-        job,
-        selectedCustomer: { customerNo: effectiveCustNo, custNo: effectiveCustNo },
-        advisorNo: String(advisorNo),
-        txEnvelope,
-        socket,
-        svId: ensured?.svId || null
-      });
+      // Check if this job already has an early RO created (check job.dms_id)
+      // If so, we'll use stored customer/advisor IDs and do a full data UPDATE instead of CREATE
+      const existingDmsId = job?.dms_id || null;
+      const shouldUpdate = !!existingDmsId;
+
+      // When updating an early RO, use stored customer/advisor IDs
+      let finalEffectiveCustNo = effectiveCustNo;
+      let finalAdvisorNo = advisorNo;
+      
+      if (shouldUpdate && job?.dms_customer_id) {
+        CreateRRLogEvent(socket, "DEBUG", `Using stored customer ID from early RO`, { 
+          storedCustomerId: job.dms_customer_id,
+          originalCustomerId: effectiveCustNo  
+        });
+        finalEffectiveCustNo = String(job.dms_customer_id);
+      }
+      
+      if (shouldUpdate && job?.dms_advisor_id) {
+        CreateRRLogEvent(socket, "DEBUG", `Using stored advisor ID from early RO`, { 
+          storedAdvisorId: job.dms_advisor_id,
+          originalAdvisorId: advisorNo  
+        });
+        finalAdvisorNo = String(job.dms_advisor_id);
+      }
+
+      let result;
+      
+      if (shouldUpdate) {
+        // UPDATE existing RO with full data
+        CreateRRLogEvent(socket, "DEBUG", `{4} Updating existing RR RO with full data`, { dmsRoNo: existingDmsId });
+        result = await updateRRRepairOrderWithFullData({
+          bodyshop,
+          job,
+          selectedCustomer: { customerNo: finalEffectiveCustNo, custNo: finalEffectiveCustNo },
+          advisorNo: String(finalAdvisorNo),
+          txEnvelope,
+          socket,
+          svId: ensured?.svId || null,
+          roNo: existingDmsId
+        });
+      } else {
+        // CREATE new RO (legacy flow - full data on first create)
+        CreateRRLogEvent(socket, "DEBUG", `{4} Performing RR create (step 1 - full data)`);
+        result = await exportJobToRR({
+          bodyshop,
+          job,
+          selectedCustomer: { customerNo: finalEffectiveCustNo, custNo: finalEffectiveCustNo },
+          advisorNo: String(finalAdvisorNo),
+          txEnvelope,
+          socket,
+          svId: ensured?.svId || null
+        });
+      }
 
       // Cache raw export result + pending RO number for finalize
       await redisHelpers.setSessionTransactionData(

server/utils/redisHelpers.js

@@ -68,12 +68,33 @@ const fetchBodyshopFromDB = async (bodyshopId, logger) => {
  * @param logger
  */
 const applyRedisHelpers = ({ pubClient, app, logger }) => {
+  const toRedisJson = (value) => JSON.stringify(value === undefined ? null : value);
+
   // Store session data in Redis
   const setSessionData = async (socketId, key, value, ttl) => {
     try {
-      await pubClient.hset(`socket:${socketId}`, key, JSON.stringify(value)); // Use Redis pubClient
+      const sessionKey = `socket:${socketId}`;
+
+      // Supports both forms:
+      // 1) setSessionData(socketId, "field", value, ttl)
+      // 2) setSessionData(socketId, { fieldA: valueA, fieldB: valueB }, ttl)
+      if (key && typeof key === "object" && !Array.isArray(key)) {
+        const entries = Object.entries(key).flatMap(([field, fieldValue]) => [field, toRedisJson(fieldValue)]);
+
+        if (entries.length > 0) {
+          await pubClient.hset(sessionKey, ...entries);
+        }
+
+        const objectTtl = typeof value === "number" ? value : typeof ttl === "number" ? ttl : null;
+        if (objectTtl) {
+          await pubClient.expire(sessionKey, objectTtl);
+        }
+        return;
+      }
+
+      await pubClient.hset(sessionKey, key, toRedisJson(value)); // Use Redis pubClient
       if (ttl && typeof ttl === "number") {
-        await pubClient.expire(`socket:${socketId}`, ttl);
+        await pubClient.expire(sessionKey, ttl);
       }
     } catch (error) {
       logger.log(`Error Setting Session Data for socket ${socketId}: ${error}`, "ERROR", "redis");
@@ -88,7 +109,26 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
    */
   const getSessionData = async (socketId, key) => {
     try {
-      const data = await pubClient.hget(`socket:${socketId}`, key);
+      const sessionKey = `socket:${socketId}`;
+
+      // Supports:
+      // 1) getSessionData(socketId, "field") -> parsed field value
+      // 2) getSessionData(socketId) -> parsed object of all fields
+      if (typeof key === "undefined") {
+        const raw = await pubClient.hgetall(sessionKey);
+        if (!raw || Object.keys(raw).length === 0) return null;
+
+        return Object.entries(raw).reduce((acc, [field, rawValue]) => {
+          try {
+            acc[field] = JSON.parse(rawValue);
+          } catch {
+            acc[field] = rawValue;
+          }
+          return acc;
+        }, {});
+      }
+
+      const data = await pubClient.hget(sessionKey, key);
       return data ? JSON.parse(data) : null;
     } catch (error) {
       logger.log(`Error Getting Session Data for socket ${socketId}: ${error}`, "ERROR", "redis");
@@ -106,7 +146,7 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
    */
   const setSessionTransactionData = async (socketId, transactionType, key, value, ttl) => {
     try {
-      await pubClient.hset(getSocketTransactionkey({ socketId, transactionType }), key, JSON.stringify(value)); // Use Redis pubClient
+      await pubClient.hset(getSocketTransactionkey({ socketId, transactionType }), key, toRedisJson(value)); // Use Redis pubClient
       if (ttl && typeof ttl === "number") {
         await pubClient.expire(getSocketTransactionkey({ socketId, transactionType }), ttl);
       }
@@ -160,7 +200,17 @@ const applyRedisHelpers = ({ pubClient, app, logger }) => {
    */
   const clearSessionTransactionData = async (socketId, transactionType) => {
     try {
-      await pubClient.del(getSocketTransactionkey({ socketId, transactionType }));
+      if (transactionType) {
+        await pubClient.del(getSocketTransactionkey({ socketId, transactionType }));
+        return;
+      }
+
+      // If no transactionType is provided, clear all transaction namespaces for this socket.
+      const pattern = getSocketTransactionkey({ socketId, transactionType: "*" });
+      const keys = await pubClient.keys(pattern);
+      if (Array.isArray(keys) && keys.length > 0) {
+        await pubClient.del(...keys);
+      }
     } catch (error) {
       logger.log(
         `Error Clearing Session Transaction Data for socket ${socketId}:${transactionType}: ${error}`,

server/web-sockets/redisSocketEvents.js

@@ -4,11 +4,14 @@ const { FortellisJobExport, FortellisSelectedCustomer } = require("../fortellis/
 const CdkCalculateAllocations = require("../cdk/cdk-calculate-allocations").default;
 const registerRREvents = require("../rr/rr-register-socket-events");
 
+const SOCKET_SESSION_TTL_SECONDS = 60 * 60 * 24;
+
 const redisSocketEvents = ({ io, redisHelpers, ioHelpers, logger }) => {
   // Destructure helpers locally, but keep full objects available for downstream modules
   const {
     setSessionData,
     getSessionData,
+    clearSessionData,
     addUserSocketMapping,
     removeUserSocketMapping,
     refreshUserSocketTTL,
@@ -51,12 +54,16 @@ const redisSocketEvents = ({ io, redisHelpers, ioHelpers, logger }) => {
       }
 
       // NEW: seed a base session for this socket so downstream handlers can read it
-      await setSessionData(socket.id, {
-        bodyshopId,
-        email: user.email,
-        uid: user.user_id || user.uid,
-        seededAt: Date.now()
-      });
+      await setSessionData(
+        socket.id,
+        {
+          bodyshopId,
+          email: user.email,
+          uid: user.user_id || user.uid,
+          seededAt: Date.now()
+        },
+        SOCKET_SESSION_TTL_SECONDS
+      );
 
       await addUserSocketMapping(user.email, socket.id, bodyshopId);
       next();
@@ -126,14 +133,18 @@ const redisSocketEvents = ({ io, redisHelpers, ioHelpers, logger }) => {
           }
 
           // NEW: refresh (or create) the base session with the latest info
-          await setSessionData(socket.id, {
-            bodyshopId,
-            email: user.email,
-            uid: user.user_id || user.uid,
-            refreshedAt: Date.now()
-          });
+          await setSessionData(
+            socket.id,
+            {
+              bodyshopId,
+              email: user.email,
+              uid: user.user_id || user.uid,
+              refreshedAt: Date.now()
+            },
+            SOCKET_SESSION_TTL_SECONDS
+          );
 
-          await refreshUserSocketTTL(user.email, bodyshopId);
+          await refreshUserSocketTTL(user.email);
           socket.emit("token-updated", { success: true });
         } catch (error) {
           if (error.code === "auth/id-token-expired") {
@@ -189,6 +200,11 @@ const redisSocketEvents = ({ io, redisHelpers, ioHelpers, logger }) => {
         if (socket.user?.email) {
           await removeUserSocketMapping(socket.user.email, socket.id);
         }
+        try {
+          await clearSessionData(socket.id);
+        } catch {
+          //
+        }
         // Optional: clear transactional session
         try {
           await clearSessionTransactionData(socket.id);