Merge branch 'master-AIO' into feature/IO-3001-us-est-scrubbing

client/src/components/dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx

@@ -1,10 +1,10 @@
 import { Card, Table, Tag } from "antd";
-import LoadingSkeleton from "../../loading-skeleton/loading-skeleton.component";
-import { useTranslation } from "react-i18next";
-import React, { useEffect, useState } from "react";
-import dayjs from "../../../utils/day";
-import DashboardRefreshRequired from "../refresh-required.component";
 import axios from "axios";
+import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import dayjs from "../../../utils/day";
+import LoadingSkeleton from "../../loading-skeleton/loading-skeleton.component";
+import DashboardRefreshRequired from "../refresh-required.component";
 
 const fortyFiveDaysAgo = () => dayjs().subtract(45, "day").toLocaleString();
 
@@ -46,6 +46,11 @@ export default function JobLifecycleDashboardComponent({ data, bodyshop, ...card
       dataIndex: "humanReadable",
       key: "humanReadable"
     },
+    {
+      title: t("job_lifecycle.columns.average_human_readable"),
+      dataIndex: "averageHumanReadable",
+      key: "averageHumanReadable"
+    },
     {
       title: t("job_lifecycle.columns.status_count"),
       key: "statusCount",

client/src/components/form-date-time-picker/form-date-time-picker.component.jsx

@@ -1,4 +1,4 @@
-import { DatePicker } from "antd";
+import { DatePicker, Space, TimePicker } from "antd";
 import PropTypes from "prop-types";
 import React, { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -20,6 +20,7 @@ const DateTimePicker = ({
   onlyFuture,
   onlyToday,
   isDateOnly = false,
+  isSeparatedTime = false,
   bodyshop,
   ...restProps
 }) => {
@@ -87,24 +88,57 @@ const DateTimePicker = ({
 
   return (
     <div onKeyDown={handleKeyDown} id={id} style={{ width: "100%" }}>
-      <DatePicker
-        showTime={
-          isDateOnly
-            ? false
-            : {
-                format: "hh:mm a",
-                minuteStep: 15,
-                defaultValue: dayjs(dayjs(), "HH:mm:ss")
-              }
-        }
-        format={isDateOnly ? "MM/DD/YYYY" : "MM/DD/YYYY hh:mm a"}
-        value={value ? dayjs(value) : null}
-        onChange={handleChange}
-        placeholder={isDateOnly ? t("general.labels.date") : t("general.labels.datetime")}
-        onBlur={onBlur || handleBlur}
-        disabledDate={handleDisabledDate}
-        {...restProps}
-      />
+      {isSeparatedTime && (
+        <Space direction="vertical" style={{ width: "100%" }}>
+          <DatePicker
+            showTime={false}
+            format="MM/DD/YYYY"
+            value={value ? dayjs(value) : null}
+            onChange={handleChange}
+            placeholder={t("general.labels.date")}
+            onBlur={handleBlur}
+            disabledDate={handleDisabledDate}
+            isDateOnly={true}
+            {...restProps}
+          />
+          {value && (
+            <TimePicker
+              format="hh:mm a"
+              minuteStep={15}
+              defaultOpenValue={dayjs(value)
+                .hour(dayjs().hour())
+                .minute(Math.floor(dayjs().minute() / 15) * 15)
+                .second(0)}
+              onChange={(value) => {
+                handleChange(value);
+                onBlur();
+              }}
+              placeholder={t("general.labels.time")}
+              {...restProps}
+            />
+          )}
+        </Space>
+      )}
+      {!isSeparatedTime && (
+        <DatePicker
+          showTime={
+            isDateOnly
+              ? false
+              : {
+                  format: "hh:mm a",
+                  minuteStep: 15,
+                  defaultValue: dayjs(dayjs(), "HH:mm:ss")
+                }
+          }
+          format={isDateOnly ? "MM/DD/YYYY" : "MM/DD/YYYY hh:mm a"}
+          value={value ? dayjs(value) : null}
+          onChange={handleChange}
+          placeholder={isDateOnly ? t("general.labels.date") : t("general.labels.datetime")}
+          onBlur={onBlur || handleBlur}
+          disabledDate={handleDisabledDate}
+          {...restProps}
+        />
+      )}
     </div>
   );
 };
@@ -116,7 +150,8 @@ DateTimePicker.propTypes = {
   id: PropTypes.string,
   onlyFuture: PropTypes.bool,
   onlyToday: PropTypes.bool,
-  isDateOnly: PropTypes.bool
+  isDateOnly: PropTypes.bool,
+  isSeparatedTime: PropTypes.bool
 };
 
 export default connect(mapStateToProps, null)(DateTimePicker);

client/src/components/job-detail-lines/job-lines.component.jsx

@@ -118,8 +118,7 @@ export function JobLinesComponent({
           ...(record.critical ? { boxShadow: " -.5em 0 0 #FFC107" } : {})
         }
       }),
-      sortOrder: state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
-      ellipsis: true
+      sortOrder: state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order
     },
     {
       title: t("joblines.fields.oem_partno"),

client/src/components/job-line-note-popup/job-line-note-popup.component.jsx

@@ -45,7 +45,8 @@ export default function JobLineNotePopup({ jobline, disabled }) {
   if (editing)
     return (
       <div>
-        <Input
+        <Input.TextArea
+          autoSize
           autoFocus
           suffix={loading ? <LoadingSpinner /> : null}
           value={note}

client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx

@@ -1,10 +1,10 @@
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Form, Input, InputNumber, Modal, Select, Switch } from "antd";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import InputCurrency from "../form-items-formatted/currency-form-item.component";
-import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import JoblinesPreset from "../job-lines-preset-button/job-lines-preset-button.component";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -61,7 +61,7 @@ export function JobLinesUpsertModalComponent({ bodyshop, open, jobLine, handleCa
             ]}
             name="line_desc"
           >
-            <Input />
+            <Input.TextArea autoSize />
           </Form.Item>
           <JoblinesPreset form={form} />
         </LayoutFormRow>

client/src/components/job-totals-table/job-totals.table.totals.component.jsx

@@ -177,11 +177,32 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
         total: job.job_totals.totals.custPayable.dep_taxes
       },
 
-      {
-        key: t("jobs.labels.total_cust_payable"),
-        total: job.job_totals.totals.custPayable.total,
-        bold: true
-      },
+      ...(bodyshop.intellipay_config?.enable_cash_discount
+        ? [
+            {
+              key: t("jobs.labels.total_cust_payable_cash_discount"),
+              total: job.job_totals.totals.custPayable.total,
+              bold: true
+            },
+            {
+              key: t("jobs.labels.total_cust_payable"),
+              total: Dinero(job.job_totals.totals.custPayable.total)
+                .add(
+                  Dinero(job.job_totals.totals.custPayable.total).percentage(
+                    bodyshop.intellipay_config?.cash_discount_percentage || 0
+                  )
+                )
+                .toJSON(),
+              bold: true
+            }
+          ]
+        : [
+            {
+              key: t("jobs.labels.total_cust_payable"),
+              total: job.job_totals.totals.custPayable.total,
+              bold: true
+            }
+          ]),
       {
         key: t("jobs.labels.net_repairs"),
         total: job.job_totals.totals.net_repairs,

client/src/components/jobs-detail-general/jobs-detail-general.component.jsx

@@ -5,6 +5,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import FormItemPhone, { PhoneItemFormatterValidation } from "../form-items-formatted/phone-form-item.component";
@@ -12,7 +13,6 @@ import Car from "../job-damage-visual/job-damage-visual.component";
 import JobsDetailChangeEstimator from "../jobs-detail-change-estimator/jobs-detail-change-estimator.component";
 import JobsDetailChangeFileHandler from "../jobs-detail-change-filehandler/jobs-detail-change-filehandler.component";
 import FormRow from "../layout-form-row/layout-form-row.component";
-import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -185,6 +185,9 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
             <Form.Item label={t("jobs.fields.towin")} name="towin" valuePropName="checked">
               <Switch disabled={jobRO} />
             </Form.Item>
+            <Form.Item label={t("jobs.fields.tlos_ind")} name="tlos_ind" valuePropName="checked">
+              <Switch disabled={jobRO} />
+            </Form.Item>
           </FormRow>
         </Col>
         <Col {...lossColDamage}>

client/src/components/schedule-job-modal/schedule-job-modal.component.jsx

@@ -1,6 +1,5 @@
 import { Button, Col, Form, Input, Row, Select, Space, Switch, Typography } from "antd";
 import axios from "axios";
-import dayjs from "../../utils/day";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -8,13 +7,14 @@ import { createStructuredSelector } from "reselect";
 import { calculateScheduleLoad } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateFormatter } from "../../utils/DateFormatter";
+import dayjs from "../../utils/day";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 import EmailInput from "../form-items-formatted/email-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import ScheduleDayViewContainer from "../schedule-day-view/schedule-day-view.container";
 import ScheduleExistingAppointmentsList from "../schedule-existing-appointments-list/schedule-existing-appointments-list.component";
 import "./schedule-job-modal.scss";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -84,7 +84,7 @@ export function ScheduleJobModalComponent({
               }
             ]}
           >
-            <DateTimePicker onBlur={handleDateBlur} onlyFuture />
+            <DateTimePicker onBlur={handleDateBlur} onlyFuture isSeparatedTime />
           </Form.Item>
           <Form.Item
             name="scheduled_completion"

client/src/components/shop-info/shop-info.component.jsx

@@ -142,7 +142,7 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
       rome: [
         {
           key: "intellipay",
-          label: t("bodyshop.labels.intellipay"),
+          label: InstanceRenderManager({ rome: t("bodyshop.labels.romepay"), imex: t("bodyshop.labels.imexpay") }),
           children: <ShopInfoIntellipay form={form} />
         }
       ],

client/src/components/shop-info/shop-info.general.component.jsx

@@ -676,7 +676,7 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                           }
                         ]}
                       >
-                        <Input.TextArea rows={3} />
+                        <Input.TextArea autoSize />
                       </Form.Item>
                       <Space wrap>
                         <DeleteFilled
@@ -737,7 +737,7 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                           }
                         ]}
                       >
-                        <Input.TextArea rows={3} />
+                        <Input.TextArea autoSize />
                       </Form.Item>
                       <Space wrap>
                         <DeleteFilled
@@ -1187,7 +1187,7 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                         key={`${index}line_desc`}
                         name={[field.name, "line_desc"]}
                       >
-                        <Input />
+                        <Input.TextArea autoSize />
                       </Form.Item>
                       <Form.Item
                         label={t("joblines.fields.mod_lbr_ty")}
@@ -1330,7 +1330,7 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                           }
                         ]}
                       >
-                        <Input />
+                        <Input.TextArea autoSize />
                       </Form.Item>
 
                       <Space wrap>

client/src/components/shop-info/shop-intellipay-config.component.jsx

@@ -39,14 +39,13 @@ export function ShopInfoIntellipay({ bodyshop, form }) {
         </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.intellipay_config.cash_discount_percentage")}
-          valuePropName="checked"
           dependencies={[["intellipay_config", "enable_cash_discount"]]}
           name={["intellipay_config", "cash_discount_percentage"]}
           rules={[
             ({ getFieldsValue }) => ({ required: form.getFieldValue(["intellipay_config", "enable_cash_discount"]) })
           ]}
         >
-          <InputNumber min={0} max={100} precision={1} suffix='%'/>
+          <InputNumber min={0} max={100} precision={1} suffix="%" />
         </Form.Item>
       </LayoutFormRow>
     </>

client/src/contexts/SocketIO/useSocket.js

@@ -1,8 +1,9 @@
-import { useEffect, useState, useRef } from "react";
+import { useEffect, useRef, useState } from "react";
 import SocketIO from "socket.io-client";
 import { auth } from "../../firebase/firebase.utils";
 import { store } from "../../redux/store";
-import { setWssStatus } from "../../redux/application/application.actions";
+import { addAlerts, setWssStatus } from "../../redux/application/application.actions";
+
 const useSocket = (bodyshop) => {
   const socketRef = useRef(null);
   const [clientId, setClientId] = useState(null);
@@ -31,6 +32,14 @@ const useSocket = (bodyshop) => {
           socketRef.current = socketInstance;
 
           const handleBodyshopMessage = (message) => {
+            if (!message || !message?.type) return;
+
+            switch (message.type) {
+              case "alert-update":
+                store.dispatch(addAlerts(message.payload));
+                break;
+            }
+
             if (!import.meta.env.DEV) return;
             console.log(`Received message for bodyshop ${bodyshop.id}:`, message);
           };
@@ -39,22 +48,22 @@ const useSocket = (bodyshop) => {
             console.log("Socket connected:", socketInstance.id);
             socketInstance.emit("join-bodyshop-room", bodyshop.id);
             setClientId(socketInstance.id);
-            store.dispatch(setWssStatus("connected"))
+            store.dispatch(setWssStatus("connected"));
           };
 
           const handleReconnect = (attempt) => {
             console.log(`Socket reconnected after ${attempt} attempts`);
-            store.dispatch(setWssStatus("connected"))
+            store.dispatch(setWssStatus("connected"));
           };
 
           const handleConnectionError = (err) => {
             console.error("Socket connection error:", err);
-            store.dispatch(setWssStatus("error"))
+            store.dispatch(setWssStatus("error"));
           };
 
           const handleDisconnect = () => {
             console.log("Socket disconnected");
-            store.dispatch(setWssStatus("disconnected"))
+            store.dispatch(setWssStatus("disconnected"));
           };
 
           socketInstance.on("connect", handleConnect);

client/src/firebase/firebase.utils.js

@@ -81,14 +81,14 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
     user: (state.user && state.user.currentUser && state.user.currentUser.email) || null,
     ...additionalParams
   };
-  axios.post("/ioevent", {
-    useremail: (state.user && state.user.currentUser && state.user.currentUser.email) || null,
-    bodyshopid: (state.user && state.user.bodyshop && state.user.bodyshop.id) || null,
-    operationName: eventName,
-    variables: additionalParams,
-    dbevent: false,
-    env: `master-AIO|${import.meta.env.VITE_APP_GIT_SHA_DATE}`
-  });
+  // axios.post("/ioevent", {
+  //   useremail: (state.user && state.user.currentUser && state.user.currentUser.email) || null,
+  //   bodyshopid: (state.user && state.user.bodyshop && state.user.bodyshop.id) || null,
+  //   operationName: eventName,
+  //   variables: additionalParams,
+  //   dbevent: false,
+  //   env: `master-AIO|${import.meta.env.VITE_APP_GIT_SHA_DATE}`
+  // });
   // console.log(
   //   "%c[Analytics]",
   //   "background-color: green ;font-weight:bold;",

client/src/graphql/jobs.queries.js

@@ -692,6 +692,7 @@ export const GET_JOB_BY_PK = gql`
       tax_str_rt
       tax_sub_rt
       tax_tow_rt
+      tlos_ind
       towin
       towing_payable
       unit_number

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

@@ -1,4 +1,4 @@
-import { FloatButton, Layout, Spin } from "antd";
+import { FloatButton, Layout, notification, Spin } from "antd";
 // import preval from "preval.macro";
 import React, { lazy, Suspense, useContext, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -21,11 +21,12 @@ import ShopSubStatusComponent from "../../components/shop-sub-status/shop-sub-st
 import { requestForToken } from "../../firebase/firebase.utils";
 import SocketContext from "../../contexts/SocketIO/socketContext.jsx";
 import { selectBodyshop, selectInstanceConflict } from "../../redux/user/user.selectors";
-
 import UpdateAlert from "../../components/update-alert/update-alert.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
 import "./manage.page.styles.scss";
 import WssStatusDisplayComponent from "../../components/wss-status-display/wss-status-display.component.jsx";
+import { selectAlerts } from "../../redux/application/application.selectors.js";
+import { addAlerts } from "../../redux/application/application.actions.js";
 
 const JobsPage = lazy(() => import("../jobs/jobs.page"));
 
@@ -104,16 +105,80 @@ const { Content, Footer } = Layout;
 
 const mapStateToProps = createStructuredSelector({
   conflict: selectInstanceConflict,
-  bodyshop: selectBodyshop
+  bodyshop: selectBodyshop,
+  alerts: selectAlerts
 });
 
-const mapDispatchToProps = (dispatch) => ({});
+const ALERT_FILE_URL = InstanceRenderManager({
+  imex: "https://images.imex.online/alerts/alerts-imex.json",
+  rome: "https://images.imex.online/alerts/alerts-rome.json"
+});
 
-export function Manage({ conflict, bodyshop }) {
+const mapDispatchToProps = (dispatch) => ({
+  setAlerts: (alerts) => dispatch(addAlerts(alerts))
+});
+
+export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
   const { t } = useTranslation();
   const [chatVisible] = useState(false);
   const { socket, clientId } = useContext(SocketContext);
 
+  // State to track displayed alerts
+  const [displayedAlertIds, setDisplayedAlertIds] = useState([]);
+
+  // Fetch displayed alerts from localStorage on mount
+  useEffect(() => {
+    const displayedAlerts = JSON.parse(localStorage.getItem("displayedAlerts") || "[]");
+    setDisplayedAlertIds(displayedAlerts);
+  }, []);
+
+  // Fetch alerts from the JSON file and dispatch to Redux store
+  useEffect(() => {
+    const fetchAlerts = async () => {
+      try {
+        const response = await fetch(ALERT_FILE_URL);
+        const fetchedAlerts = await response.json();
+        setAlerts(fetchedAlerts);
+      } catch (error) {
+        console.error("Error fetching alerts:", error);
+      }
+    };
+
+    fetchAlerts();
+  }, []);
+
+  // Use useEffect to watch for new alerts
+  useEffect(() => {
+    if (alerts && Object.keys(alerts).length > 0) {
+      // Convert the alerts object into an array
+      const alertArray = Object.values(alerts);
+
+      // Filter out alerts that have already been dismissed
+      const newAlerts = alertArray.filter((alert) => !displayedAlertIds.includes(alert.id));
+
+      newAlerts.forEach((alert) => {
+        // Display the notification
+        notification.open({
+          key: "notification-alerts-" + alert.id,
+          message: alert.message,
+          description: alert.description,
+          type: alert.type || "info",
+          duration: 0,
+          placement: "bottomRight",
+          closable: true,
+          onClose: () => {
+            // When the notification is closed, update displayed alerts state and localStorage
+            setDisplayedAlertIds((prevIds) => {
+              const updatedIds = [...prevIds, alert.id];
+              localStorage.setItem("displayedAlerts", JSON.stringify(updatedIds));
+              return updatedIds;
+            });
+          }
+        });
+      });
+    }
+  }, [alerts, displayedAlertIds]);
+
   useEffect(() => {
     const widgetId = InstanceRenderManager({
       imex: "IABVNO4scRKY11XBQkNr",

client/src/redux/application/application.actions.js

@@ -67,6 +67,12 @@ export const setUpdateAvailable = (isUpdateAvailable) => ({
   type: ApplicationActionTypes.SET_UPDATE_AVAILABLE,
   payload: isUpdateAvailable
 });
+
+export const addAlerts = (alerts) => ({
+  type: ApplicationActionTypes.ADD_ALERTS,
+  payload: alerts
+});
+
 export const setWssStatus = (status) => ({
   type: ApplicationActionTypes.SET_WSS_STATUS,
   payload: status

client/src/redux/application/application.reducer.js

@@ -15,7 +15,8 @@ const INITIAL_STATE = {
     error: null
   },
   jobReadOnly: false,
-  partnerVersion: null
+  partnerVersion: null,
+  alerts: {}
 };
 
 const applicationReducer = (state = INITIAL_STATE, action) => {
@@ -91,6 +92,18 @@ const applicationReducer = (state = INITIAL_STATE, action) => {
     case ApplicationActionTypes.SET_WSS_STATUS: {
       return { ...state, wssStatus: action.payload };
     }
+
+    case ApplicationActionTypes.ADD_ALERTS: {
+      const newAlertsMap = { ...state.alerts };
+
+      action.payload.alerts.forEach((alert) => {
+        newAlertsMap[alert.id] = alert;
+      });
+      return {
+        ...state,
+        alerts: newAlertsMap
+      };
+    }
     default:
       return state;
   }

client/src/redux/application/application.selectors.js

@@ -23,3 +23,4 @@ export const selectOnline = createSelector([selectApplication], (application) =>
 export const selectProblemJobs = createSelector([selectApplication], (application) => application.problemJobs);
 export const selectUpdateAvailable = createSelector([selectApplication], (application) => application.updateAvailable);
 export const selectWssStatus = createSelector([selectApplication], (application) => application.wssStatus);
+export const selectAlerts = createSelector([selectApplication], (application) => application.alerts);

client/src/redux/application/application.types.js

@@ -13,6 +13,7 @@ const ApplicationActionTypes = {
   INSERT_AUDIT_TRAIL: "INSERT_AUDIT_TRAIL",
   SET_PROBLEM_JOBS: "SET_PROBLEM_JOBS",
   SET_UPDATE_AVAILABLE: "SET_UPDATE_AVAILABLE",
-  SET_WSS_STATUS: "SET_WSS_STATUS"
+  SET_WSS_STATUS: "SET_WSS_STATUS",
+  ADD_ALERTS: "ADD_ALERTS"
 };
 export default ApplicationActionTypes;

client/src/translations/en_us/common.json

@@ -665,9 +665,9 @@
 				"employees": "Employees",
 				"estimators": "Estimators",
 				"filehandlers": "Adjusters",
+				"imexpay": "ImEX Pay",
 				"insurancecos": "Insurance Companies",
 				"intakechecklist": "Intake Checklist",
-				"intellipay": "IntelliPay",
 				"intellipay_cash_discount": "Please ensure that cash discounting has been enabled on your merchant account. Reach out to IntelliPay Support if you need assistance. ",
 				"jobstatuses": "Job Statuses",
 				"laborrates": "Labor Rates",
@@ -700,6 +700,7 @@
 				"roguard": {
 					"title": "RO Guard"
 				},
+				"romepay": "Rome Pay",
 				"scheduling": "SMART Scheduling",
 				"scoreboardsetup": "Scoreboard Setup",
 				"shopinfo": "Shop Information",
@@ -1256,6 +1257,7 @@
 				"sunday": "Sunday",
 				"text": "Text",
 				"thursday": "Thursday",
+				"time": "Select Time",
 				"total": "Total",
 				"totals": "Totals",
 				"tuesday": "Tuesday",
@@ -1340,6 +1342,8 @@
 		},
 		"job_lifecycle": {
 			"columns": {
+				"average_human_readable": "Average Human Readable",
+				"average_value": "Average Value",
 				"duration": "Duration",
 				"end": "End",
 				"human_readable": "Human Readable",
@@ -1873,6 +1877,7 @@
 				"tax_str_rt": "Storage Tax Rate",
 				"tax_sub_rt": "Sublet Tax Rate",
 				"tax_tow_rt": "Towing Tax Rate",
+				"tlos_ind": "Total Loss Indicator",
 				"towin": "Tow In",
 				"towing_payable": "Towing Payable",
 				"unitnumber": "Unit #",
@@ -2107,6 +2112,7 @@
 				"threshhold": "Max Threshold: ${{amount}}",
 				"total_cost": "Total Cost",
 				"total_cust_payable": "Total Customer Amount Payable",
+				"total_cust_payable_cash_discount": "$t(jobs.labels.total_cust_payable) (Cash Discounted)",
 				"total_repairs": "Total Repairs",
 				"total_sales": "Total Sales",
 				"total_sales_tax": "Total Sales Tax",

client/src/translations/es/common.json

@@ -665,9 +665,9 @@
 				"employees": "",
 				"estimators": "",
 				"filehandlers": "",
+				"imexpay": "",
 				"insurancecos": "",
 				"intakechecklist": "",
-				"intellipay": "",
 				"intellipay_cash_discount": "",
 				"jobstatuses": "",
 				"laborrates": "",
@@ -700,6 +700,7 @@
 				"roguard": {
 					"title": ""
 				},
+				"romepay": "",
 				"scheduling": "",
 				"scoreboardsetup": "",
 				"shopinfo": "",
@@ -1256,6 +1257,7 @@
 				"sunday": "",
 				"text": "",
 				"thursday": "",
+				"time": "",
 				"total": "",
 				"totals": "",
 				"tuesday": "",
@@ -1340,6 +1342,8 @@
 		},
 		"job_lifecycle": {
 			"columns": {
+				"average_human_readable": "",
+				"average_value": "",
 				"duration": "",
 				"end": "",
 				"human_readable": "",
@@ -1873,6 +1877,7 @@
 				"tax_str_rt": "",
 				"tax_sub_rt": "",
 				"tax_tow_rt": "",
+				"tlos_ind": "",
 				"towin": "",
 				"towing_payable": "Remolque a pagar",
 				"unitnumber": "Unidad #",
@@ -2107,6 +2112,7 @@
 				"threshhold": "",
 				"total_cost": "",
 				"total_cust_payable": "",
+				"total_cust_payable_cash_discount": "",
 				"total_repairs": "",
 				"total_sales": "",
 				"total_sales_tax": "",

client/src/translations/fr/common.json

@@ -665,9 +665,9 @@
 				"employees": "",
 				"estimators": "",
 				"filehandlers": "",
+				"imexpay": "",
 				"insurancecos": "",
 				"intakechecklist": "",
-				"intellipay": "",
 				"intellipay_cash_discount": "",
 				"jobstatuses": "",
 				"laborrates": "",
@@ -700,6 +700,7 @@
 				"roguard": {
 					"title": ""
 				},
+				"romepay": "",
 				"scheduling": "",
 				"scoreboardsetup": "",
 				"shopinfo": "",
@@ -1256,6 +1257,7 @@
 				"sunday": "",
 				"text": "",
 				"thursday": "",
+				"time": "",
 				"total": "",
 				"totals": "",
 				"tuesday": "",
@@ -1340,6 +1342,8 @@
 		},
 		"job_lifecycle": {
 			"columns": {
+				"average_human_readable": "",
+				"average_value": "",
 				"duration": "",
 				"end": "",
 				"human_readable": "",
@@ -1873,6 +1877,7 @@
 				"tax_str_rt": "",
 				"tax_sub_rt": "",
 				"tax_tow_rt": "",
+				"tlos_ind": "",
 				"towin": "",
 				"towing_payable": "Remorquage à payer",
 				"unitnumber": "Unité #",
@@ -2107,6 +2112,7 @@
 				"threshhold": "",
 				"total_cost": "",
 				"total_cust_payable": "",
+				"total_cust_payable_cash_discount": "",
 				"total_repairs": "",
 				"total_sales": "",
 				"total_sales_tax": "",