From b3ed9106f03987738858c5c718b592d41eb69523 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 3 Nov 2022 08:25:44 -0700
Subject: [PATCH] Add notification of complete export.

---
 bodyshop_translations.babel                   |  44 +++++++-
 .../dms-allocations-summary-ap.component.jsx  |  32 +++++-
 .../dms-payables/dms-payables.container.jsx   | 106 +++++++++---------
 client/src/translations/en_us/common.json     |   2 +
 client/src/translations/es/common.json        |   2 +
 client/src/translations/fr/common.json        |   2 +
 server/accounting/pbs/pbs-ap-allocations.js   |  15 ++-
 server/graphql-client/queries.js              |   4 +-
 8 files changed, 147 insertions(+), 60 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index d9875fede..fbf938dff 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -16880,6 +16880,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>status</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <folder_node>
                                         <name>sub_status</name>
                                         <children>
@@ -27451,6 +27472,27 @@
                                     <folder_node>
                                         <name>dms</name>
                                         <children>
+                                            <concept_node>
+                                                <name>apexported</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>damageto</name>
                                                 <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx b/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx
index 3dccf03f8..21850b2c8 100644
--- a/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx
+++ b/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx
@@ -25,6 +25,31 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
   const { t } = useTranslation();
   const [allocationsSummary, setAllocationsSummary] = useState([]);
 
+  useEffect(() => {
+    socket.on("ap-export-success", (billid) => {
+      setAllocationsSummary((allocationsSummary) =>
+        allocationsSummary.map((a) => {
+          if (a.billid !== billid) return a;
+          return { ...a, status: "Successful" };
+        })
+      );
+    });
+    socket.on("ap-export-failure", ({ billid, error }) => {
+      allocationsSummary.map((a) => {
+        if (a.billid !== billid) return a;
+        return { ...a, status: error };
+      });
+    });
+
+    if (socket.disconnected) socket.connect();
+    return () => {
+      socket.removeListener("ap-export-success");
+      socket.removeListener("ap-export-failure");
+      //socket.disconnect();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   useEffect(() => {
     if (socket.connected) {
       socket.emit("pbs-calculate-allocations-ap", billids, (ack) => {
@@ -36,6 +61,11 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
   }, [socket, socket.connected, billids]);
   console.log(allocationsSummary);
   const columns = [
+    {
+      title: t("general.labels.status"),
+      dataIndex: "status",
+      key: "status",
+    },
     {
       title: t("jobs.fields.ro_number"),
       dataIndex: ["Posting", "Reference"],
@@ -47,7 +77,7 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
       dataIndex: "Lines",
       key: "Lines",
       render: (text, record) => (
-        <table style={{ tableLayout: "auto" }}>
+        <table style={{ tableLayout: "auto", width: "100%" }}>
           <tr>
             <th>{t("bills.fields.invoice_number")}</th>
             <th>{t("bodyshop.fields.dms.dms_acctnumber")}</th>
diff --git a/client/src/pages/dms-payables/dms-payables.container.jsx b/client/src/pages/dms-payables/dms-payables.container.jsx
index 3e38428e1..de3bd2f17 100644
--- a/client/src/pages/dms-payables/dms-payables.container.jsx
+++ b/client/src/pages/dms-payables/dms-payables.container.jsx
@@ -54,8 +54,8 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
     setSelectedHeader("dms");
     setBreadcrumbs([
       {
-        link: "/manage/accounting/receivables",
-        label: t("titles.bc.accounting-receivables"),
+        link: "/manage/accounting/payables",
+        label: t("titles.bc.accounting-payables"),
       },
       {
         link: "/manage/dms",
@@ -84,11 +84,12 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
         return [...logs, payload];
       });
     });
-    socket.on("export-success", (payload) => {
-      notification.success({
-        message: t("jobs.successes.exported"),
+
+    socket.on("ap-export-complete", (payload) => {
+      notification.open({
+        type: "success",
+        message: t("jobs.labels.dms.apexported"),
       });
-      history.push("/manage/accounting/receivables");
     });
 
     if (socket.disconnected) socket.connect();
@@ -104,54 +105,53 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
   }
 
   return (
-    <div>
-      <Row gutter={[16, 16]}>
-        <Col span={24}>
-          <DmsAllocationsSummaryApComponent
-            socket={socket}
-            billids={state?.billids}
-          />
-        </Col>
+    <Row gutter={[16, 16]}>
+      <Col md={24} lg={12}>
+        <DmsAllocationsSummaryApComponent
+          socket={socket}
+          billids={state?.billids}
+        />
+      </Col>
 
-        <Col span={24}>
-          <div ref={logsRef}>
-            <Card
-              title={t("jobs.labels.dms.logs")}
-              extra={
-                <Space wrap>
-                  <Select
-                    placeholder="Log Level"
-                    value={logLevel}
-                    onChange={(value) => {
-                      setLogLevel(value);
-                      socket.emit("set-log-level", value);
-                    }}
-                  >
-                    <Select.Option key="TRACE">TRACE</Select.Option>
-                    <Select.Option key="DEBUG">DEBUG</Select.Option>
-                    <Select.Option key="INFO">INFO</Select.Option>
-                    <Select.Option key="WARNING">WARNING</Select.Option>
-                    <Select.Option key="ERROR">ERROR</Select.Option>
-                  </Select>
-                  <Button onClick={() => setLogs([])}>Clear Logs</Button>
-                  <Button
-                    onClick={() => {
-                      setLogs([]);
-                      socket.disconnect();
-                      socket.connect();
-                    }}
-                  >
-                    Reconnect
-                  </Button>
-                </Space>
-              }
-            >
-              <DmsLogEvents socket={socket} logs={logs} />
-            </Card>
-          </div>
-        </Col>
-      </Row>
-    </div>
+      <Col md={24} lg={12}>
+        <div ref={logsRef}>
+          <Card
+            title={t("jobs.labels.dms.logs")}
+            extra={
+              <Space wrap>
+                <Select
+                  placeholder="Log Level"
+                  value={logLevel}
+                  onChange={(value) => {
+                    setLogLevel(value);
+                    socket.emit("set-log-level", value);
+                  }}
+                >
+                  <Select.Option key="TRACE">TRACE</Select.Option>
+                  <Select.Option key="DEBUG">DEBUG</Select.Option>
+                  <Select.Option key="INFO">INFO</Select.Option>
+                  <Select.Option key="WARNING">WARNING</Select.Option>
+                  <Select.Option key="ERROR">ERROR</Select.Option>
+                </Select>
+                <Button onClick={() => setLogs([])}>Clear Logs</Button>
+                <Button
+                  onClick={() => {
+                    setLogs([]);
+
+                    socket.disconnect();
+                    socket.connect();
+                  }}
+                >
+                  Reconnect
+                </Button>
+              </Space>
+            }
+          >
+            <DmsLogEvents socket={socket} logs={logs} />
+          </Card>
+        </div>
+      </Col>
+    </Row>
   );
 }
 
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 473f2a232..b53efe123 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1039,6 +1039,7 @@
 				"sendby": "Send By",
 				"signin": "Sign In",
 				"sms": "SMS",
+				"status": "Status",
 				"sub_status": {
 					"expired": "The subscription for this shop has expired.  Please contact technical support to reactivate the subscription. "
 				},
@@ -1619,6 +1620,7 @@
 				"difference": "Difference",
 				"diskscan": "Scan Disk for Estimates",
 				"dms": {
+					"apexported": "AP export completed.  See logs for details.",
 					"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}}",
 					"invoicedatefuture": "Invoice date must be today or in the future for CDK posting.",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 7df3d4062..276f32dec 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1039,6 +1039,7 @@
 				"sendby": "",
 				"signin": "",
 				"sms": "",
+				"status": "",
 				"sub_status": {
 					"expired": ""
 				},
@@ -1619,6 +1620,7 @@
 				"difference": "",
 				"diskscan": "",
 				"dms": {
+					"apexported": "",
 					"damageto": "",
 					"defaultstory": "",
 					"invoicedatefuture": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index a17359079..93814b80e 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1039,6 +1039,7 @@
 				"sendby": "",
 				"signin": "",
 				"sms": "",
+				"status": "",
 				"sub_status": {
 					"expired": ""
 				},
@@ -1619,6 +1620,7 @@
 				"difference": "",
 				"diskscan": "",
 				"dms": {
+					"apexported": "",
 					"damageto": "",
 					"defaultstory": "",
 					"invoicedatefuture": "",
diff --git a/server/accounting/pbs/pbs-ap-allocations.js b/server/accounting/pbs/pbs-ap-allocations.js
index b4c6bf514..985a7d94e 100644
--- a/server/accounting/pbs/pbs-ap-allocations.js
+++ b/server/accounting/pbs/pbs-ap-allocations.js
@@ -66,7 +66,13 @@ async function PbsCalculateAllocationsAp(socket, billids) {
     //Each bill will enter it's own top level transaction.
 
     const transactionlist = [];
-
+    if (bills.length === 0) {
+      CdkBase.createLogEvent(
+        socket,
+        "ERROR",
+        `No bills found for export. Ensure they have not already been exported and try again.`
+      );
+    }
     bills.forEach((bill) => {
       //Keep the allocations at the bill level.
 
@@ -240,10 +246,15 @@ exports.PbsExportAp = async function (socket, { billids, txEnvelope }) {
       CdkBase.createLogEvent(socket, "DEBUG", `Marking bill as exported.`);
       await MarkApExported(socket, [billid]);
 
-      // socket.emit("export-success", billids);
+      socket.emit("ap-export-success", billid);
     } else {
       CdkBase.createLogEvent(socket, "ERROR", `Export was not succesful.`);
+      socket.emit("ap-export-failure", {
+        billid,
+        error: AccountPostingChange.Message,
+      });
     }
+    socket.emit("ap-export-complete");
   }
 };
 
diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js
index 0320aa3d5..40a338eda 100644
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -1659,7 +1659,7 @@ query GET_PBS_AP_ALLOCATIONS($billids: [uuid!]) {
     pbs_serialnumber
     id
   }
-  bills(where: {id: {_in: $billids}}) {
+  bills(where: {id: {_in: $billids}, exported:{_eq: false}}) {
     id
     date
     isinhouse
@@ -1692,6 +1692,4 @@ query GET_PBS_AP_ALLOCATIONS($billids: [uuid!]) {
     }
   }
 }
-
-
 `;