IO-2856 Mark Exported Button

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
Merged in release/2024-08-09-no-zoho (pull request #1596 )
2024-08-14 11:38:35 -07:00 · 2024-08-13 21:10:30 +00:00 · 2024-08-13 17:06:40 -04:00 · 2024-08-13 19:29:26 +00:00 · 2024-08-13 12:32:14 -07:00 · 2024-08-13 12:30:42 -07:00
16 changed files with 346 additions and 200 deletions
--- a/_reference/productionBoardNotes.md
+++ b/_reference/productionBoardNotes.md
@@ -31,3 +31,11 @@

 These allow users to turn fields on or off, turning them all off will show the card in the most minimal form

+
+### Statistics
+
+- The statistics section allows users to see accumulations of both jobs on the board, and jobs in production.
+- you can click a statistic to turn it on and off, and drag and drop the statistics to rearrange them
+
+### Filters
+- Allows you to set, and persist filters for estimators and insurance companies
--- a/client/index.html
+++ b/client/index.html
@@ -1,174 +1,174 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <% if (env.VITE_APP_INSTANCE === 'IMEX') { %>
-    <link rel="icon" href="/favicon.png" />
-    <% } %> <% if (env.VITE_APP_INSTANCE === 'ROME') { %>
-    <link rel="icon" href="/ro-favicon.png" />
-    <% } %> <% if (env.VITE_APP_INSTANCE === 'PROMANAGER') { %>
-    <link rel="icon" href="/pm/pm-favicon.ico" />
-    <% } %>
+<head>
+  <meta charset="utf-8" />
+  <% if (env.VITE_APP_INSTANCE === 'IMEX') { %>
+  <link rel="icon" href="/favicon.png" />
+  <% } %> <% if (env.VITE_APP_INSTANCE === 'ROME') { %>
+  <link rel="icon" href="/ro-favicon.png" />
+  <% } %> <% if (env.VITE_APP_INSTANCE === 'PROMANAGER') { %>
+  <link rel="icon" href="/pm/pm-favicon.ico" />
+  <% } %>

-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#1690ff" />
-    <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
-    <!-- TODO:AIo Update the individual logos for each.-->
-    <link rel="apple-touch-icon" href="public/logo192.png" />
-    <link rel="mask-icon" href="/mask-icon.svg" color="#FFFFFF">
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta name="theme-color" content="#1690ff" />
+  <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
+  <!-- TODO:AIo Update the individual logos for each.-->
+  <link rel="apple-touch-icon" href="public/logo192.png" />
+  <link rel="mask-icon" href="/mask-icon.svg" color="#FFFFFF">
+  <!--
+    manifest.json provides metadata used when your web app is installed on a
+    user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+  -->
+  <!--
+    Notice the use of %PUBLIC_URL% in the tags above.
+    It will be replaced with the URL of the `public` folder during the build.
+    Only files inside the `public` folder can be referenced from the HTML.

-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <% if (env.VITE_APP_INSTANCE === 'IMEX') { %>
-    <meta name="description" content="ImEX Online" />
-    <title>ImEX Online</title>
-    <script type="text/javascript">
-      window.$crisp = [];
-      window.CRISP_WEBSITE_ID = '36724f62-2eb0-4b29-9cdd-9905fb99913e';
-      (function () {
-        d = document;
-        s = d.createElement('script');
-        s.src = 'https://client.crisp.chat/l.js';
-        s.async = 1;
-        d.getElementsByTagName('head')[0].appendChild(s);
-      })();
-    </script>
-    <% } %> <% if (env.VITE_APP_INSTANCE === 'ROME') { %>
-    <meta name="description" content="Rome Online" />
-    <title>Rome Online</title>
+    Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+    work correctly both with client-side routing and a non-root public URL.
+    Learn how to configure a non-root public URL by running `npm run build`.
+  -->
+  <% if (env.VITE_APP_INSTANCE === 'IMEX') { %>
+  <meta name="description" content="ImEX Online" />
+  <title>ImEX Online</title>
+  <script type="text/javascript">
+    window.$crisp = [];
+    window.CRISP_WEBSITE_ID = '36724f62-2eb0-4b29-9cdd-9905fb99913e';
+    (function () {
+      d = document;
+      s = d.createElement('script');
+      s.src = 'https://client.crisp.chat/l.js';
+      s.async = 1;
+      d.getElementsByTagName('head')[0].appendChild(s);
+    })();
+  </script>
+  <% } %> <% if (env.VITE_APP_INSTANCE === 'ROME') { %>
+  <meta name="description" content="Rome Online" />
+  <title>Rome Online</title>

-    <!--Use the below code snippet to provide real time updates to the live chat plugin without the need of copying and paste each time to your website when changes are made via PBX-->
+  <!--Use the below code snippet to provide real time updates to the live chat plugin without the need of copying and paste each time to your website when changes are made via PBX-->

-    <call-us-selector phonesystem-url=https://rometech.east.3cx.us:5001 party="LiveChat528346"></call-us-selector>
+  <call-us-selector phonesystem-url=https://rometech.east.3cx.us:5001 party="LiveChat528346"></call-us-selector>

-    <!--Incase you don't want real time updates to the live chat plugin when options are changed, use the below code snippet. Please note that each time you change the settings you will need to copy and paste the snippet code to your website-->
-    
-    <!--<call-us
-    
-    phonesystem-url=https://rometech.east.3cx.us:5001
-    
-    style="position:fixed;font-size:16px;line-height:17px;z-index: 99999;right: 20px; bottom: 20px;"
-    
-    id="wp-live-chat-by-3CX"
-    
-    minimized="true"
-    
-    animation-style="noanimation"
-    
-    party="LiveChat528346"
-    
-    minimized-style="bubbleright"
-    
-    allow-call="true"
-    
-    allow-video="false"
-    
-    allow-soundnotifications="true"
-    
-    enable-mute="true"
-    
-    enable-onmobile="true"
-    
-    offline-enabled="true"
-    
-    enable="true"
-    
-    ignore-queueownership="false"
-    
-    authentication="both"
-    
-    show-operator-actual-name="true"
-    
-    aknowledge-received="true"
-    
-    gdpr-enabled="false"
-    
-    message-userinfo-format="name"
-    
-    message-dateformat="both"
-    
-    lang="browser"
-    
-    button-icon-type="default"
-    
-    greeting-visibility="none"
-    
-    greeting-offline-visibility="none"
-    
-    chat-delay="2000"
-    
-    enable-direct-call="true"
-    
-    enable-ga="false"
-    
-    ></call-us>-->
-    
-    <script defer src=https://downloads-global.3cx.com/downloads/livechatandtalk/v1/callus.js id="tcx-callus-js" charset="utf-8"></script>
+  <!--Incase you don't want real time updates to the live chat plugin when options are changed, use the below code snippet. Please note that each time you change the settings you will need to copy and paste the snippet code to your website-->
+
+  <!--<call-us
+  
+  phonesystem-url=https://rometech.east.3cx.us:5001
+  
+  style="position:fixed;font-size:16px;line-height:17px;z-index: 99999;right: 20px; bottom: 20px;"
+  
+  id="wp-live-chat-by-3CX"
+  
+  minimized="true"
+  
+  animation-style="noanimation"
+  
+  party="LiveChat528346"
+  
+  minimized-style="bubbleright"
+  
+  allow-call="true"
+  
+  allow-video="false"
+  
+  allow-soundnotifications="true"
+  
+  enable-mute="true"
+  
+  enable-onmobile="true"
+  
+  offline-enabled="true"
+  
+  enable="true"
+  
+  ignore-queueownership="false"
+  
+  authentication="both"
+  
+  show-operator-actual-name="true"
+  
+  aknowledge-received="true"
+  
+  gdpr-enabled="false"
+  
+  message-userinfo-format="name"
+  
+  message-dateformat="both"
+  
+  lang="browser"
+  
+  button-icon-type="default"
+  
+  greeting-visibility="none"
+  
+  greeting-offline-visibility="none"
+  
+  chat-delay="2000"
+  
+  enable-direct-call="true"
+  
+  enable-ga="false"
+  
+  ></call-us>-->
+
+  <script defer src=https://downloads-global.3cx.com/downloads/livechatandtalk/v1/callus.js id="tcx-callus-js" charset="utf-8"></script>



-    <% } %> <% if (env.VITE_APP_INSTANCE === 'PROMANAGER') { %>
-    <title>ProManager</title>
-    <meta name="description" content="ProManager" />
+  <% } %> <% if (env.VITE_APP_INSTANCE === 'PROMANAGER') { %>
+  <title>ProManager</title>
+  <meta name="description" content="ProManager" />

-    <% } %>
-    <script>
-      !(function () {
-        'use strict';
-        var e = [
-          'debug',
-          'destroy',
-          'do',
-          'help',
-          'identify',
-          'is',
-          'off',
-          'on',
-          'ready',
-          'render',
-          'reset',
-          'safe',
-          'set',
-        ];
-        if (window.noticeable) console.warn('Noticeable SDK code snippet loaded more than once');
-        else {
-          var n = (window.noticeable = window.noticeable || []);
-          function t(e) {
-            return function () {
-              var t = Array.prototype.slice.call(arguments);
-              return t.unshift(e), n.push(t), n;
-            };
-          }
-          !(function () {
-            for (var o = 0; o < e.length; o++) {
-              var r = e[o];
-              n[r] = t(r);
-            }
-          })(),
-            (function () {
-              var e = document.createElement('script');
-              (e.async = !0), (e.src = 'https://sdk.noticeable.io/l.js');
-              var n = document.head;
-              n.insertBefore(e, n.firstChild);
-            })();
+  <% } %>
+  <script>
+    !(function () {
+      'use strict';
+      var e = [
+        'debug',
+        'destroy',
+        'do',
+        'help',
+        'identify',
+        'is',
+        'off',
+        'on',
+        'ready',
+        'render',
+        'reset',
+        'safe',
+        'set',
+      ];
+      if (window.noticeable) console.warn('Noticeable SDK code snippet loaded more than once');
+      else {
+        var n = (window.noticeable = window.noticeable || []);
+        function t(e) {
+          return function () {
+            var t = Array.prototype.slice.call(arguments);
+            return t.unshift(e), n.push(t), n;
+          };
        }
-      })();
-    </script>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
+        !(function () {
+          for (var o = 0; o < e.length; o++) {
+            var r = e[o];
+            n[r] = t(r);
+          }
+        })(),
+          (function () {
+            var e = document.createElement('script');
+            (e.async = !0), (e.src = 'https://sdk.noticeable.io/l.js');
+            var n = document.head;
+            n.insertBefore(e, n.firstChild);
+          })();
+      }
+    })();
+  </script>
+</head>
+<body>
+<noscript>You need to enable JavaScript to run this app.</noscript>
+<div id="root"></div>

-    <script type="module" src="src/index.jsx"></script>
-  </body>
+<script type="module" src="src/index.jsx"></script>
+</body>
 </html>
--- a/client/src/App/App.styles.scss
+++ b/client/src/App/App.styles.scss
@@ -161,3 +161,15 @@
 .rowWithColor > td {
  background-color: var(--bgColor) !important;
 }
+
+.muted-button {
+  color: lightgray;
+  border: none;
+  background: none;
+  cursor: pointer;
+  font-size: 16px; /* Adjust as needed */
+}
+
+.muted-button:hover {
+  color: darkgrey;
+}
--- a/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
+++ b/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
@@ -13,6 +13,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateFormatter } from "../../utils/DateFormatter";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
+import JobMarkSelectedExported from "../jobs-mark-selected-exported/jobs-mark-selected-exported";
 import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";

@@ -170,13 +171,22 @@ export function AccountingReceivablesTableComponent({ bodyshop, loading, jobs, r
      extra={
        <Space wrap>
          {!bodyshop.cdk_dealerid && !bodyshop.pbs_serialnumber && (
-            <JobsExportAllButton
-              jobIds={selectedJobs}
-              disabled={transInProgress || selectedJobs.length === 0}
-              loadingCallback={setTransInProgress}
-              completedCallback={setSelectedJobs}
-              refetch={refetch}
-            />
+            <>
+              <JobMarkSelectedExported
+                jobIds={selectedJobs}
+                disabled={transInProgress || selectedJobs.length === 0}
+                loadingCallback={setTransInProgress}
+                completedCallback={setSelectedJobs}
+                refetch={refetch}
+              />
+              <JobsExportAllButton
+                jobIds={selectedJobs}
+                disabled={transInProgress || selectedJobs.length === 0}
+                loadingCallback={setTransInProgress}
+                completedCallback={setSelectedJobs}
+                refetch={refetch}
+              />
+            </>
          )}
          {bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && <QboAuthorizeComponent />}
          <Input.Search
--- a/client/src/components/jobs-mark-selected-exported/jobs-mark-selected-exported.jsx
+++ b/client/src/components/jobs-mark-selected-exported/jobs-mark-selected-exported.jsx
@@ -0,0 +1,105 @@
+import { useMutation } from "@apollo/client";
+import { Button, notification, Popconfirm } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
+import { UPDATE_JOBS } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(JobMarkSelectedExported);
+
+export function JobMarkSelectedExported({
+  bodyshop,
+  currentUser,
+  jobIds,
+  disabled,
+  loadingCallback,
+  completedCallback,
+  refetch,
+  insertAuditTrail
+}) {
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+  const [open, setOpen] = useState(false);
+  const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
+
+  const [updateJob] = useMutation(UPDATE_JOBS);
+  const handleUpdate = async () => {
+    setLoading(true);
+    loadingCallback(true);
+    const result = await updateJob({
+      variables: {
+        jobIds: jobIds,
+        fields: {
+          status: bodyshop.md_ro_statuses.default_exported || "Exported*",
+          date_exported: new Date()
+        }
+      },
+      update(cache) {}
+    });
+
+    await insertExportLog({
+      variables: {
+        logs: jobIds.map((id) => {
+          return {
+            bodyshopid: bodyshop.id,
+            jobid: id,
+            successful: true,
+            message: JSON.stringify([t("general.labels.markedexported")]),
+            useremail: currentUser.email
+          };
+        })
+      }
+    });
+
+    if (!result.errors) {
+      notification["success"]({ message: t("jobs.successes.save") });
+      result.data.update_jobs.returning.forEach((job) => {
+        console.log("results job", job.id, "audit: ", AuditTrailMapping.admin_jobmarkexported());
+        insertAuditTrail({
+          jobid: job.id,
+          operation: AuditTrailMapping.admin_jobmarkexported(),
+          type: "admin_jobmarkexported"
+        });
+      });
+    } else {
+      notification["error"]({
+        message: t("jobs.errors.saving", {
+          error: JSON.stringify(result.errors)
+        })
+      });
+    }
+    loadingCallback(false);
+    completedCallback && completedCallback([]);
+    setLoading(false);
+    refetch && refetch();
+    setOpen(false);
+  };
+
+  return (
+    <Popconfirm
+      open={open}
+      title={t("general.labels.areyousure")}
+      onCancel={() => setOpen(false)}
+      onConfirm={handleUpdate}
+      disabled={disabled}
+    >
+      <Button loading={loading} disabled={disabled} onClick={() => setOpen(true)} type="primary" danger>
+        {t("jobs.actions.markasexported")}
+      </Button>
+    </Popconfirm>
+  );
+}
--- a/client/src/components/payable-mark-selected-exported/payable-mark-selected-exported.component.jsx
+++ b/client/src/components/payable-mark-selected-exported/payable-mark-selected-exported.component.jsx
@@ -90,7 +90,7 @@ export function BillMarkSelectedExported({
      onConfirm={handleUpdate}
      disabled={disabled}
    >
-      <Button loading={loading} disabled={disabled} onClick={() => setOpen(true)}>
+      <Button loading={loading} disabled={disabled} onClick={() => setOpen(true)} type="primary" danger>
        {t("bills.labels.markexported")}
      </Button>
    </Popconfirm>
--- a/client/src/components/payment-mark-selected-exported/payment-mark-selected-exported.component.jsx
+++ b/client/src/components/payment-mark-selected-exported/payment-mark-selected-exported.component.jsx
@@ -90,7 +90,7 @@ export function PaymentMarkSelectedExported({
      onConfirm={handleUpdate}
      disabled={disabled}
    >
-      <Button loading={loading} disabled={disabled} onClick={() => setOpen(true)}>
+      <Button loading={loading} disabled={disabled} onClick={() => setOpen(true)} type="primary" danger>
        {t("bills.labels.markexported")}
      </Button>
    </Popconfirm>
--- a/client/src/components/production-board-kanban/production-board-kanban-card.component.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban-card.component.jsx
@@ -360,14 +360,7 @@ export default function ProductionBoardCard({ technician, card, bodyshop, cardSe
  const headerContent = (
    <div className="header-content-container">
      <div className="inner-container">
-        <ProductionAlert
-          record={{
-            id: card.id,
-            production_vars: card?.metadata.production_vars,
-            refetch: card?.refetch
-          }}
-          key="alert"
-        />
+        <ProductionAlert id={card.id} productionVars={metadata?.production_vars} refetch={card?.refetch} key="alert" />
        {metadata?.suspended && <PauseCircleOutlined className="circle-outline" key="suspended" />}
        {metadata?.iouparent && (
          <EllipsesToolTip
--- a/client/src/components/production-list-columns/production-list-columns.alert.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.alert.component.jsx
@@ -1,6 +1,6 @@
-import { ExclamationCircleFilled } from "@ant-design/icons";
+import { ExclamationCircleFilled, PlusCircleFilled } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
-import { Button } from "antd";
+import { Button, Popconfirm } from "antd";
 import React, { useCallback } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -8,6 +8,7 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import { useTranslation } from "react-i18next";

 const mapStateToProps = createStructuredSelector({});

@@ -22,22 +23,24 @@ const mapDispatchToProps = (dispatch) => ({
    )
 });

-const ProductionListColumnAlert = ({ record, insertAuditTrail }) => {
+const ProductionListColumnAlert = ({ id, productionVars, refetch, insertAuditTrail }) => {
  const [updateAlert] = useMutation(UPDATE_JOB);
+  const { t } = useTranslation();

  const handleAlertToggle = useCallback(() => {
    logImEXEvent("production_toggle_alert");

-    const newAlertState = !!record.production_vars?.alert ? !record.production_vars.alert : true;
+    const newAlertState = !!productionVars?.alert ? !productionVars?.alert : true;
+    const finalProductionVars = {
+      ...productionVars,
+      alert: newAlertState
+    };

    updateAlert({
      variables: {
-        jobId: record.id,
+        jobId: id,
        job: {
-          production_vars: {
-            ...record.production_vars,
-            alert: newAlertState
-          }
+          production_vars: finalProductionVars
        }
      }
    }).catch((err) => {
@@ -45,17 +48,26 @@ const ProductionListColumnAlert = ({ record, insertAuditTrail }) => {
    });

    insertAuditTrail({
-      jobid: record.id,
+      jobid: id,
      operation: AuditTrailMapping.alertToggle(newAlertState),
      type: "alertToggle"
    });

-    if (record.refetch) record.refetch();
-  }, [updateAlert, insertAuditTrail, record]);
+    if (refetch) refetch();
+  }, [updateAlert, insertAuditTrail, id, productionVars, refetch]);

-  if (!record.production_vars?.alert) return null;
-
-  return <Button className="production-alert" icon={<ExclamationCircleFilled />} onClick={handleAlertToggle} />;
+  return productionVars?.alert ? (
+    <Popconfirm
+      title={t("general.actions.remove_alert")}
+      onConfirm={handleAlertToggle}
+      okText={t("general.labels.yes")}
+      cancelText={t("general.labels.no")}
+    >
+      <Button className="production-alert" icon={<ExclamationCircleFilled />} />
+    </Popconfirm>
+  ) : (
+    <Button className="muted-button" icon={<PlusCircleFilled />} onClick={handleAlertToggle} />
+  );
 };

 export default connect(mapStateToProps, mapDispatchToProps)(ProductionListColumnAlert);
--- a/client/src/components/production-list-columns/production-list-columns.data.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.data.jsx
@@ -23,7 +23,7 @@ import ProductionListColumnPartsReceived from "./production-list-columns.partsre
 import ProductionListColumnNote from "./production-list-columns.productionnote.component";
 import ProductionListColumnCategory from "./production-list-columns.status.category";
 import ProductionListColumnStatus from "./production-list-columns.status.component";
-import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component";
+import ProductionListColumnTouchTime from "./prodution-list-columns.touchtime.component";
 import { store } from "../../redux/store";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
@@ -349,7 +349,9 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
      key: "alert",
      sorter: (a, b) => Number(a.production_vars?.alert || false) - Number(b.production_vars?.alert || false),
      sortOrder: state.sortedInfo.columnKey === "alert" && state.sortedInfo.order,
-      render: (text, record) => <ProductionListColumnAlert record={{ record }} />
+      render: (text, record) => (
+        <ProductionListColumnAlert id={record.id} productionVars={record?.production_vars} refetch={refetch} />
+      )
    },
    {
      title: i18n.t("production.labels.note"),
@@ -370,7 +372,7 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
      dataIndex: "tt",
      key: "tt",
      render: (text, record) => {
-        return <ProductionlistColumnTouchTime job={record} />;
+        return <ProductionListColumnTouchTime job={record} />;
      }
    },
    {
--- a/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx
@@ -148,6 +148,7 @@ export function ProductionListEmpAssignment({ insertAuditTrail, bodyshop, record
        ) : (
          <PlusCircleFilled
            style={iconStyle}
+            className="muted-button"
            onClick={() => {
              setAssignment({ operation: type });
              setVisibility(true);
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1160,7 +1160,8 @@
        "submit": "Submit",
        "tryagain": "Try Again",
        "view": "View",
-        "viewreleasenotes": "See What's Changed"
+        "viewreleasenotes": "See What's Changed",
+        "remove_alert": "Are you sure you want to dismiss the alert?"
      },
      "errors": {
        "fcm": "You must allow notification permissions to have real time messaging.  Click to try again.",
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1160,7 +1160,8 @@
        "submit": "",
        "tryagain": "",
        "view": "",
-        "viewreleasenotes": ""
+        "viewreleasenotes": "",
+        "remove_alert": ""
      },
      "errors": {
        "fcm": "",
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1160,7 +1160,8 @@
        "submit": "",
        "tryagain": "",
        "view": "",
-        "viewreleasenotes": ""
+        "viewreleasenotes": "",
+        "remove_alert": ""
      },
      "errors": {
        "fcm": "",
--- a/server/accounting/qbo/qbo-payables.js
+++ b/server/accounting/qbo/qbo-payables.js
@@ -273,7 +273,7 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
    return result && result.json && result.json.Bill;
  } catch (error) {
    logger.log("qbo-payables-error", "DEBUG", req.user.email, bill.id, {
-      error: (error && error.authResponse && error.authResponse.body) || (error && error.message),
+      error: error, //(error && error.authResponse && error.authResponse.body) || (error && error.message),
      method: "InsertBill"
    });
    throw error;
--- a/server/data/kaizen.js
+++ b/server/data/kaizen.js
@@ -33,7 +33,7 @@ const ftpSetup = {
 exports.default = async (req, res) => {
  //Query for the List of Bodyshop Clients.
  logger.log("kaizen-start", "DEBUG", "api", null, null);
-  const kaizenShopsIDs = ["SUMMIT", "STRATHMORE", "SUNRIDGE"];
+  const kaizenShopsIDs = ["SUMMIT", "STRATHMORE", "SUNRIDGE", "SHAW"];

  const { bodyshops } = await client.request(queries.GET_KAIZEN_SHOPS, {
    imexshopid: kaizenShopsIDs
Author	SHA1	Message	Date
Allan Carr	df93357cec	IO-2856 Mark Exported Button Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-14 11:38:35 -07:00
Dave Richer	97282740f5	Merged in release/2024-08-09-no-zoho (pull request #1596 ) Release/2024 08 09 no zoho	2024-08-13 21:10:30 +00:00
Patrick Fic	150ae02978	- revert change to zoho Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-13 17:06:40 -04:00
Allan Carr	abeffb2a19	Merged in feature/IO-2520-Kaizen-Data-Pump (pull request #1594 ) IO-2520 Add SHAW to Shop list	2024-08-13 19:29:26 +00:00
Allan Carr	70058b6bd4	IO-2520 Add SHAW to Shop list Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-13 12:32:14 -07:00
Allan Carr	67c63f81d9	Merge branch 'master-AIO' into feature/IO-2520-Kaizen-Data-Pump Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-13 12:30:42 -07:00
Allan Carr	fb8452b2bb	Merged in feature/IO-2874-InsertBill-full-Error-Logging (pull request #1593 ) IO-2874 InsertBill Full Error Log	2024-08-13 18:00:39 +00:00
Allan Carr	1f281e8439	IO-2874 InsertBill Full Error Log Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-13 11:03:15 -07:00
Dave Richer	223c705e8f	Merged in feature/IO-2869-Production-Board-List-Alert-2 (pull request #1587 ) - mute gray more, mute more buttons	2024-08-09 17:28:44 +00:00
Dave Richer	00d8b533f4	- mute gray more, mute more buttons Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-09 13:28:01 -04:00
Dave Richer	3b25a8fe07	- Hotfix for rome ZOHO Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-09 12:40:21 -04:00
Dave Richer	a57b9cddb5	Merged in feature/IO-2869-Production-Board-List-Alert-2 (pull request #1583 ) - Fix alert in table view - (modify some docs) Approved-by: Allan Carr	2024-08-08 17:02:45 +00:00
Dave Richer	064ed1bb8b	- Enhance Production Alert Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-08 12:16:56 -04:00
Dave Richer	efda254981	- Fix alert in table view - (modify some docs) Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-08 11:46:42 -04:00
Dave Richer	3fa6b8b6ac	Merged in feature/IO-2868-Add-Tasks-To-Production-Board (pull request #1581 ) - Add Tasks to production board (and required refactors)	2024-08-08 14:15:41 +00:00