Merge branch 'release/2025-01-31' into feature/IO-3114-Quick-Intake

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

# Conflicts:
#	client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
#	client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx

client/index.html

@@ -62,7 +62,17 @@
       t = d.getElementsByTagName("script")[0];
       t.parentNode.insertBefore(s, t);
     </script>
-
+    <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>
     <% } %>
     <script>
       !(function () {

client/src/components/card-payment-modal/card-payment-modal.component.jsx

@@ -135,15 +135,19 @@ const CardPaymentModalComponent = ({
       if (window.intellipay) {
         // eslint-disable-next-line no-eval
         eval(response.data);
-        SetIntellipayCallbackFunctions();
-        window.intellipay.autoOpen();
+        pollForIntelliPay(() => {
+          SetIntellipayCallbackFunctions();
+          window.intellipay.autoOpen();
+        });
       } else {
         const rg = document.createRange();
         const node = rg.createContextualFragment(response.data);
         document.documentElement.appendChild(node);
-        SetIntellipayCallbackFunctions();
-        window.intellipay.isAutoOpen = true;
-        window.intellipay.initialize();
+        pollForIntelliPay(() => {
+          SetIntellipayCallbackFunctions();
+          window.intellipay.isAutoOpen = true;
+          window.intellipay.initialize();
+        });
       }
     } catch (error) {
       notification.open({
@@ -347,3 +351,27 @@ const CardPaymentModalComponent = ({
 };
 
 export default connect(mapStateToProps, mapDispatchToProps)(CardPaymentModalComponent);
+
+//Poll for window.IntelliPay.fixAmount for 5 seconds. If it doesn't come up, just try anyways to force the possible error.
+function pollForIntelliPay(callbackFunction) {
+  const timeout = 5000;
+  const interval = 150; // Poll every 100 milliseconds
+  const startTime = Date.now();
+
+  function checkFixAmount() {
+    if (window.intellipay && window.intellipay.fixAmount !== undefined) {
+      callbackFunction();
+      return;
+    }
+
+    if (Date.now() - startTime >= timeout) {
+      console.log("Stopped polling IntelliPay after 10 seconds. Attemping to set functions anyways.");
+      callbackFunction();
+      return;
+    }
+
+    setTimeout(checkFixAmount, interval);
+  }
+
+  checkFixAmount();
+}

client/src/components/card-payment-modal/card-payment-modal.container.jsx

@@ -6,7 +6,7 @@ import { createStructuredSelector } from "reselect";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectCardPayment } from "../../redux/modals/modals.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import CardPaymentModalComponent from "./card-payment-modal.component.";
+import CardPaymentModalComponent from "./card-payment-modal.component";
 
 const mapStateToProps = createStructuredSelector({
   cardPaymentModal: selectCardPayment,

client/src/components/error-boundary/error-boundary.component.jsx

@@ -1,10 +1,10 @@
+import * as Sentry from "@sentry/react";
 import { Button, Col, Collapse, Result, Row, Space } from "antd";
 import React from "react";
 import { withTranslation } from "react-i18next";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import * as Sentry from "@sentry/react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
@@ -38,28 +38,23 @@ class ErrorBoundary extends React.Component {
   }
 
   handleErrorSubmit = () => {
-    InstanceRenderManager({
-      executeFunction: true,
-      args: [],
-      imex: () => {
-        window.$crisp.push([
-          "do",
-          "message:send",
-          [
-            "text",
-            `I hit the following error: \n\n
+    window.$crisp.push([
+      "do",
+      "message:send",
+      [
+        "text",
+        `I hit the following error: \n\n
               ${this.state.error.message}\n\n
               ${this.state.error.stack}\n\n
               URL:${window.location} as ${this.props.currentUser.email} for ${
                 this.props.bodyshop && this.props.bodyshop.name
               }
               `
-          ]
-        ]);
+      ]
+    ]);
+
+    window.$crisp.push(["do", "chat:open"]);
 
-        window.$crisp.push(["do", "chat:open"]);
-      }
-    });
     //     const errorDescription = `**Please add relevant details about what you were doing before you encountered this issue**
 
     // ----

client/src/components/header/header.component.jsx

@@ -656,14 +656,7 @@ function Header({
           icon: <Icon component={QuestionCircleFilled} />,
           label: t("menus.header.help"),
           onClick: () => {
-            window.open(
-              InstanceRenderManager({
-                imex: "https://help.imex.online/",
-                rome: "https://rometech.com//"
-              }),
-
-              "_blank"
-            );
+            window.open("https://help.imex.online/", "_blank");
           }
         },
         ...(InstanceRenderManager({

client/src/components/jobs-convert-button/jobs-convert-button.component.jsx

@@ -1,7 +1,8 @@
 import { useMutation } from "@apollo/client";
 import { Button, Form, Input, Popover, Select, Space, Switch } from "antd";
 import axios from "axios";
-import React, { useState } from "react";
+import { some } from "lodash";
+import React, { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -19,7 +20,14 @@ const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly
 });
 const mapDispatchToProps = (dispatch) => ({
-  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(
+      insertAuditTrail({
+        jobid,
+        operation,
+        type
+      })
+    )
 });
 
 export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTrail, parentFormIsFieldsTouched }) {
@@ -29,6 +37,7 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const notification = useNotification();
+  const allFormValues = Form.useWatch([], form);
 
   const handleConvert = async ({ employee_csr, category, ...values }) => {
     if (parentFormIsFieldsTouched()) {
@@ -71,6 +80,8 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
     setLoading(false);
   };
 
+  const submitDisabled = useCallback(() => some(allFormValues, (v) => v === undefined), [allFormValues]);
+
   const popMenu = (
     <div>
       <Form
@@ -79,9 +90,12 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
         onFinish={handleConvert}
         initialValues={{
           driveable: true,
-          towin: false,
+          towin: job.towin,
+          ca_gst_registrant: job.ca_gst_registrant,
           employee_csr: job.employee_csr,
-          category: job.category
+          category: job.category,
+          referral_source: job.referral_source,
+          referral_source_extra: job.referral_source_extra ?? ""
         }}
       >
         <Form.Item
@@ -211,7 +225,7 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
           <Switch />
         </Form.Item>
         <Space wrap>
-          <Button type="primary" danger onClick={() => form.submit()} loading={loading}>
+          <Button disabled={submitDisabled()} type="primary" danger onClick={() => form.submit()} loading={loading}>
             {t("jobs.actions.convert")}
           </Button>
           <Button onClick={() => setOpen(false)}>{t("general.actions.close")}</Button>
@@ -233,11 +247,6 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
         loading={loading}
         onClick={() => {
           setOpen(true);
-          form.setFieldsValue({
-            driveable: true,
-            towin: false,
-            employee_csr: job.employee_csr
-          });
         }}
       >
         {t("jobs.actions.convert")}

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -4,11 +4,12 @@ import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Button, Card, Dropdown, Form, Input, Modal, Popconfirm, Popover, Select, Space } from "antd";
 import axios from "axios";
 import parsePhoneNumber from "libphonenumber-js";
-import React, { useContext, useMemo, useState } from "react";
+import { useContext, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 import { auth, logImEXEvent } from "../../firebase/firebase.utils";
 import { CANCEL_APPOINTMENTS_BY_JOB_ID, INSERT_MANUAL_APPT } from "../../graphql/appointments.queries";
 import { GET_CURRENT_QUESTIONSET_ID, INSERT_CSI } from "../../graphql/csi.queries";
@@ -30,7 +31,6 @@ import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
 import DuplicateJob from "./jobs-detail-header-actions.duplicate.util";
 import JobsDetailHeaderActionsToggleProduction from "./jobs-detail-header-actions.toggle-production";
-import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
@@ -121,6 +121,7 @@ export function JobsDetailHeaderActions({
   const history = useNavigate();
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
+  const [dropdownOpen, setDropdownOpen] = useState(false);
   const [isCancelScheduleModalVisible, setIsCancelScheduleModalVisible] = useState(false);
   const [insertAppointment] = useMutation(INSERT_MANUAL_APPT);
   const [deleteJob] = useMutation(DELETE_JOB);
@@ -718,7 +719,13 @@ export function JobsDetailHeaderActions({
       key: "toggleproduction",
       id: "job-actions-toggleproduction",
       disabled: !job.converted || jobRO,
-      label: <JobsDetailHeaderActionsToggleProduction job={job} refetch={refetch} />
+      label: (
+        <JobsDetailHeaderActionsToggleProduction
+          job={job}
+          refetch={refetch}
+          closeParentMenu={() => setDropdownOpen(false)}
+        />
+      )
     },
 
     {
@@ -1148,7 +1155,7 @@ export function JobsDetailHeaderActions({
           </Form.Item>
         </Form>
       </Modal>
-      <Dropdown menu={menu} trigger={["click"]} key="changestatus">
+      <Dropdown menu={menu} trigger={["click"]} key="changestatus" open={dropdownOpen} onOpenChange={setDropdownOpen}>
         <Button>
           <span>{t("general.labels.actions")}</span>
           <DownCircleFilled />

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx

@@ -1,11 +1,11 @@
-import { useMutation } from "@apollo/client";
+import { useLazyQuery, useMutation } from "@apollo/client";
 import { Button, Form, Popover, Space } from "antd";
 import dayjs from "dayjs";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { JOB_PRODUCTION_TOGGLE } from "../../graphql/jobs.queries";
+import { GET_JOB_BY_PK_QUICK_INTAKE, JOB_PRODUCTION_TOGGLE } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -23,16 +23,40 @@ const mapDispatchToProps = (dispatch) => ({
   insertAuditTrail: ({ jobid, operation }) => dispatch(insertAuditTrail({ jobid, operation }))
 });
 
-export function JobsDetailHeaderActionsToggleProduction({ bodyshop, job, jobRO, insertAuditTrail }) {
+export function JobsDetailHeaderActionsToggleProduction({
+  bodyshop,
+  job,
+  jobRO,
+  refetch,
+  closeParentMenu,
+  insertAuditTrail
+}) {
   const [scenario, setScenario] = useState(false);
   const [loading, setLoading] = useState(false);
+  const [popOverVisible, setPopOverVisible] = useState(false);
   const [mutationUpdateJob] = useMutation(JOB_PRODUCTION_TOGGLE);
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const notification = useNotification();
 
+  const [getJobDetails] = useLazyQuery(GET_JOB_BY_PK_QUICK_INTAKE, {
+    variables: { id: job.id },
+    onCompleted: (data) => {
+      if (data?.jobs_by_pk) {
+        form.setFieldsValue({
+          actual_in: data.jobs_by_pk.actual_in ? data.jobs_by_pk.actual_in : dayjs(),
+          scheduled_completion: data.jobs_by_pk.scheduled_completion,
+          actual_completion: data.jobs_by_pk.actual_completion,
+          scheduled_delivery: data.jobs_by_pk.scheduled_delivery,
+          actual_delivery: data.jobs_by_pk.actual_delivery
+        });
+      }
+    },
+    fetchPolicy: "network-only"
+  });
+
   useEffect(() => {
-    //Figure out what scenario were in, populate accodingly
+    //Figure out what scenario were in, populate accordingly
     if (job && bodyshop) {
       if (bodyshop.md_ro_statuses.pre_production_statuses.includes(job.status)) {
         setScenario("pre");
@@ -76,24 +100,16 @@ export function JobsDetailHeaderActionsToggleProduction({ bodyshop, job, jobRO,
                 DateTimeFormatterFunction(values.actual_completion)
               )
       });
+      setPopOverVisible(false);
+      closeParentMenu();
+      refetch();
     }
     setLoading(false);
   };
 
   const popMenu = (
     <div onClick={(e) => e.stopPropagation()}>
-      <Form
-        layout="vertical"
-        form={form}
-        onFinish={handleConvert}
-        initialValues={{
-          actual_in: dayjs(),
-          scheduled_completion: job.scheduled_completion,
-          actual_completion: job.actual_completion,
-          scheduled_deliver: job.scheduled_deliver,
-          actual_delivery: job.actual_delivery
-        }}
-      >
+      <Form layout="vertical" form={form} onFinish={handleConvert}>
         {scenario === "pre" && (
           <>
             <Form.Item
@@ -158,7 +174,12 @@ export function JobsDetailHeaderActionsToggleProduction({ bodyshop, job, jobRO,
   return (
     <Popover //open={open}
       content={popMenu}
-      onClick={(e) => e.stopPropagation()}
+      open={popOverVisible}
+      onOpenChange={setPopOverVisible}
+      onClick={(e) => {
+        getJobDetails();
+        e.stopPropagation();
+      }}
       getPopupContainer={(trigger) => trigger.parentNode}
       trigger="click"
     >

client/src/components/rbac-wrapper/rbac-defaults.js

@@ -35,6 +35,7 @@ const ret = {
   "bills:reexport": 3,
 
   "employees:page": 5,
+  "employee_teams:page": 5,
 
   "owners:list": 2,
   "owners:detail": 3,
@@ -67,6 +68,9 @@ const ret = {
   "timetickets:list": 3,
   "timetickets:edit": 4,
   "timetickets:shiftedit": 5,
+  "timetickets:editcommitted": 5,
+  "ttapprovals:view": 5,
+  "ttapprovals:approve": 5,
 
   "users:editaccess": 4,
 

client/src/components/task-upsert-modal/task-upsert-modal.container.jsx

@@ -1,6 +1,6 @@
 import { useMutation, useQuery } from "@apollo/client";
 import { Form, Modal } from "antd";
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -255,9 +255,13 @@ export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, to
     }
   };
 
+  const taskTitle = useMemo(() => {
+    return existingTask ? t("tasks.actions.edit") : t("tasks.actions.new");
+  }, [existingTask, t]);
+
   return (
     <Modal
-      title={existingTask ? t("tasks.actions.edit") : t("tasks.actions.new")}
+      title={<span id="task-upsert-modal-title">{taskTitle}</span>}
       open={open}
       okText={t("general.actions.save")}
       width="50%"

client/src/graphql/jobs.queries.js

@@ -2553,3 +2553,16 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
     }
   }
 `;
+
+export const GET_JOB_BY_PK_QUICK_INTAKE = gql`
+  query GET_JOB_BY_PK_QUICK_INTAKE($id: uuid!) {
+    jobs_by_pk(id: $id) {
+      id
+      actual_in
+      scheduled_completion
+      actual_completion
+      scheduled_delivery
+      actual_delivery
+    }
+  }
+`;

client/src/pages/manage/manage.page.component.jsx

@@ -32,7 +32,7 @@ import { useNotification } from "../../contexts/Notifications/notificationContex
 const JobsPage = lazy(() => import("../jobs/jobs.page"));
 
 const CardPaymentModalContainer = lazy(
-  () => import("../../components/card-payment-modal/card-payment-modal.container.")
+  () => import("../../components/card-payment-modal/card-payment-modal.container.jsx")
 );
 
 const JobsDetailPage = lazy(() => import("../jobs-detail/jobs-detail.page.container"));

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

@@ -26,6 +26,7 @@ import {
   updateCurrentUser
 } from "../../firebase/firebase.utils";
 import { QUERY_EULA } from "../../graphql/bodyshop.queries";
+import cleanAxios from "../../utils/CleanAxios";
 import client from "../../utils/GraphQLClient";
 import dayjs from "../../utils/day";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
@@ -47,7 +48,6 @@ import {
   validatePasswordResetSuccess
 } from "./user.actions";
 import UserActionTypes from "./user.types";
-import cleanAxios from "../../utils/CleanAxios";
 
 const fpPromise = FingerprintJS.load();
 
@@ -234,16 +234,18 @@ export function* signInSuccessSaga({ payload }) {
   LogRocket.identify(payload.email);
 
   try {
+    window.$crisp.push(["set", "user:nickname", [payload.displayName || payload.email]]);
+    window.$crisp.push(["set", "session:segments", [["user"]]]);
     InstanceRenderManager({
       executeFunction: true,
       args: [],
       imex: () => {
-        window.$crisp.push(["set", "user:nickname", [payload.displayName || payload.email]]);
-        window.$crisp.push(["set", "session:segments", [["user"]]]);
+        window.$crisp.push(["set", "session:segments", [["imex"]]]);
       },
       rome: () => {
         window.$zoho.salesiq.visitor.name(payload.displayName || payload.email);
         window.$zoho.salesiq.visitor.email(payload.email);
+        window.$crisp.push(["set", "session:segments", [["rome"]]]);
       }
     });
   } catch (error) {

client/src/translations/en_us/common.json

@@ -380,11 +380,11 @@
         "md_parts_order_comment": "Parts Orders Comments",
         "md_parts_scan": {
           "caseInsensitive": "Case Insensitive",
-					"expression": "",
-					"field": "Field",
-					"flags": "",
-					"operation": "Operation",
-					"value": "Value"
+          "expression": "",
+          "field": "Field",
+          "flags": "",
+          "operation": "Operation",
+          "value": "Value"
         },
         "md_payment_types": "Payment Types",
         "md_referral_sources": "Referral Sources",
@@ -715,15 +715,15 @@
         "workingdays": "Working Days"
       },
       "operations": {
-				"contains": "Contains",
-				"ends_with": "Ends With",
-				"equals": "Equals",
-				"greater_than": "Greater Than",
-				"less_than": "Less Than",
-				"not_equals": "Not Equals",
-				"starts_with": "Starts With"
-			},
-			"successes": {
+        "contains": "Contains",
+        "ends_with": "Ends With",
+        "equals": "Equals",
+        "greater_than": "Greater Than",
+        "less_than": "Less Than",
+        "not_equals": "Not Equals",
+        "starts_with": "Starts With"
+      },
+      "successes": {
         "areyousure": "Are you sure you want to continue?",
         "defaultviewcreated": "Default view created successfully.",
         "save": "Shop configuration saved successfully. ",
@@ -1437,13 +1437,13 @@
         "adjustment": "Adjustment",
         "ah_detail_line": "Mark as Detail Labor Line (Autohouse Only)",
         "alt_partno": "Alt Part #",
-				"amount": "Amount",
+        "amount": "Amount",
         "assigned_team": "Team",
         "assigned_team_name": "Team {{name}}",
         "create_ppc": "Create PPC?",
         "db_price": "List Price",
         "include_in_part_cnt": "Include in Parts Status Count",
-				"lbr_types": {
+        "lbr_types": {
           "LA1": "LA1",
           "LA2": "LA2",
           "LA3": "LA3",
@@ -3071,7 +3071,7 @@
         "production_by_repair_status": "Production by Status",
         "production_by_repair_status_one": "Production filtered by Status",
         "production_by_ro": "Production by RO",
-        "production_by_target_date": "Production by Target Date",
+        "production_by_target_date": "Production by Scheduled Completion",
         "production_by_technician": "Production by Technician",
         "production_by_technician_one": "Production filtered by Technician",
         "production_not_production_status": "Production not in Production Status",
@@ -3081,7 +3081,8 @@
         "purchase_return_ratio_grouped_by_vendor_detail": "Purchase & Return Ratio by Vendor (Detail)",
         "purchase_return_ratio_grouped_by_vendor_summary": "Purchase & Return Ratio by Vendor (Summary)",
         "purchases_by_cost_center_detail": "Purchases by Cost Center (Detail)",
-        "purchases_by_cost_center_summary": "Purchases by Cost Center (Summary)","purchases_by_date_excel": "Purchases by Date - Excel",
+        "purchases_by_cost_center_summary": "Purchases by Cost Center (Summary)",
+        "purchases_by_date_excel": "Purchases by Date - Excel",
         "purchases_by_date_range_detail": "Purchases by Date - Detail",
         "purchases_by_date_range_summary": "Purchases by Date - Summary",
         "purchases_by_ro_detail_date": "Purchases by RO - Detail",

client/src/translations/es/common.json

@@ -380,11 +380,11 @@
         "md_parts_order_comment": "",
         "md_parts_scan": {
           "caseInsensitive": "",
-					"expression": "",
-					"field": "",
+          "expression": "",
+          "field": "",
           "flags": "",
-					"operation": "",
-					"value": ""
+          "operation": "",
+          "value": ""
         },
         "md_payment_types": "",
         "md_referral_sources": "",
@@ -715,15 +715,15 @@
         "workingdays": ""
       },
       "operations": {
-				"contains": "",
-				"ends_with": "",
-				"equals": "",
-				"greater_than": "",
-				"less_than": "",
-				"not_equals": "",
-				"starts_with": ""
-			},
-			"successes": {
+        "contains": "",
+        "ends_with": "",
+        "equals": "",
+        "greater_than": "",
+        "less_than": "",
+        "not_equals": "",
+        "starts_with": ""
+      },
+      "successes": {
         "areyousure": "",
         "defaultviewcreated": "",
         "save": "",
@@ -1437,13 +1437,13 @@
         "adjustment": "",
         "ah_detail_line": "",
         "alt_partno": "",
-				"amount": "",
+        "amount": "",
         "assigned_team": "",
         "assigned_team_name": "",
         "create_ppc": "",
         "db_price": "Precio de base de datos",
         "include_in_part_cnt": "",
-				"lbr_types": {
+        "lbr_types": {
           "LA1": "",
           "LA2": "",
           "LA3": "",
@@ -3082,7 +3082,7 @@
         "purchase_return_ratio_grouped_by_vendor_summary": "",
         "purchases_by_cost_center_detail": "",
         "purchases_by_cost_center_summary": "",
-				"purchases_by_date_excel": "",
+        "purchases_by_date_excel": "",
         "purchases_by_date_range_detail": "",
         "purchases_by_date_range_summary": "",
         "purchases_by_ro_detail_date": "",

client/src/translations/fr/common.json

@@ -380,11 +380,11 @@
         "md_parts_order_comment": "",
         "md_parts_scan": {
           "caseInsensitive": "",
-					"expression": "",
-					"field": "",
+          "expression": "",
+          "field": "",
           "flags": "",
-					"operation": "",
-					"value": ""
+          "operation": "",
+          "value": ""
         },
         "md_payment_types": "",
         "md_referral_sources": "",
@@ -715,15 +715,15 @@
         "workingdays": ""
       },
       "operations": {
-				"contains": "",
-				"ends_with": "",
-				"equals": "",
-				"greater_than": "",
-				"less_than": "",
-				"not_equals": "",
-				"starts_with": ""
-			},
-			"successes": {
+        "contains": "",
+        "ends_with": "",
+        "equals": "",
+        "greater_than": "",
+        "less_than": "",
+        "not_equals": "",
+        "starts_with": ""
+      },
+      "successes": {
         "areyousure": "",
         "defaultviewcreated": "",
         "save": "",
@@ -1437,13 +1437,13 @@
         "adjustment": "",
         "ah_detail_line": "",
         "alt_partno": "",
-				"amount": "",
+        "amount": "",
         "assigned_team": "",
         "assigned_team_name": "",
         "create_ppc": "",
         "db_price": "Prix de la base de données",
         "include_in_part_cnt": "",
-				"lbr_types": {
+        "lbr_types": {
           "LA1": "",
           "LA2": "",
           "LA3": "",
@@ -3082,7 +3082,7 @@
         "purchase_return_ratio_grouped_by_vendor_summary": "",
         "purchases_by_cost_center_detail": "",
         "purchases_by_cost_center_summary": "",
-				"purchases_by_date_excel": "",
+        "purchases_by_date_excel": "",
         "purchases_by_date_range_detail": "",
         "purchases_by_date_range_summary": "",
         "purchases_by_ro_detail_date": "",

hasura/migrations/1737395115733_resolve_notification_settings_default_value/down.sql

@@ -0,0 +1,3 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."associations" alter column "notification_settings" set default jsonb_build_object();

hasura/migrations/1737395115733_resolve_notification_settings_default_value/up.sql

@@ -0,0 +1 @@
+alter table "public"."associations" alter column "notification_settings" set default jsonb_build_object();

server/job/job-totals-USA.js

@@ -818,6 +818,7 @@ function CalculateTaxesTotals(job, otherTotals) {
     PAG: Dinero(),
     PAO: Dinero(),
     PAS: Dinero(),
+    PASL: Dinero(),
     PAP: Dinero(),
     PAM: Dinero(),