feature/IO-3357-Reynolds-and-Reynolds-DMS-API-Integration - Cashiering Checkpoint
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user