Merged in feature/IO-3398-bill-line-select-display (pull request #2638)

IO-3398 Bill line search select will now show price in select value.

client/src/App/App.container.jsx

@@ -12,6 +12,7 @@ import GlobalLoadingBar from "../components/global-loading-bar/global-loading-ba
 import { setDarkMode } from "../redux/application/application.actions";
 import { selectDarkMode } from "../redux/application/application.selectors";
 import { selectCurrentUser } from "../redux/user/user.selectors.js";
+import { signOutStart } from "../redux/user/user.actions";
 import client from "../utils/GraphQLClient";
 import App from "./App";
 import getTheme from "./themeProvider";
@@ -20,14 +21,13 @@ import getTheme from "./themeProvider";
 const config = {
   core: {
     authorizationKey: import.meta.env.VITE_APP_SPLIT_API,
-    key: "anon" // Default key, overridden dynamically by SplitClientProvider
+    key: "anon"
   }
 };
 
-// Custom provider to manage the Split client key based on imexshopid from Redux
 function SplitClientProvider({ children }) {
-  const imexshopid = useSelector((state) => state.user.imexshopid); // Access imexshopid from Redux store
+  const imexshopid = useSelector((state) => state.user.imexshopid);
-  const splitClient = useSplitClient({ key: imexshopid || "anon" }); // Use imexshopid or fallback to "anon"
+  const splitClient = useSplitClient({ key: imexshopid || "anon" });
   useEffect(() => {
     if (splitClient && imexshopid) {
       console.log(`Split client initialized with key: ${imexshopid}, isReady: ${splitClient.isReady}`);
@@ -36,40 +36,66 @@ function SplitClientProvider({ children }) {
   return children;
 }
 
-const mapDispatchToProps = (dispatch) => ({
-  setDarkMode: (isDarkMode) => dispatch(setDarkMode(isDarkMode))
-});
-
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser
 });
 
-function AppContainer({ currentUser, setDarkMode }) {
+const mapDispatchToProps = (dispatch) => ({
+  setDarkMode: (isDarkMode) => dispatch(setDarkMode(isDarkMode)),
+  signOutStart: () => dispatch(signOutStart())
+});
+
+function AppContainer({ currentUser, setDarkMode, signOutStart }) {
   const { t } = useTranslation();
   const isDarkMode = useSelector(selectDarkMode);
   const theme = useMemo(() => getTheme(isDarkMode), [isDarkMode]);
 
-  // Update data-theme attribute when dark mode changes
+  // Global seamless logout listener with redirect to /signin
+  useEffect(() => {
+    const handleSeamlessLogout = (event) => {
+      if (event.data?.type !== "seamlessLogoutRequest") return;
+
+      const requestOrigin = event.origin;
+
+      if (currentUser?.authorized !== true) {
+        window.parent.postMessage(
+          { type: "seamlessLogoutResponse", status: "already_logged_out" },
+          requestOrigin || "*"
+        );
+        return;
+      }
+
+      signOutStart();
+      window.parent.postMessage({ type: "seamlessLogoutResponse", status: "logged_out" }, requestOrigin || "*");
+    };
+
+    window.addEventListener("message", handleSeamlessLogout);
+    return () => {
+      window.removeEventListener("message", handleSeamlessLogout);
+    };
+  }, [signOutStart, currentUser]);
+
+  // Update data-theme attribute
   useEffect(() => {
     document.documentElement.setAttribute("data-theme", isDarkMode ? "dark" : "light");
     return () => document.documentElement.removeAttribute("data-theme");
   }, [isDarkMode]);
 
-  // Sync Redux darkMode with localStorage on user change
+  // Sync darkMode with localStorage
   useEffect(() => {
     if (currentUser?.uid) {
       const savedMode = localStorage.getItem(`dark-mode-${currentUser.uid}`);
       if (savedMode !== null) {
         setDarkMode(JSON.parse(savedMode));
       } else {
-        setDarkMode(false); // default to light mode
+        setDarkMode(false);
       }
     } else {
       setDarkMode(false);
     }
-  }, [currentUser?.uid]);
+  }, [currentUser?.uid, setDarkMode]);
 
-  // Persist darkMode to localStorage when it or user changes
+  // Persist darkMode
   useEffect(() => {
     if (currentUser?.uid) {
       localStorage.setItem(`dark-mode-${currentUser.uid}`, JSON.stringify(isDarkMode));

client/src/components/bill-form/bill-form.lines.component.jsx

@@ -45,7 +45,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.fields.jobline"),
         dataIndex: "joblineid",
         editable: true,
-        width: "20rem",
+        minWidth: "10rem",
         formItemProps: (field) => {
           return {
             key: `${field.index}joblinename`,
@@ -71,9 +71,9 @@ export function BillEnterModalLinesComponent({
             disabled={disabled}
             options={lineData}
             style={{
-              width: "20rem",
+              //width: "10rem",
-              maxWidth: "20rem",
+              // maxWidth: "20rem",
-              minWidth: "10rem",
+              minWidth: "20rem",
               whiteSpace: "normal",
               height: "auto",
               minHeight: "32px" // default height of Ant Design inputs
@@ -110,7 +110,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.fields.line_desc"),
         dataIndex: "line_desc",
         editable: true,
-        width: "20rem",
+        minWidth: "10rem",
         formItemProps: (field) => {
           return {
             key: `${field.index}line_desc`,
@@ -232,7 +232,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.fields.actual_cost"),
         dataIndex: "actual_cost",
         editable: true,
-        width: "8rem",
+        width: "10rem",
 
         formItemProps: (field) => {
           return {
@@ -357,6 +357,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.labels.deductedfromlbr"),
         dataIndex: "deductedfromlbr",
         editable: true,
+        width: "40px",
         formItemProps: (field) => {
           return {
             valuePropName: "checked",
@@ -464,7 +465,7 @@ export function BillEnterModalLinesComponent({
             title: t("billlines.fields.federal_tax_applicable"),
             dataIndex: "applicable_taxes.federal",
             editable: true,
-
+            width: "40px",
             formItemProps: (field) => {
               return {
                 key: `${field.index}fedtax`,
@@ -485,7 +486,7 @@ export function BillEnterModalLinesComponent({
         title: t("billlines.fields.state_tax_applicable"),
         dataIndex: "applicable_taxes.state",
         editable: true,
-
+        width: "40px",
         formItemProps: (field) => {
           return {
             key: `${field.index}statetax`,
@@ -503,7 +504,7 @@ export function BillEnterModalLinesComponent({
             title: t("billlines.fields.local_tax_applicable"),
             dataIndex: "applicable_taxes.local",
             editable: true,
-
+            width: "40px",
             formItemProps: (field) => {
               return {
                 key: `${field.index}localtax`,

client/src/components/bill-line-search-select/bill-line-search-select.component.jsx

@@ -39,30 +39,32 @@ const BillLineSearchSelect = ({ options, disabled, allowRemoved, ...restProps },
           style: {
             ...(item.removed ? { textDecoration: "line-through" } : {})
           },
-          name: `${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
+          name: generateLineName(item),
-            item.oem_partno ? ` - ${item.oem_partno}` : ""
+          label: generateLineName(item)
-          }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim(),
-          label: (
-            <div style={{ whiteSpace: "normal", wordBreak: "break-word" }}>
-              <span>
-                {`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
-                  item.oem_partno ? ` - ${item.oem_partno}` : ""
-                }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim()}
-              </span>
-              {InstanceRenderMgr({
-                rome: item.act_price === 0 && item.mod_lb_hrs > 0 && (
-                  <span style={{ float: "right", paddingleft: "1rem" }}>{`${item.mod_lb_hrs} units`}</span>
-                )
-              })}
-              <span style={{ float: "right", paddingleft: "1rem" }}>
-                {item.act_price ? `$${item.act_price && item.act_price.toFixed(2)}` : ``}
-              </span>
-            </div>
-          )
         }))
       ]}
       {...restProps}
     ></Select>
   );
 };
+
+function generateLineName(item) {
+  return (
+    <div style={{ whiteSpace: "normal", wordBreak: "break-word" }}>
+      <span>
+        {`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
+          item.oem_partno ? ` - ${item.oem_partno}` : ""
+        }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim()}
+      </span>
+      {InstanceRenderMgr({
+        rome: item.act_price === 0 && item.mod_lb_hrs > 0 && (
+          <span style={{ float: "right", paddingleft: "1rem" }}>{`${item.mod_lb_hrs} units`}</span>
+        )
+      })}
+      <span style={{ float: "right", paddingleft: "1rem" }}>
+        {item.act_price ? `$${item.act_price && item.act_price.toFixed(2)}` : ``}
+      </span>
+    </div>
+  );
+}
 export default forwardRef(BillLineSearchSelect);

client/src/components/dashboard-grid/dashboard-grid.component.jsx

@@ -196,7 +196,7 @@ export function DashboardGridComponent({ currentUser }) {
       <PageHeader
         extra={
           <Space>
-            <Button onClick={refetch}>
+            <Button onClick={() => refetch()}>
               <SyncOutlined />
             </Button>
             <Dropdown menu={menu} trigger={["click"]}>

server/accounting/qb-receivables-lines.js

@@ -919,16 +919,16 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
           FullName: responsibilityCenters.ttl_tax_adjustment?.accountitem
         },
         Desc: "Tax Adjustment",
-        Quantity: 1,
+        //Quantity: 1,
         Amount: Dinero(jobs_by_pk.job_totals.totals?.ttl_tax_adjustment).toFormat(DineroQbFormat),
-        SalesTaxCodeRef: InstanceManager({
+        // SalesTaxCodeRef: InstanceManager({
-          imex: {
+        //   imex: {
-            FullName: "E"
+        //     FullName: "E"
-          },
+        //   },
-          rome: {
+        //   rome: {
-            FullName: bodyshop.md_responsibility_centers.taxes.itemexemptcode || "NON"
+        //     FullName: bodyshop.md_responsibility_centers.taxes.itemexemptcode || "NON"
-          }
+        //   }
-        })
+        // })
       });
     }
   }

server/job/job-costing.js

@@ -405,7 +405,7 @@ function GenerateCostingData(job) {
             ) {
               const discountRate =
                 Math.abs(job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp) > 1
-                  ? job.parts_tax_rates_rates[val.part_type.toUpperCase()].prt_discp
+                  ? job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp
                   : job.parts_tax_rates[val.part_type.toUpperCase()].prt_discp * 100;
               const disc = partsAmount.percentage(discountRate).multiply(-1);
               partsAmount = partsAmount.add(disc);

server/job/job-totals-USA.js

@@ -24,7 +24,7 @@ exports.totalsSsu = async function (req, res) {
   const BearerToken = req.BearerToken;
   const client = req.userGraphQLClient;
 
-  logger.log("job-totals-ssu-USA", "DEBUG", req?.user?.email, id);
+  logger.log("job-totals-ssu-USA", "debug", req?.user?.email, id);
 
   try {
     const job = await client.setHeaders({ Authorization: BearerToken }).request(queries.GET_JOB_BY_PK, {
@@ -49,7 +49,7 @@ exports.totalsSsu = async function (req, res) {
 
     res.status(200).send();
   } catch (error) {
-    logger.log("job-totals-ssu-USA-error", "ERROR", req?.user?.email, id, {
+    logger.log("job-totals-ssu-USA-error", "error", req?.user?.email, id, {
       jobid: id,
       error: error.message,
       stack: error.stack
@@ -95,7 +95,7 @@ async function TotalsServerSide(req, res) {
         ret.totals.subtotal = ret.totals.subtotal.add(ret.totals.ttl_adjustment);
         ret.totals.total_repairs = ret.totals.total_repairs.add(ret.totals.ttl_adjustment);
         ret.totals.net_repairs = ret.totals.net_repairs.add(ret.totals.ttl_adjustment);
-        logger.log("job-totals-USA-ttl-adj", "DEBUG", null, job.id, {
+        logger.log("job-totals-USA-ttl-adj", "debug", null, job.id, {
           adjAmount: ttlDifference
         });
       }
@@ -116,7 +116,7 @@ async function TotalsServerSide(req, res) {
         ret.totals.ttl_tax_adjustment = Dinero({ amount: Math.round(ttlTaxDifference * 100) });
         ret.totals.total_repairs = ret.totals.total_repairs.add(ret.totals.ttl_tax_adjustment);
         ret.totals.net_repairs = ret.totals.net_repairs.add(ret.totals.ttl_tax_adjustment);
-        logger.log("job-totals-USA-ttl-tax-adj", "DEBUG", null, job.id, {
+        logger.log("job-totals-USA-ttl-tax-adj", "debug", null, job.id, {
           adjAmount: ttlTaxDifference
         });
       }
@@ -124,7 +124,7 @@ async function TotalsServerSide(req, res) {
 
     return ret;
   } catch (error) {
-    logger.log("job-totals-ssu-USA-error", "ERROR", req.user?.email, job.id, {
+    logger.log("job-totals-ssu-USA-error", "error", req.user?.email, job.id, {
       jobid: job.id,
       error: error.message,
       stack: error.stack
@@ -142,7 +142,7 @@ async function Totals(req, res) {
   const logger = req.logger;
   const client = req.userGraphQLClient;
 
-  logger.log("job-totals-ssu-USA", "DEBUG", req.user.email, job.id, {
+  logger.log("job-totals-ssu-USA", "debug", req.user.email, job.id, {
     jobid: job.id,
     id: id
   });
@@ -159,7 +159,7 @@ async function Totals(req, res) {
 
     res.status(200).json(ret);
   } catch (error) {
-    logger.log("job-totals-ssu-USA-error", "ERROR", req.user.email, job.id, {
+    logger.log("job-totals-ssu-USA-error", "error", req.user.email, job.id, {
       jobid: job.id,
       error: error.message,
       stack: error.stack
@@ -240,7 +240,7 @@ async function AtsAdjustmentsIfRequired({ job, client, user }) {
           job.joblines.push(newAtsLine);
         }
       } catch (error) {
-        logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
+        logger.log("job-totals-ssu-ats-error", "error", user?.email, job.id, {
           jobid: job.id,
           error: error.message,
           stack: error.stack
@@ -258,7 +258,7 @@ async function AtsAdjustmentsIfRequired({ job, client, user }) {
           job.joblines[atsLineIndex].act_price = atsAmount;
         }
       } catch (error) {
-        logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
+        logger.log("job-totals-ssu-ats-error", "error", user?.email, job.id, {
           jobid: job.id,
           atsLineIndex: atsLineIndex,
           atsAmount: atsAmount,
@@ -1055,7 +1055,7 @@ function CalculateTaxesTotals(job, otherTotals) {
         }
       }
     } catch (error) {
-      logger.log("job-totals-USA Key with issue", "error", null, job.id, {
+      logger.log("job-totals-USA Key with issue", "warn", null, job.id, {
         key: key,
         error: error.message,
         stack: error.stack

server/job/job-totals.js

@@ -23,7 +23,7 @@ exports.totalsSsu = async function (req, res) {
   const BearerToken = req.BearerToken;
   const client = req.userGraphQLClient;
 
-  logger.log("job-totals-ssu", "DEBUG", req.user.email, id, null);
+  logger.log("job-totals-ssu", "debug", req.user.email, id, null);
 
   try {
     const job = await client.setHeaders({ Authorization: BearerToken }).request(queries.GET_JOB_BY_PK, {
@@ -49,7 +49,7 @@ exports.totalsSsu = async function (req, res) {
 
     res.status(200).send();
   } catch (error) {
-    logger.log("job-totals-ssu-error", "ERROR", req.user.email, id, {
+    logger.log("job-totals-ssu-error", "error", req.user.email, id, {
       jobid: id,
       error: error.message,
       stack: error.stack
@@ -73,7 +73,7 @@ async function TotalsServerSide(req, res) {
 
     return ret;
   } catch (error) {
-    logger.log("job-totals-ssu-error", "ERROR", req?.user?.email, job.id, {
+    logger.log("job-totals-ssu-error", "error", req?.user?.email, job.id, {
       jobid: job.id,
       error: error.message,
       stack: error.stack
@@ -91,7 +91,7 @@ async function Totals(req, res) {
   const logger = req.logger;
   const client = req.userGraphQLClient;
 
-  logger.log("job-totals-ssu", "DEBUG", req.user.email, job.id, {
+  logger.log("job-totals-ssu", "debug", req.user.email, job.id, {
     jobid: job.id,
     id: id
   });
@@ -108,7 +108,7 @@ async function Totals(req, res) {
 
     res.status(200).json(ret);
   } catch (error) {
-    logger.log("job-totals-ssu-error", "ERROR", req.user.email, job.id, {
+    logger.log("job-totals-ssu-error", "error", req.user.email, job.id, {
       jobid: job.id,
       error: error.message,
       stack: error.stack
@@ -189,7 +189,7 @@ async function AtsAdjustmentsIfRequired({ job, client, user }) {
           job.joblines.push(newAtsLine);
         }
       } catch (error) {
-        logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
+        logger.log("job-totals-ssu-ats-error", "error", user?.email, job.id, {
           jobid: job.id,
           error: error.message,
           stack: error.stack
@@ -207,7 +207,7 @@ async function AtsAdjustmentsIfRequired({ job, client, user }) {
           job.joblines[atsLineIndex].act_price = atsAmount;
         }
       } catch (error) {
-        logger.log("job-totals-ssu-ats-error", "ERROR", user?.email, job.id, {
+        logger.log("job-totals-ssu-ats-error", "error", user?.email, job.id, {
           jobid: job.id,
           atsLineIndex: atsLineIndex,
           atsAmount: atsAmount,