admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature/IO-3357-Reynolds-and-Reynolds-DMS-API-Integration - Cashiering Checkpoint

Browse Source
This commit is contained in:
Dave
2025-11-12 16:13:23 -05:00
parent e3b4620d0c
commit 556cd993b9
6 changed files with 510 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
client/src/components/dms-customer-selector/dms-customer-selector.component.jsx
View File

@@ -1,5 +1,5 @@
import { useSplitTreatments } from "@splitsoftware/splitio-react";
import { Alert, Button, Checkbox, Col, message, Table } from "antd";
import { Alert, Button, Checkbox, Col, message, Space, Table } from "antd";
import { useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
@@ -58,7 +58,14 @@ function rrAddressToString(addr) {
return parts.join(", ");
}
export function DmsCustomerSelector({ bodyshop, jobid, rrOpenRoLimit = false, onRrOpenRoFinished }) {
export function DmsCustomerSelector({
bodyshop,
jobid,
rrOpenRoLimit = false,
onRrOpenRoFinished,
rrCashierPending = false,
onRrCashierFinished
}) {
const { t } = useTranslation();
const [customerList, setcustomerList] = useState([]);
const [open, setOpen] = useState(false);
@@ -87,6 +94,14 @@ export function DmsCustomerSelector({ bodyshop, jobid, rrOpenRoLimit = false, on
}, [customerList]);
const rrHasVinOwner = rrOwnerSet.size > 0;
// If cashiering is pending, surface this banner by opening selector
useEffect(() => {
if (dms === "rr" && rrCashierPending) {
setOpen(true);
setDmsType("rr");
}
}, [dms, rrCashierPending]);
useEffect(() => {
if (dms === "rr") {
const handleRrSelectCustomer = (list) => {
@@ -160,10 +175,11 @@ export function DmsCustomerSelector({ bodyshop, jobid, rrOpenRoLimit = false, on
}
if (dmsType === "rr") {
wsssocket.emit("rr-selected-customer", { jobId: jobid, custNo: String(selectedCustomer) }, (ack) => {
// Keep the selector open; server will raise rr-cashiering-required
wsssocket.emit("rr-selected-customer", { jobId: jobid, create: true }, (ack) => {
if (ack?.ok) {
setOpen(false);
setSelectedCustomer(null);
message.success(t("dms.messages.customerCreated"));
// Keep dialog open; cashiering banner will appear via `rr-cashiering-required`
} else if (ack?.error) {
message.error(ack.error);
}
@@ -200,10 +216,10 @@ export function DmsCustomerSelector({ bodyshop, jobid, rrOpenRoLimit = false, on
if (dmsType === "rr" && rrHasVinOwner) return;
if (dmsType === "rr") {
// Keep open; server will raise rr-cashiering-required
wsssocket.emit("rr-selected-customer", { jobId: jobid, create: true }, (ack) => {
if (ack?.ok) {
if (ack.custNo) setSelectedCustomer(String(ack.custNo));
setOpen(false);
message.success(t("dms.messages.customerCreated"));
} else if (ack?.error) {
message.error(ack.error);
@@ -388,6 +404,31 @@ export function DmsCustomerSelector({ bodyshop, jobid, rrOpenRoLimit = false, on
/>
)}
{/* NEW: Cashiering required banner */}
{dmsType === "rr" && rrCashierPending && (
<Alert
type="info"
showIcon
message="Complete cashiering in Reynolds"
description={
<div style={{ display: "flex", flexDirection: "column", gap: 8 }}>
<div>
We created the Repair Order in Reynolds. Please complete the cashiering/closeout steps in
Reynolds. When done, click <strong>Finished/Close</strong> to finalize and mark this export as
complete.
</div>
<div>
<Space>
<Button type="primary" onClick={onRrCashierFinished}>
Finished / Close
</Button>
</Space>
</div>
</div>
}
/>
)}
<div style={{ display: "flex", gap: 8, flexWrap: "wrap" }}>
<Button onClick={onUseSelected} disabled={!selectedCustomer || (dmsType === "rr" && rrOpenRoLimit)}>
{t("jobs.actions.dms.useselected")}
@@ -405,7 +446,7 @@ export function DmsCustomerSelector({ bodyshop, jobid, rrOpenRoLimit = false, on
</Button>
</div>
{/* NEW: VIN ownership enforced with Refresh */}
{/* VIN ownership enforced with Refresh */}
{dmsType === "rr" && rrHasVinOwner && (
<Alert
type="warning"

74
client/src/pages/dms/dms.container.jsx
View File

@@ -83,6 +83,9 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
const [rrOpenRoLimit, setRrOpenRoLimit] = useState(false);
const clearRrOpenRoLimit = () => setRrOpenRoLimit(false);
// NEW: RR “cashiering required” UX hold
const [rrCashierPending, setRrCashierPending] = useState(false);
const handleExportFailed = (payload = {}) => {
const { title, friendlyMessage, error, severity, errorCode, vendorStatusCode } = payload;
@@ -148,7 +151,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
}, [t, setBreadcrumbs, setSelectedHeader]);
useEffect(() => {
// ✅ RR uses the new wss socket and takes precedence over Fortellis flag
// ✅ RR path uses WSS and has two-step flow
if (dms === "rr") {
// set log level on connect and immediately
wsssocket.emit("set-log-level", logLevel);
@@ -165,9 +168,11 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
const handleLogEvent = (payload) => setLogs((prev) => [...prev, payload]);
// FINAL step only (emitted by server after rr-finalize-repair-order)
const handleExportSuccess = (payload) => {
const jobId = payload?.jobId ?? payload; // RR sends object; legacy sends raw id
notification.success({ message: t("jobs.successes.exported") });
setRrCashierPending(false);
insertAuditTrail({
jobid: jobId,
operation: AuditTrailMapping.jobexported(),
@@ -175,7 +180,43 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
});
history("/manage/accounting/receivables");
};
const handleRrExportResult = (payload) => handleExportSuccess(payload);
// STEP 1 result (RO created) – DO NOT navigate; wait for cashiering
const handleRrExportResult = () => {
// Be defensive: if the server didn't already set the banner yet, make it obvious
setRrCashierPending(true);
setLogs((prev) => [
...prev,
{
timestamp: new Date(),
level: "INFO",
message:
"Repair Order created in Reynolds. Complete cashiering in Reynolds, then click Finished/Close to finalize."
}
]);
notification.info({
message: "Reynolds RO created",
description:
"Complete cashiering in Reynolds, then click Finished/Close to finalize and mark this export complete.",
duration: 8
});
// No routing here — we remain on the page for step 2
};
// NEW: cashier step required (after create, before finalize)
const handleCashieringRequired = (payload) => {
setRrCashierPending(true);
setLogs((prev) => [
...prev,
{
timestamp: new Date(),
level: "INFO",
message:
"Repair Order created in Reynolds. Complete cashiering in Reynolds, then click Finished/Close to finalize.",
meta: { payload }
}
]);
};
wsssocket.on("connect", handleConnect);
wsssocket.on("reconnect", handleReconnect);
@@ -188,6 +229,9 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
wsssocket.on("export-success", handleExportSuccess);
wsssocket.on("export-failed", handleExportFailed);
// NEW
wsssocket.on("rr-cashiering-required", handleCashieringRequired);
return () => {
wsssocket.off("connect", handleConnect);
wsssocket.off("reconnect", handleReconnect);
@@ -198,6 +242,8 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
wsssocket.off("export-success", handleExportSuccess);
wsssocket.off("export-failed", handleExportFailed);
wsssocket.off("rr-cashiering-required", handleCashieringRequired);
};
}
@@ -260,6 +306,20 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
}
}, [dms, Fortellis?.treatment, logLevel, history, insertAuditTrail, notification, t, wsssocket]);
// NEW: finalize button callback—emit finalize event
const handleRrCashierFinished = () => {
if (!jobId) return;
wsssocket.emit("rr-finalize-repair-order", { jobId }, (ack) => {
if (ack?.ok) {
// success path handled by export-success listener
return;
}
if (ack?.error) {
notification.error({ message: ack.error });
}
});
};
if (loading) return <LoadingSpinner />;
if (error) return <AlertComponent message={error.message} type="error" />;
@@ -299,7 +359,15 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
<DmsPostForm socket={activeSocket} job={data?.jobs_by_pk} logsRef={logsRef} />
</Col>
<DmsCustomerSelector jobid={jobId} rrOpenRoLimit={rrOpenRoLimit} onRrOpenRoFinished={clearRrOpenRoLimit} />
{/* NEW props for two-step RR flow banners */}
<DmsCustomerSelector
jobid={jobId}
rrOpenRoLimit={rrOpenRoLimit}
onRrOpenRoFinished={clearRrOpenRoLimit}
rrCashierPending={rrCashierPending}
onRrCashierFinished={handleRrCashierFinished}
bodyshop={bodyshop}
/>
<Col span={24}>
<div ref={logsRef}>
<Card