From b462b2fa035d9742ae31c7185cae3cfede095bea Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 22 Nov 2021 15:39:12 -0800
Subject: [PATCH 1/2] IO-1485 Auto CC on parts order.

---
 bodyshop_translations.babel                   | 23 ++++++++++++++++++-
 .../dms-log-events.component.jsx              |  2 +-
 .../email-overlay/email-overlay.container.jsx | 12 ++++++++++
 .../schedule-event.component.jsx              |  2 +-
 .../shop-info/shop-info.general.component.jsx | 13 +++++++++++
 client/src/graphql/bodyshop.queries.js        |  2 ++
 client/src/translations/en_us/common.json     |  1 +
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 hasura/metadata/tables.yaml                   |  2 ++
 .../down.sql                                  |  4 ++++
 .../up.sql                                    |  2 ++
 server/cdk/cdk-job-export.js                  |  4 ++--
 13 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 hasura/migrations/1637623142599_alter_table_public_bodyshops_add_column_md_email_cc/down.sql
 create mode 100644 hasura/migrations/1637623142599_alter_table_public_bodyshops_add_column_md_email_cc/up.sql

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 1db938a77..c49f9a9da 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -4304,6 +4304,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>md_email_cc</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>md_hour_split</name>
                                         <children>
diff --git a/client/src/components/dms-log-events/dms-log-events.component.jsx b/client/src/components/dms-log-events/dms-log-events.component.jsx
index 89d56adb8..f88d6bd3b 100644
--- a/client/src/components/dms-log-events/dms-log-events.component.jsx
+++ b/client/src/components/dms-log-events/dms-log-events.component.jsx
@@ -27,7 +27,7 @@ export function DmsLogEvents({ socket, logs, bodyshop }) {
         <Timeline.Item key={idx} color={LogLevelHierarchy(log.level)}>
           <Space wrap align="start" style={{}}>
             <Tag color={LogLevelHierarchy(log.level)}>{log.level}</Tag>
-            <span>{moment(log.timestamp).format("MM/DD/YYYY HH:MM:ss")}</span>
+            <span>{moment(log.timestamp).format("MM/DD/YYYY HH:mm:ss")}</span>
             <Divider type="vertical" />
             <span>{log.message}</span>
           </Space>
diff --git a/client/src/components/email-overlay/email-overlay.container.jsx b/client/src/components/email-overlay/email-overlay.container.jsx
index f3e67f228..22c151a7a 100644
--- a/client/src/components/email-overlay/email-overlay.container.jsx
+++ b/client/src/components/email-overlay/email-overlay.container.jsx
@@ -149,6 +149,18 @@ export function EmailOverlayContainer({
       html: response.data,
       fileList: [],
     });
+
+    if (
+      bodyshop.md_email_cc[emailConfig.template.name] &&
+      bodyshop.md_email_cc[emailConfig.template.name].length > 0
+    ) {
+      form.setFieldsValue({
+        cc: [
+          ...(form.getFieldValue("cc") || []),
+          ...bodyshop.md_email_cc[emailConfig.template.name],
+        ],
+      });
+    }
     setLoading(false);
   };
 
diff --git a/client/src/components/job-at-change/schedule-event.component.jsx b/client/src/components/job-at-change/schedule-event.component.jsx
index 481fc07b2..ffaedb4f1 100644
--- a/client/src/components/job-at-change/schedule-event.component.jsx
+++ b/client/src/components/job-at-change/schedule-event.component.jsx
@@ -176,7 +176,7 @@ export function ScheduleEventComponent({
                       t("appointments.labels.reminder", {
                         shopname: bodyshop.shopname,
                         date: moment(event.start).format("MM/DD/YYYY"),
-                        time: moment(event.start).format("HH:MM a"),
+                        time: moment(event.start).format("HH:mm a"),
                       })
                     );
                     setVisible(false);
diff --git a/client/src/components/shop-info/shop-info.general.component.jsx b/client/src/components/shop-info/shop-info.general.component.jsx
index 0c405a024..0e713a724 100644
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -467,6 +467,19 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Switch />
         </Form.Item>
+        <Form.Item
+          name={["md_email_cc", "parts_order"]}
+          label={t("bodyshop.fields.md_email_cc", { template: "parts_order" })}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+              type: "array",
+            },
+          ]}
+        >
+          <Select mode="tags" />
+        </Form.Item>
         <Form.Item
           name={["tt_allow_post_to_invoiced"]}
           label={t("bodyshop.fields.tt_allow_post_to_invoiced")}
diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js
index f33a09c5d..878f3a3e9 100644
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -99,6 +99,7 @@ export const QUERY_BODYSHOP = gql`
       pbs_configuration
       pbs_serialnumber
       md_filehandlers
+      md_email_cc
       employees {
         user_email
         id
@@ -195,6 +196,7 @@ export const UPDATE_SHOP = gql`
         pbs_configuration
         pbs_serialnumber
         md_filehandlers
+        md_email_cc
         employees {
           id
           first_name
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 250e82b24..7d021e5f6 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -271,6 +271,7 @@
 				"md_ccc_rates": "Courtesy Car Contract Rate Presets",
 				"md_classes": "Classes",
 				"md_ded_notes": "Deductible Notes",
+				"md_email_cc": "Auto Email CC: $t(printcenter.subjects.jobs.{{template}})",
 				"md_hour_split": {
 					"paint": "Paint Hour Split",
 					"prep": "Prep Hour Split"
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 1516b6697..f12163cea 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -271,6 +271,7 @@
 				"md_ccc_rates": "",
 				"md_classes": "",
 				"md_ded_notes": "",
+				"md_email_cc": "",
 				"md_hour_split": {
 					"paint": "",
 					"prep": ""
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 570e5d46c..beba794af 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -271,6 +271,7 @@
 				"md_ccc_rates": "",
 				"md_classes": "",
 				"md_ded_notes": "",
+				"md_email_cc": "",
 				"md_hour_split": {
 					"paint": "",
 					"prep": ""
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index c97cc49f3..b0bd5e897 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -829,6 +829,7 @@
       - md_ccc_rates
       - md_classes
       - md_ded_notes
+      - md_email_cc
       - md_estimators
       - md_filehandlers
       - md_hour_split
@@ -908,6 +909,7 @@
       - md_ccc_rates
       - md_classes
       - md_ded_notes
+      - md_email_cc
       - md_estimators
       - md_filehandlers
       - md_hour_split
diff --git a/hasura/migrations/1637623142599_alter_table_public_bodyshops_add_column_md_email_cc/down.sql b/hasura/migrations/1637623142599_alter_table_public_bodyshops_add_column_md_email_cc/down.sql
new file mode 100644
index 000000000..6f44a8b4e
--- /dev/null
+++ b/hasura/migrations/1637623142599_alter_table_public_bodyshops_add_column_md_email_cc/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"."bodyshops" add column "md_email_cc" jsonb
+--  null default jsonb_build_object();
diff --git a/hasura/migrations/1637623142599_alter_table_public_bodyshops_add_column_md_email_cc/up.sql b/hasura/migrations/1637623142599_alter_table_public_bodyshops_add_column_md_email_cc/up.sql
new file mode 100644
index 000000000..2c5155caf
--- /dev/null
+++ b/hasura/migrations/1637623142599_alter_table_public_bodyshops_add_column_md_email_cc/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "md_email_cc" jsonb
+ null default jsonb_build_object();
diff --git a/server/cdk/cdk-job-export.js b/server/cdk/cdk-job-export.js
index 897cc4550..490be6425 100644
--- a/server/cdk/cdk-job-export.js
+++ b/server/cdk/cdk-job-export.js
@@ -866,9 +866,9 @@ async function InsertServiceVehicleHistory(socket) {
           roNumber: socket.JobData.ro_number.match(/\d+/g),
           mileage: socket.txEnvelope.kmout,
           openDate: moment(socket.JobData.actual_in).format("YYYY-MM-DD"),
-          openTime: moment(socket.JobData.actual_in).format("HH:MM:ss"),
+          openTime: moment(socket.JobData.actual_in).format("HH:mm:ss"),
           closeDate: moment(socket.JobData.invoice_date).format("YYYY-MM-DD"),
-          closeTime: moment(socket.JobData.invoice_date).format("HH:MM:ss"),
+          closeTime: moment(socket.JobData.invoice_date).format("HH:mm:ss"),
           comments: socket.txEnvelope.story,
           cashierID: socket.JobData.bodyshop.cdk_configuration.cashierid,
         },

From 65402c1420e0716e4d3552d1d1f5b2ea3192a8da Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 22 Nov 2021 23:20:13 -0800
Subject: [PATCH 2/2] Clean up console log statements.

---
 client/src/App/App.container.jsx                      |  1 -
 client/src/App/App.jsx                                |  1 -
 .../bill-form/bill-form.lines.component.jsx           | 10 ----------
 .../bill-line-search-select.component.jsx             |  1 -
 .../chat-new-conversation.component.jsx               |  1 -
 .../dashboard-grid/dashboard-grid.component.jsx       |  5 +----
 .../dms-cdk-makes/dms-cdk-makes.refetch.component.jsx |  2 +-
 .../document-editor/document-editor.component.jsx     |  6 ++----
 .../documents-upload/documents-upload.utility.js      | 10 +---------
 .../email-documents/email-documents.component.jsx     |  4 ----
 .../email-overlay/email-overlay.container.jsx         |  1 -
 .../components/email-test/email-test-component.jsx    |  1 -
 .../components/help-rescue/help-rescue.component.jsx  |  2 --
 .../job-3rd-party-modal.component.jsx                 |  2 +-
 .../job-at-change/schedule-event.color.component.jsx  |  2 +-
 .../job-bills-total/job-bills-total.component.jsx     |  1 -
 .../job-checklist-template-list.component.jsx         |  2 +-
 .../job-costing-modal/job-costing-modal.container.jsx |  2 +-
 .../job-costing-parts-table.component.jsx             |  1 -
 .../job-scoreboard-add-button.component.jsx           |  2 --
 .../jobs-admin-class/jobs-admin-class.component.jsx   |  1 -
 .../jobs-admin-dates/jobs-admin-dates.component.jsx   |  1 -
 .../jobs-admin-owner-reassociate.component.jsx        |  1 -
 .../jobs-admin-vehicle-reassociate.component.jsx      |  1 -
 .../jobs-available-supplement.estlines.util.js        |  2 --
 .../jobs-detail-header-actions.duplicate.util.js      |  1 -
 .../jobs-document-gallery.reassign.component.jsx      |  1 -
 .../partner-ping/partner-ping.component.jsx           |  2 +-
 .../parts-status-pie/parts-status-pie.component.jsx   | 10 ++++------
 .../report-center-modal.component.jsx                 |  2 +-
 .../schedule-job-modal.container.jsx                  |  1 -
 .../shop-csi-config-form.component.jsx                |  5 +----
 .../shop-info/shop-info.rostatus.component.jsx        |  4 ----
 .../time-ticket-modal/time-ticket-modal.component.jsx |  3 +--
 .../user-validate-pw-reset.component.jsx              |  3 +--
 .../vendors-phonebook-add.component.jsx               |  2 +-
 client/src/landing/index.jsx                          |  2 +-
 .../contract-detail.page.container.jsx                |  5 -----
 client/src/pages/csi/csi.container.page.jsx           |  2 +-
 .../pages/mobile-payment/mobile-payment.component.jsx |  8 ++------
 client/src/redux/application/application.sagas.js     | 11 +----------
 client/src/redux/user/user.sagas.js                   |  6 ++----
 client/src/utils/RenderTemplate.js                    |  1 -
 43 files changed, 26 insertions(+), 106 deletions(-)

diff --git a/client/src/App/App.container.jsx b/client/src/App/App.container.jsx
index 63db26f82..42091e595 100644
--- a/client/src/App/App.container.jsx
+++ b/client/src/App/App.container.jsx
@@ -27,7 +27,6 @@ export const tracker = new Tracker({
   onStart: async ({ sessionID }) => {
     const user = await getCurrentUser();
     if (user) tracker.setUserID(user.email);
-    console.log("ORS SESSION ", sessionID, user && user.email);
   },
 });
 
diff --git a/client/src/App/App.jsx b/client/src/App/App.jsx
index cab3be913..6a2bf774a 100644
--- a/client/src/App/App.jsx
+++ b/client/src/App/App.jsx
@@ -53,7 +53,6 @@ export function App({ checkUserSession, currentUser, online, setOnline }) {
   const { t } = useTranslation();
 
   window.addEventListener("offline", function (e) {
-    console.log("Internet connection lost.");
     setOnline(false);
   });
 
diff --git a/client/src/components/bill-form/bill-form.lines.component.jsx b/client/src/components/bill-form/bill-form.lines.component.jsx
index 03afc6b9a..22aa62f23 100644
--- a/client/src/components/bill-form/bill-form.lines.component.jsx
+++ b/client/src/components/bill-form/bill-form.lines.component.jsx
@@ -157,16 +157,6 @@ export function BillEnterModalLinesComponent({
                 billlines: getFieldsValue("billlines").billlines.map(
                   (item, idx) => {
                     if (idx === index) {
-                      console.log(
-                        "Found and setting.",
-                        !!item.actual_cost
-                          ? item.actual_cost
-                          : Math.round(
-                              (parseFloat(e.target.value) * (1 - discount) +
-                                Number.EPSILON) *
-                                100
-                            ) / 100
-                      );
                       return {
                         ...item,
                         actual_cost: !!item.actual_cost
diff --git a/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx b/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
index dd5558f85..e470fce33 100644
--- a/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
+++ b/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
@@ -14,7 +14,6 @@ const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
       showSearch
       //  optionFilterProp="line_desc"
       filterOption={(inputValue, option) => {
-        console.log(inputValue);
         return (
           (option.line_desc &&
             option.line_desc
diff --git a/client/src/components/chat-new-conversation/chat-new-conversation.component.jsx b/client/src/components/chat-new-conversation/chat-new-conversation.component.jsx
index 907c5149c..563b6d005 100644
--- a/client/src/components/chat-new-conversation/chat-new-conversation.component.jsx
+++ b/client/src/components/chat-new-conversation/chat-new-conversation.component.jsx
@@ -20,7 +20,6 @@ export function ChatNewConversation({ openChatByPhone }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const handleFinish = (values) => {
-    console.log("values :>> ", values);
     openChatByPhone({ phone_num: values.phoneNumber });
     form.resetFields();
   };
diff --git a/client/src/components/dashboard-grid/dashboard-grid.component.jsx b/client/src/components/dashboard-grid/dashboard-grid.component.jsx
index b67526eea..6d1ec5a66 100644
--- a/client/src/components/dashboard-grid/dashboard-grid.component.jsx
+++ b/client/src/components/dashboard-grid/dashboard-grid.component.jsx
@@ -86,10 +86,7 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
   const handleRemoveComponent = (key) => {
     logImEXEvent("dashboard_remove_component", { name: key });
     const idxToRemove = state.items.findIndex((i) => i.i === key);
-    console.log(
-      "🚀  ~ file: dashboard-grid.component.jsx  ~ line 81  ~ idxToRemove",
-      idxToRemove
-    );
+
     const items = _.cloneDeep(state.items);
 
     items.splice(idxToRemove, 1);
diff --git a/client/src/components/dms-cdk-makes/dms-cdk-makes.refetch.component.jsx b/client/src/components/dms-cdk-makes/dms-cdk-makes.refetch.component.jsx
index f56856dfc..c0d1ee4d9 100644
--- a/client/src/components/dms-cdk-makes/dms-cdk-makes.refetch.component.jsx
+++ b/client/src/components/dms-cdk-makes/dms-cdk-makes.refetch.component.jsx
@@ -23,7 +23,7 @@ export function DmsCdkMakesRefetch({ bodyshop, form, socket }) {
       cdk_dealerid: bodyshop.cdk_dealerid,
       bodyshopid: bodyshop.id,
     });
-    console.log(response);
+
     setLoading(false);
   };
   return (
diff --git a/client/src/components/document-editor/document-editor.component.jsx b/client/src/components/document-editor/document-editor.component.jsx
index cb12c1aec..ab2733c13 100644
--- a/client/src/components/document-editor/document-editor.component.jsx
+++ b/client/src/components/document-editor/document-editor.component.jsx
@@ -58,11 +58,9 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
     if (imgRef.current !== null) {
       // create a marker.js MarkerArea
       markerArea.current = new markerjs2.MarkerArea(imgRef.current);
-      console.log(`markerArea.current`, markerArea.current);
+
       // attach an event handler to assign annotated image back to our image element
-      markerArea.current.addCloseEventListener((closeEvent) => {
-        console.log("Close Event", closeEvent);
-      });
+      markerArea.current.addCloseEventListener((closeEvent) => {});
 
       markerArea.current.addRenderEventListener((dataUrl) => {
         imgRef.current.src = dataUrl;
diff --git a/client/src/components/documents-upload/documents-upload.utility.js b/client/src/components/documents-upload/documents-upload.utility.js
index bca78f094..f5ce23618 100644
--- a/client/src/components/documents-upload/documents-upload.utility.js
+++ b/client/src/components/documents-upload/documents-upload.utility.js
@@ -14,8 +14,6 @@ var cleanAxios = axios.create();
 cleanAxios.interceptors.request.eject(axiosAuthInterceptorId);
 
 export const handleUpload = (ev, context) => {
-  console.log("Handling Upload", ev);
-
   logImEXEvent("document_upload", { filetype: ev.file.type });
 
   const { onError, onSuccess, onProgress } = ev;
@@ -61,7 +59,7 @@ export const uploadToCloudinary = async (
   //  let eager = process.env.REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS;
 
   //Get the signed url.
-  console.log("fileType", fileType);
+
   const upload_preset = fileType.startsWith("video")
     ? "incoming_upload_video"
     : "incoming_upload";
@@ -74,7 +72,6 @@ export const uploadToCloudinary = async (
   });
 
   if (signedURLResponse.status !== 200) {
-    console.log("Error Getting Signed URL", signedURLResponse.statusText);
     if (!!onError) onError(signedURLResponse.statusText);
     notification["error"]({
       message: i18n.t("documents.errors.getpresignurl", {
@@ -113,13 +110,8 @@ export const uploadToCloudinary = async (
       ...options,
     }
   );
-  console.log("Upload Response", cloudinaryUploadResponse.data);
 
   if (cloudinaryUploadResponse.status !== 200) {
-    console.log(
-      "Error uploading to cloudinary.",
-      cloudinaryUploadResponse.statusText
-    );
     if (!!onError) onError(cloudinaryUploadResponse.statusText);
     notification["error"]({
       message: i18n.t("documents.errors.insert", {
diff --git a/client/src/components/email-documents/email-documents.component.jsx b/client/src/components/email-documents/email-documents.component.jsx
index 4769df3f6..bd1a0f09e 100644
--- a/client/src/components/email-documents/email-documents.component.jsx
+++ b/client/src/components/email-documents/email-documents.component.jsx
@@ -35,10 +35,6 @@ export function EmailDocumentsComponent({
     },
     skip: !emailConfig.jobid,
   });
-  console.log(
-    "🚀  ~ file: email-documents.component.jsx  ~ line 38  ~ emailConfig",
-    emailConfig
-  );
 
   return (
     <div>
diff --git a/client/src/components/email-overlay/email-overlay.container.jsx b/client/src/components/email-overlay/email-overlay.container.jsx
index 22c151a7a..c2dc7d261 100644
--- a/client/src/components/email-overlay/email-overlay.container.jsx
+++ b/client/src/components/email-overlay/email-overlay.container.jsx
@@ -111,7 +111,6 @@ export function EmailOverlayContainer({
       notification["success"]({ message: t("emails.successes.sent") });
       toggleEmailOverlayVisible();
     } catch (error) {
-      console.log(JSON.stringify(error));
       notification["error"]({
         message: t("emails.errors.notsent", { message: error.message }),
       });
diff --git a/client/src/components/email-test/email-test-component.jsx b/client/src/components/email-test/email-test-component.jsx
index 9e36dc590..ea891785c 100644
--- a/client/src/components/email-test/email-test-component.jsx
+++ b/client/src/components/email-test/email-test-component.jsx
@@ -21,7 +21,6 @@ export function EmailTestComponent({ currentUser, setEmailOptions }) {
   const [form] = Form.useForm();
 
   const handleFinish = (values) => {
-    console.log("values", values);
     GenerateDocument(
       {
         name: values.key,
diff --git a/client/src/components/help-rescue/help-rescue.component.jsx b/client/src/components/help-rescue/help-rescue.component.jsx
index 606b8ce5b..9a0d18b1e 100644
--- a/client/src/components/help-rescue/help-rescue.component.jsx
+++ b/client/src/components/help-rescue/help-rescue.component.jsx
@@ -18,7 +18,6 @@ export default function HelpRescue() {
         body: bodyFormData,
       }
     );
-    console.log("handleClick -> res1", await res1.text());
   };
 
   return (
@@ -40,7 +39,6 @@ export default function HelpRescue() {
           method="post"
           id="logmeinsupport"
           onSubmit={(...props) => {
-            console.log(`props`, props);
             alert();
           }}
         >
diff --git a/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx b/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
index 2954bbe0d..900ee86d1 100644
--- a/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
+++ b/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx
@@ -44,7 +44,7 @@ export function Jobd3RdPartyModal({ bodyshop, jobId }) {
   };
   const handleFinish = (values) => {
     const { sendtype, ...restVals } = values;
-    console.log(restVals);
+
     GenerateDocument(
       {
         name: TemplateList("job_special").thirdpartypayer.key,
diff --git a/client/src/components/job-at-change/schedule-event.color.component.jsx b/client/src/components/job-at-change/schedule-event.color.component.jsx
index 2895e7b27..632bbdfcf 100644
--- a/client/src/components/job-at-change/schedule-event.color.component.jsx
+++ b/client/src/components/job-at-change/schedule-event.color.component.jsx
@@ -56,7 +56,7 @@ export function ScheduleEventColor({ bodyshop, event }) {
       <Menu.Item key={"null"}>{t("general.actions.clear")}</Menu.Item>
     </Menu>
   );
-  console.log(`event`, event);
+
   return (
     <Dropdown overlay={menu}>
       <a href=" #" onClick={(e) => e.preventDefault()}>
diff --git a/client/src/components/job-bills-total/job-bills-total.component.jsx b/client/src/components/job-bills-total/job-bills-total.component.jsx
index 524b57279..8f8ba31e6 100644
--- a/client/src/components/job-bills-total/job-bills-total.component.jsx
+++ b/client/src/components/job-bills-total/job-bills-total.component.jsx
@@ -55,7 +55,6 @@ export default function JobBillsTotalComponent({
         );
       }
       if (il.deductedfromlbr) {
-        console.log(i, "Deducting from labor.");
         lbrAdjustments = lbrAdjustments.add(
           Dinero({
             amount: Math.round((il.actual_price || 0) * 100),
diff --git a/client/src/components/job-checklist/components/job-checklist-template-list/job-checklist-template-list.component.jsx b/client/src/components/job-checklist/components/job-checklist-template-list/job-checklist-template-list.component.jsx
index fa8322650..c20080704 100644
--- a/client/src/components/job-checklist/components/job-checklist-template-list/job-checklist-template-list.component.jsx
+++ b/client/src/components/job-checklist/components/job-checklist-template-list/job-checklist-template-list.component.jsx
@@ -34,7 +34,7 @@ export default function JobIntakeTemplateList({ templates }) {
   const renderAllTemplates = async () => {
     logImEXEvent("checklist_render_all_templates");
     setLoading(true);
-    console.log("templates :>> ", templates);
+
     await GenerateDocuments(
       templates.map((key) => {
         return { name: key, variables: { id: jobId } };
diff --git a/client/src/components/job-costing-modal/job-costing-modal.container.jsx b/client/src/components/job-costing-modal/job-costing-modal.container.jsx
index 8a1c1dc40..cef43bfd0 100644
--- a/client/src/components/job-costing-modal/job-costing-modal.container.jsx
+++ b/client/src/components/job-costing-modal/job-costing-modal.container.jsx
@@ -35,7 +35,7 @@ export function JobCostingModalContainer({
     async function getData() {
       if (jobId && visible) {
         const { data } = await axios.post("/job/costing", { jobid: jobId });
-        console.log(data);
+
         setCostingData(data);
       }
     }
diff --git a/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx b/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx
index a92c5e550..405fb9bb8 100644
--- a/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx
+++ b/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx
@@ -77,7 +77,6 @@ export default function JobCostingPartsTable({ data, summaryData }) {
             .includes(searchText.toLowerCase())
         );
 
-  console.log("data :>> ", data);
   return (
     <div>
       <Table
diff --git a/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx b/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
index 846950eaa..4ab815d87 100644
--- a/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
+++ b/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
@@ -42,9 +42,7 @@ export default function ScoreboardAddButton({
   }, [visibility, job.id, callQuery]);
 
   useEffect(() => {
-    console.log("UE", entryData);
     if (entryData && entryData.scoreboard && entryData.scoreboard[0]) {
-      console.log("Setting FOrm");
       form.setFieldsValue(entryData.scoreboard[0]);
     }
   }, [entryData, form]);
diff --git a/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx b/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx
index 05c60be1a..55142344e 100644
--- a/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx
+++ b/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx
@@ -22,7 +22,6 @@ export function JobsAdminClass({ bodyshop, job }) {
   const [updateJob] = useMutation(UPDATE_JOB);
 
   const handleFinish = async (values) => {
-    console.log(values);
     setLoading(true);
     const result = await updateJob({
       variables: { jobId: job.id, job: values },
diff --git a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx
index a72d28473..f52fe5497 100644
--- a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx
+++ b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx
@@ -13,7 +13,6 @@ export default function JobsAdminDatesChange({ job }) {
   const [updateJob] = useMutation(UPDATE_JOB);
 
   const handleFinish = async (values) => {
-    console.log(values);
     setLoading(true);
     const result = await updateJob({
       variables: { jobId: job.id, job: values },
diff --git a/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx b/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx
index 257b05600..27f468526 100644
--- a/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx
+++ b/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx
@@ -10,7 +10,6 @@ export default function JobAdminOwnerReassociate({ job }) {
   const [form] = Form.useForm();
   const [updateJob] = useMutation(UPDATE_JOB);
   const handleFinish = async (values) => {
-    console.log(values);
     setLoading(true);
     const result = await updateJob({
       variables: { jobId: job.id, job: { ownerid: values.ownerid } },
diff --git a/client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx b/client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx
index 0841d0f16..060d24de5 100644
--- a/client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx
+++ b/client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx
@@ -10,7 +10,6 @@ export default function JobAdminOwnerReassociate({ job }) {
   const [form] = Form.useForm();
   const [updateJob] = useMutation(UPDATE_JOB);
   const handleFinish = async (values) => {
-    console.log(values);
     setLoading(true);
     const result = await updateJob({
       variables: { jobId: job.id, job: { vehicleid: values.vehicleid } },
diff --git a/client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js b/client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js
index b424d2217..c3cd83c54 100644
--- a/client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js
+++ b/client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js
@@ -3,8 +3,6 @@ import { gql } from "@apollo/client";
 import _ from "lodash";
 
 export const GetSupplementDelta = async (client, jobId, newLines) => {
-  console.log("-----Begin Supplement-----");
-
   const {
     data: { joblines: existingLinesFromDb },
   } = await client.query({
diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js
index f7f21864f..87c38ca8b 100644
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js
@@ -19,7 +19,6 @@ export default async function DuplicateJob(
     variables: { id: jobId },
   });
 
-  console.log("res", res);
   const { jobs_by_pk } = res.data;
   const existingJob = _.cloneDeep(jobs_by_pk);
   delete existingJob.__typename;
diff --git a/client/src/components/jobs-documents-gallery/jobs-document-gallery.reassign.component.jsx b/client/src/components/jobs-documents-gallery/jobs-document-gallery.reassign.component.jsx
index e55d1233a..f08dedadb 100644
--- a/client/src/components/jobs-documents-gallery/jobs-document-gallery.reassign.component.jsx
+++ b/client/src/components/jobs-documents-gallery/jobs-document-gallery.reassign.component.jsx
@@ -40,7 +40,6 @@ export function JobsDocumentsGalleryReassign({ bodyshop, galleryImages }) {
 
   const updateImage = async (i, jobid) => {
     //Move the cloudinary image
-    console.log(i);
 
     //Update it in the database.
     const result = await updateDocument({
diff --git a/client/src/components/partner-ping/partner-ping.component.jsx b/client/src/components/partner-ping/partner-ping.component.jsx
index 9a27b0a66..f4da465e2 100644
--- a/client/src/components/partner-ping/partner-ping.component.jsx
+++ b/client/src/components/partner-ping/partner-ping.component.jsx
@@ -29,7 +29,7 @@ export function PartnerPingComponent({ setPartnerVersion }) {
         //if (process.env.NODE_ENV === "development") return;
         const PartnerResponse = await axios.post("http://localhost:1337/ping/");
         const { appver, qbpath } = PartnerResponse.data;
-        console.log("SETTING PARTNER VERSION.");
+
         setPartnerVersion(appver);
         console.log({ appver, qbpath });
         if (!qbpath) {
diff --git a/client/src/components/parts-status-pie/parts-status-pie.component.jsx b/client/src/components/parts-status-pie/parts-status-pie.component.jsx
index d5f75190e..a67b8bd9c 100644
--- a/client/src/components/parts-status-pie/parts-status-pie.component.jsx
+++ b/client/src/components/parts-status-pie/parts-status-pie.component.jsx
@@ -60,12 +60,10 @@ export function PartsStatusPie({ bodyshop, joblines_status }) {
     [pieColor, t]
   );
 
-  const memoizedData = useMemo(() => Calculatedata(joblines_status), [
-    joblines_status,
-    Calculatedata,
-  ]);
-
-  console.log("PartsStatusPie -> memoizedData", memoizedData);
+  const memoizedData = useMemo(
+    () => Calculatedata(joblines_status),
+    [joblines_status, Calculatedata]
+  );
 
   return (
     <div>
diff --git a/client/src/components/report-center-modal/report-center-modal.component.jsx b/client/src/components/report-center-modal/report-center-modal.component.jsx
index d51a6333d..8fbdcb954 100644
--- a/client/src/components/report-center-modal/report-center-modal.component.jsx
+++ b/client/src/components/report-center-modal/report-center-modal.component.jsx
@@ -71,7 +71,7 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
     const start = values.dates[0];
     const end = values.dates[1];
     const { id } = values;
-    console.log("values", values);
+
     await GenerateDocument(
       {
         name: values.key,
diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
index f781be9fd..47198545c 100644
--- a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
@@ -101,7 +101,6 @@ export function ScheduleJobModalContainer({
     }
 
     if (existingAppointments.data.appointments.length > 0) {
-      console.log("Cancelling all previous appts.");
       await Promise.all(
         existingAppointments.data.appointments.map((app) => {
           return cancelAppointment({
diff --git a/client/src/components/shop-csi-config-form/shop-csi-config-form.component.jsx b/client/src/components/shop-csi-config-form/shop-csi-config-form.component.jsx
index bd7541fdc..4ed0c6033 100644
--- a/client/src/components/shop-csi-config-form/shop-csi-config-form.component.jsx
+++ b/client/src/components/shop-csi-config-form/shop-csi-config-form.component.jsx
@@ -3,12 +3,9 @@ import { Form } from "antd";
 import ConfigFormComponents from "../config-form-components/config-form-components.component";
 
 export default function ShopCsiConfigForm({ selectedCsi }) {
-  console.log("ShopCsiConfigForm -> selectedCsi", selectedCsi);
   const readOnly = !!selectedCsi;
   const [form] = Form.useForm();
-  const handleFinish = (values) => {
-    console.log("values :>> ", values);
-  };
+  const handleFinish = (values) => {};
 
   return (
     <div>
diff --git a/client/src/components/shop-info/shop-info.rostatus.component.jsx b/client/src/components/shop-info/shop-info.rostatus.component.jsx
index 5ecf85e12..868cbd141 100644
--- a/client/src/components/shop-info/shop-info.rostatus.component.jsx
+++ b/client/src/components/shop-info/shop-info.rostatus.component.jsx
@@ -344,10 +344,6 @@ export default function ShopInfoROStatusComponent({ form }) {
 
 const ColorPicker = ({ value, onChange, style, ...restProps }) => {
   const handleChange = (color) => {
-    console.log(
-      "🚀  ~ file: shop-info.rostatus.component.jsx  ~ line 345  ~ color",
-      color
-    );
     if (onChange) onChange(color.rgb);
   };
   return (
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
index 23f4e828b..3a2fbfd0d 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
@@ -116,11 +116,10 @@ export function TimeTicketModalComponent({
           <EmployeeSearchSelect
             options={employeeAutoCompleteOptions}
             onSelect={(value) => {
-              console.log(value);
               const emps =
                 employeeAutoCompleteOptions &&
                 employeeAutoCompleteOptions.filter((e) => e.id === value)[0];
-              console.log(emps);
+
               form.setFieldsValue({ flat_rate: emps && emps.flat_rate });
             }}
           />
diff --git a/client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx b/client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx
index efb0fc292..e0e0523d2 100644
--- a/client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx
+++ b/client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx
@@ -37,10 +37,9 @@ export function UserValidatePwReset({
     async function checkCodeValid() {
       try {
         const codeValid = await checkActionCode(auth, oobCode);
-        console.log("codeValid :>> ", codeValid);
+
         setCodeValid({ loading: false, ...codeValid });
       } catch (error) {
-        console.log("error :>> ", error);
         setCodeValid({ loading: false, ...error });
       }
     }
diff --git a/client/src/components/vendors-phonebook-add/vendors-phonebook-add.component.jsx b/client/src/components/vendors-phonebook-add/vendors-phonebook-add.component.jsx
index f5dc41bfd..bf0ea4acc 100644
--- a/client/src/components/vendors-phonebook-add/vendors-phonebook-add.component.jsx
+++ b/client/src/components/vendors-phonebook-add/vendors-phonebook-add.component.jsx
@@ -37,7 +37,7 @@ export function VendorsPhonebookAdd({ form, bodyshop, disabled }) {
       "zip",
       "country",
     ]);
-    console.log(`VendorValues`, VendorValues);
+
     const result = await insertPhonebook({
       variables: {
         phonebook_entry: [
diff --git a/client/src/landing/index.jsx b/client/src/landing/index.jsx
index 2ddc12a66..60dfa1b95 100644
--- a/client/src/landing/index.jsx
+++ b/client/src/landing/index.jsx
@@ -58,7 +58,7 @@ export default class Home extends React.Component {
       }, 500);
     }
     /* 如果不是 dva 2.0 请删除 end */
-    console.log("Setting $crisp segments", ["lead"]);
+
     window.$crisp.push(["set", "session:segments", [["lead"]]]);
     window.$crisp.push([
       "set",
diff --git a/client/src/pages/contract-detail/contract-detail.page.container.jsx b/client/src/pages/contract-detail/contract-detail.page.container.jsx
index 8b493fb03..97474a54e 100644
--- a/client/src/pages/contract-detail/contract-detail.page.container.jsx
+++ b/client/src/pages/contract-detail/contract-detail.page.container.jsx
@@ -124,11 +124,6 @@ export function ContractDetailPageContainer({
   if (loading) return <LoadingSpinner />;
 
   if (!!!data.cccontracts_by_pk) return <NotFound />;
-  console.log(
-    "data.cccontracts_by_pk",
-    !!!data.cccontracts_by_pk,
-    data.cccontracts_by_pk
-  );
 
   return (
     <RbacWrapper action="contracts:detail">
diff --git a/client/src/pages/csi/csi.container.page.jsx b/client/src/pages/csi/csi.container.page.jsx
index eed395016..8287cdda5 100644
--- a/client/src/pages/csi/csi.container.page.jsx
+++ b/client/src/pages/csi/csi.container.page.jsx
@@ -92,7 +92,7 @@ export function CsiContainerPage({ currentUser }) {
         />
       </Layout>
     );
-  console.log(bodyshop);
+
   return (
     <Layout
       style={{ height: "100vh", display: "flex", flexDirection: "column" }}
diff --git a/client/src/pages/mobile-payment/mobile-payment.component.jsx b/client/src/pages/mobile-payment/mobile-payment.component.jsx
index b1738c489..f353edbfd 100644
--- a/client/src/pages/mobile-payment/mobile-payment.component.jsx
+++ b/client/src/pages/mobile-payment/mobile-payment.component.jsx
@@ -1,6 +1,6 @@
 import {
   PaymentRequestButtonElement,
-  useStripe
+  useStripe,
 } from "@stripe/react-stripe-js";
 import React, { useEffect, useState } from "react";
 
@@ -10,7 +10,6 @@ export default function MobilePaymentComponent() {
   const [paymentRequest, setPaymentRequest] = useState(null);
   useEffect(() => {
     if (stripe) {
-      console.log("in useeff");
       const pr = stripe.paymentRequest({
         country: "CA",
         displayItems: [{ label: "Deductible", amount: 1 }],
@@ -23,10 +22,8 @@ export default function MobilePaymentComponent() {
         requestPayerEmail: true,
       });
 
-      console.log("pr", pr);
       // Check the availability of the Payment Request API.
       pr.canMakePayment().then((result) => {
-        console.log("result", result);
         if (result) {
           setPaymentRequest(pr);
         } else {
@@ -45,7 +42,7 @@ export default function MobilePaymentComponent() {
 
   if (paymentRequest) {
     paymentRequest.on("paymentmethod", async (ev) => {
-        //Call server side to get the client secret
+      //Call server side to get the client secret
       // Confirm the PaymentIntent without handling potential next actions (yet).
       const { error: confirmError } = await stripe.confirmCardPayment(
         "clientSecret",
@@ -70,7 +67,6 @@ export default function MobilePaymentComponent() {
           // The payment failed -- ask your customer for a new payment method.
         } else {
           // The payment has succeeded.
-          console.log('paymentIntent', paymentIntent)
         }
       }
     });
diff --git a/client/src/redux/application/application.sagas.js b/client/src/redux/application/application.sagas.js
index c7f111693..d525d93bb 100644
--- a/client/src/redux/application/application.sagas.js
+++ b/client/src/redux/application/application.sagas.js
@@ -120,8 +120,6 @@ export function* calculateScheduleLoad({ payload: end }) {
 
     yield put(scheduleLoadSuccess(load));
   } catch (error) {
-    //console.log("Error in sendEmailFailure saga.", error.message);
-    console.log("error", error);
     yield put(scheduleLoadFailure(error));
   }
 }
@@ -139,14 +137,7 @@ export function* insertAuditTrailSaga({
   const state = yield select();
   const bodyshop = state.user.bodyshop;
   const currentUser = state.user.currentUser;
-  console.log(
-    "Inserting audit trail for",
-    bodyshop.shopname,
-    currentUser.email,
-    jobid,
-    billid,
-    operation
-  );
+
   const variables = {
     auditObj: {
       bodyshopid: bodyshop.id,
diff --git a/client/src/redux/user/user.sagas.js b/client/src/redux/user/user.sagas.js
index fcfc1da5d..486765fd3 100644
--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -178,13 +178,13 @@ export function* signInSuccessSaga({ payload }) {
 
   try {
     // window.$crisp.push(["set", "user:email", [payload.email]]);
-    console.log("$crisp set nickname", [payload.displayName || payload.email]);
+
     window.$crisp.push([
       "set",
       "user:nickname",
       [payload.displayName || payload.email],
     ]);
-    console.log("Setting $crisp segments", ["user"]);
+
     window.$crisp.push(["set", "session:segments", [["user"]]]);
 
     Sentry.setUser({
@@ -235,7 +235,6 @@ export function* validatePasswordResetStart({ payload: { password, code } }) {
     yield confirmPasswordReset(auth, code, password);
     yield put(validatePasswordResetSuccess());
   } catch (error) {
-    console.log("function*validatePasswordResetStart -> error", error);
     yield put(validatePasswordResetFailure(error.message));
   }
 }
@@ -267,7 +266,6 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
     try {
       window.$crisp.push(["set", "user:company", [payload.shopname]]);
       if (authRecord[0] && authRecord[0].user.validemail) {
-        console.log("$crisp user email", authRecord[0].user.email);
         window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
       }
     } catch (error) {
diff --git a/client/src/utils/RenderTemplate.js b/client/src/utils/RenderTemplate.js
index fab220d85..8a945eb2f 100644
--- a/client/src/utils/RenderTemplate.js
+++ b/client/src/utils/RenderTemplate.js
@@ -195,7 +195,6 @@ export const GenerateDocuments = async (templates) => {
 };
 
 const fetchContextData = async (templateObject) => {
-  console.log("Fetching context data", templateObject);
   const bodyshop = store.getState().user.bodyshop;
 
   jsreport.headers["Authorization"] =