IO-3389 Parts Scanning with Part # Update

Signed-off-by: Allan Carr <allan@imexsystems.ca>

client/src/firebase/firebase.utils.js

@@ -4,7 +4,7 @@ import { getAuth, updatePassword, updateProfile } from "@firebase/auth";
 import { getFirestore } from "@firebase/firestore";
 import { getMessaging, getToken, onMessage } from "@firebase/messaging";
 import { store } from "../redux/store";
-//import * as amplitude from '@amplitude/analytics-browser';
+import * as amplitude from '@amplitude/analytics-browser';
 import posthog from 'posthog-js'
 
 const config = JSON.parse(import.meta.env.VITE_APP_FIREBASE_CONFIG);
@@ -91,14 +91,14 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
     //   dbevent: false,
     //   env: `master-AIO|${import.meta.env.VITE_APP_GIT_SHA_DATE}`
     // });
-    // console.log(
-    //   "%c[Analytics]",
-    //   "background-color: green ;font-weight:bold;",
-    //   eventName,
-    //   eventParams
-    // );
+    console.log(
+      "%c[Analytics]",
+      "background-color: green ;font-weight:bold;",
+      eventName,
+      eventParams
+    );
     logEvent(analytics, eventName, eventParams);
-    //amplitude.track(eventName, eventParams);
+    amplitude.track(eventName, eventParams);
     posthog.capture(eventName, eventParams);
 
   } finally {

client/src/index.jsx

@@ -14,7 +14,7 @@ import { persistor, store } from "./redux/store";
 import reportWebVitals from "./reportWebVitals";
 import "./translations/i18n";
 import "./utils/CleanAxios";
-//import * as amplitude from "@amplitude/analytics-browser";
+import * as amplitude from "@amplitude/analytics-browser";
 import { PostHogProvider } from "posthog-js/react";
 import posthog from "posthog-js";
 
@@ -26,23 +26,23 @@ registerSW({ immediate: true });
 // Dinero.globalLocale = "en-CA";
 Dinero.globalRoundingMode = "HALF_EVEN";
 
-// amplitude.init(import.meta.env.VITE_APP_AMP_KEY, {
-//   defaultTracking: true,
-//   serverUrl: import.meta.env.VITE_APP_AMP_URL
-//   //  {
-//   //     attribution: {
-//   //       excludeReferrers: true,
-//   //       initialEmptyValue: true,
-//   //       resetSessionOnNewCampaign: true,
-//   //     },
-//   //     fileDownloads: true,
-//   //     formInteractions: true,
-//   //     pageViews: {
-//   //       trackHistoryChanges: 'all'
-//   //     },
-//   //     sessions: true
-//   //   }
-// });
+amplitude.init(import.meta.env.VITE_APP_AMP_KEY, {
+  defaultTracking: true,
+  serverUrl: import.meta.env.VITE_APP_AMP_URL
+  //  {
+  //     attribution: {
+  //       excludeReferrers: true,
+  //       initialEmptyValue: true,
+  //       resetSessionOnNewCampaign: true,
+  //     },
+  //     fileDownloads: true,
+  //     formInteractions: true,
+  //     pageViews: {
+  //       trackHistoryChanges: 'all'
+  //     },
+  //     sessions: true
+  //   }
+});
 
 posthog.init(import.meta.env.VITE_PUBLIC_POSTHOG_KEY, {
   autocapture: false,

client/src/redux/user/user.sagas.js

@@ -49,7 +49,7 @@ import {
   validatePasswordResetSuccess
 } from "./user.actions";
 import UserActionTypes from "./user.types";
-//import * as amplitude from '@amplitude/analytics-browser';
+import * as amplitude from '@amplitude/analytics-browser';
 import posthog from 'posthog-js';
 
 const fpPromise = FingerprintJS.load();
@@ -92,7 +92,7 @@ export function* isUserAuthenticated() {
     }
 
     LogRocket.identify(user.email);
-    //amplitude.setUserId(user.email);
+    amplitude.setUserId(user.email);
     posthog.identify(user.email);
 
     const eulaQuery = yield client.query({
@@ -139,7 +139,7 @@ export function* signOutStart() {
         imexshopid: state.user.bodyshop.imexshopid,
         type: "messaging"
       });
-      //amplitude.reset();
+      amplitude.reset();
     } catch {
       console.log("No FCM token. Skipping unsubscribe.");
     }
@@ -365,7 +365,7 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
     }
 
     try {
-      //amplitude.setGroup('Shop', payload.shopname);
+      amplitude.setGroup('Shop', payload.shopname);
       window.$crisp.push(["set", "user:company", [payload.shopname]]);
       if (authRecord[0] && authRecord[0].user.validemail) {
         window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);

server/graphql-client/queries.js

@@ -2859,7 +2859,6 @@ exports.GET_BODYSHOP_BY_ID = `
       intellipay_config
       state
       notification_followers
-      timezone
     }
   }
 `;
@@ -2951,7 +2950,6 @@ query GET_JOBID_BY_MERCHANTID_RONUMBER($merchantID: String!, $roNumber: String!)
       id
       intellipay_config
       email
-      timezone
     }
   }
 }`;
@@ -2961,7 +2959,6 @@ query GET_BODYSHOP_BY_MERCHANTID($merchantID: String!) {
   bodyshops(where: {intellipay_merchant_id: {_eq: $merchantID}}) {
     id
     email
-    timezone
   }
 }`;
 

server/intellipay/lib/handleCommentBasedPayment.js

@@ -48,9 +48,7 @@ const handleCommentBasedPayment = async (values, decodedComment, logger, logMeta
       payer: "Customer",
       type: getPaymentType(ipMapping, values.cardtype),
       jobid: p.jobid,
-      date: moment()
-        .tz(bodyshop?.bodyshops_by_pk?.timezone ?? "UTC")
-        .format("YYYY-MM-DD"),
+      date: moment(Date.now()),
       payment_responses: {
         data: {
           amount: values.total,

server/intellipay/lib/handleInvoiceBasedPayment.js

@@ -97,9 +97,7 @@ const handleInvoiceBasedPayment = async (values, logger, logMeta, res) => {
       payer: "Customer",
       type: getPaymentType(ipMapping, values.cardtype),
       jobid: job.id,
-      date: moment()
-        .tz(bodyshop?.timezone ?? "UTC")
-        .format("YYYY-MM-DD")
+      date: moment(Date.now())
     }
   });
 

server/parts-scan/parts-scan.js

@@ -82,22 +82,35 @@ exports.partsScan = async function (req, res) {
             criticalIds.add(jobline.id);
           }
           if (update_field && update_value) {
-            const result = await client.setHeaders({ Authorization: BearerToken }).request(queries.UPDATE_JOB_LINE, {
-              lineId: jobline.id,
-              line: { [update_field]: update_value, manual_line: true }
-            });
-
-            const auditResult = await client
-              .setHeaders({ Authorization: BearerToken })
-              .request(queries.INSERT_AUDIT_TRAIL, {
-                auditObj: {
-                  bodyshopid: data.jobs_by_pk.bodyshop.id,
-                  jobid,
-                  operation: `Jobline (#${jobline.line_no} ${jobline.line_desc}/${jobline.id}) ${update_field} updated from ${jobline[update_field]} to ${update_value}. Lined marked as manual line.`,
-                  type: "partscanupdate",
-                  useremail: req.user.email
+            let actualUpdateField = update_field;
+            if (update_field === "part_number") {
+              // Determine which part number field to update based on the match
+                if (!jobline.oem_partno) {
+                actualUpdateField = "oem_partno";
+                } else {
+                if (regex) {
+                  actualUpdateField = regex.test(jobline.oem_partno || "") ? "oem_partno" : "alt_partno";
+                } else {
+                  actualUpdateField = jobline.oem_partno === value ? "oem_partno" : "alt_partno";
                 }
+                }
+            }
+            if (actualUpdateField) {
+              await client.setHeaders({ Authorization: BearerToken }).request(queries.UPDATE_JOB_LINE, {
+                lineId: jobline.id,
+                line: { [actualUpdateField]: update_value, manual_line: true }
               });
+            }
+
+            await client.setHeaders({ Authorization: BearerToken }).request(queries.INSERT_AUDIT_TRAIL, {
+              auditObj: {
+                bodyshopid: data.jobs_by_pk.bodyshop.id,
+                jobid,
+                operation: `Jobline (#${jobline.line_no} ${jobline.line_desc}/${jobline.id}) ${update_field} updated from ${jobline[update_field]} to ${update_value}. Lined marked as manual line.`,
+                type: "partscanupdate",
+                useremail: req.user.email
+              }
+            });
           }
 
           //break; // No need to evaluate further rules for this jobline