IO-3582 Remove Unneeded Query - Data in billQuery

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

client/src/components/eula/eula.component.jsx

@@ -25,6 +25,7 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
 
   const handleScroll = useCallback(
     (e) => {
+      if (!e.target) return;
       const bottom = e.target.scrollHeight - 100 <= e.target.scrollTop + e.target.clientHeight;
       if (bottom && !hasEverScrolledToBottom) {
         setHasEverScrolledToBottom(true);
@@ -36,7 +37,9 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
   );
 
   useEffect(() => {
-    handleScroll({ target: markdownCardRef.current });
+    if (markdownCardRef.current) {
+      handleScroll({ target: markdownCardRef.current });
+    }
   }, [handleScroll]);
 
   const handleChange = useCallback(() => {

client/src/components/parts-order-list-table/parts-order-list-table-drawer.component.jsx

@@ -1,17 +1,16 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { PageHeader } from "@ant-design/pro-layout";
-import { useLazyQuery, useMutation } from "@apollo/client/react";
+import { useMutation } from "@apollo/client/react";
 import { Button, Drawer, Grid, Popconfirm, Space } from "antd";
 import ResponsiveTable from "../responsive-table/responsive-table.component";
 import queryString from "query-string";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaTasks } from "react-icons/fa";
 import { connect } from "react-redux";
 import { useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import { QUERY_BILL_BY_PK } from "../../graphql/bills.queries";
 import { DELETE_PARTS_ORDER } from "../../graphql/parts-orders.queries";
 import { selectIsPartsEntry, selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
@@ -92,34 +91,14 @@ export function PartsOrderListTableDrawerComponent({
     sortedInfo: {}
   });
 
-  const [billData, setBillData] = useState(null);
   const search = queryString.parse(useLocation().search);
   const selectedpartsorder = search.partsorderid;
 
   const [deletePartsOrder] = useMutation(DELETE_PARTS_ORDER);
   const parts_orders = billsQuery.data ? billsQuery.data.parts_orders : [];
   const { refetch } = billsQuery;
-  const [billQuery] = useLazyQuery(QUERY_BILL_BY_PK);
   const selectedPartsOrderRecord = parts_orders.find((r) => r.id === selectedpartsorder);
 
-  useEffect(() => {
-    const fetchData = async () => {
-      if (selectedPartsOrderRecord?.returnfrombill) {
-        try {
-          const { data } = await billQuery({
-            variables: {
-              billid: selectedPartsOrderRecord.returnfrombill
-            }
-          });
-          setBillData(data);
-        } catch (error) {
-          console.error("Error fetching bill data:", error);
-        }
-      } else setBillData(null);
-    };
-    fetchData();
-  }, [selectedPartsOrderRecord, billQuery]);
-
   const recordActions = (record) => (
     <Space orientation="horizontal" wrap>
       <Button
@@ -363,9 +342,9 @@ export function PartsOrderListTableDrawerComponent({
       <div>
         <PageHeader
           title={
-            billData
-              ? `${record.vendor.name} - ${record.order_number} - ${t("bills.labels.returnfrombill")}: ${billData.bills_by_pk.invoice_number}`
-              : `${record.vendor.name} - ${record.order_number}`
+            selectedPartsOrderRecord.returnfrombill
+              ? `${selectedPartsOrderRecord.vendor.name} - ${selectedPartsOrderRecord.order_number} - ${t("bills.labels.returnfrombill")}: ${selectedPartsOrderRecord.bill.invoice_number}`
+              : `${selectedPartsOrderRecord.vendor.name} - ${selectedPartsOrderRecord.order_number}`
           }
           extra={recordActions(record)}
         />

client/src/components/parts-order-list-table/parts-order-list-table.component.jsx

@@ -70,6 +70,12 @@ export function PartsOrderListTableComponent({
   const [deletePartsOrder] = useMutation(DELETE_PARTS_ORDER);
 
   const parts_orders = billsQuery.data ? billsQuery.data.parts_orders : [];
+
+  const enrichedPartsOrders = parts_orders.map((order) => ({
+    ...order,
+    invoice_number: order.bill?.invoice_number
+  }));
+
   const { refetch } = billsQuery;
 
   const recordActions = (record, showView = false) => (
@@ -222,7 +228,12 @@ export function PartsOrderListTableComponent({
       dataIndex: "order_number",
       key: "order_number",
       sorter: (a, b) => alphaSort(a.invoice_number, b.invoice_number),
-      sortOrder: state.sortedInfo.columnKey === "invoice_number" && state.sortedInfo.order
+      sortOrder: state.sortedInfo.columnKey === "invoice_number" && state.sortedInfo.order,
+      render: (text, record) => (
+        <span>
+          {record.order_number} {record.invoice_number && `(${record.invoice_number})`}
+        </span>
+      )
     },
     {
       title: t("parts_orders.fields.order_date"),
@@ -272,10 +283,10 @@ export function PartsOrderListTableComponent({
     setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
   };
 
-  const filteredPartsOrders = parts_orders
+  const filteredPartsOrders = enrichedPartsOrders
     ? searchText === ""
-      ? parts_orders
-      : parts_orders.filter(
+      ? enrichedPartsOrders
+      : enrichedPartsOrders.filter(
           (b) =>
             (b.order_number || "").toString().toLowerCase().includes(searchText.toLowerCase()) ||
             (b.vendor.name || "").toLowerCase().includes(searchText.toLowerCase())

client/src/graphql/bills.queries.js

@@ -91,6 +91,10 @@ export const QUERY_PARTS_BILLS_BY_JOBID = gql`
       order_number
       comments
       user_email
+      bill {
+        id
+        invoice_number
+      }
     }
     parts_dispatch(where: { jobid: { _eq: $jobid } }) {
       id

server/accounting/qbo/qbo-payables.js

@@ -130,13 +130,12 @@ exports.default = async (req, res) => {
 
 async function QueryVendorRecord(oauthClient, qbo_realmId, req, bill) {
   try {
-    const url = urlBuilder(
-      qbo_realmId,
-      "query",
-      `select * From vendor where DisplayName = '${StandardizeName(bill.vendor.name)}'`
-    );
     const result = await oauthClient.makeApiCall({
-      url: url,
+      url: urlBuilder(
+        qbo_realmId,
+        "query",
+        `select * From vendor where DisplayName = '${StandardizeName(bill.vendor.name)}'`
+      ),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -151,11 +150,6 @@ async function QueryVendorRecord(oauthClient, qbo_realmId, req, bill) {
       bodyshopid: bill.job.shopid,
       email: req.user.email
     });
-    logger.log("qbo-payables-query", "DEBUG", req.user.email, null, {
-      method: "QueryVendorRecord",
-      call: url,
-      result: result.json
-    });
 
     return result.json?.QueryResponse?.Vendor?.[0];
   } catch (error) {
@@ -173,9 +167,8 @@ async function InsertVendorRecord(oauthClient, qbo_realmId, req, bill) {
     DisplayName: StandardizeName(bill.vendor.name)
   };
   try {
-    const url = urlBuilder(qbo_realmId, "vendor");
     const result = await oauthClient.makeApiCall({
-      url: url,
+      url: urlBuilder(qbo_realmId, "vendor"),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -191,12 +184,6 @@ async function InsertVendorRecord(oauthClient, qbo_realmId, req, bill) {
       bodyshopid: bill.job.shopid,
       email: req.user.email
     });
-    logger.log("qbo-payments-insert", "DEBUG", req.user.email, null, {
-      method: "InsertVendorRecord",
-      call: url,
-      Vendor: Vendor,
-      result: result.json
-    });
 
     if (result.status >= 400) {
       throw new Error(JSON.stringify(result.json.Fault));
@@ -287,12 +274,11 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
     VendorRef: {
       value: vendor.Id
     },
-    ...(vendor.TermRef &&
-      !bill.is_credit_memo && {
-        SalesTermRef: {
-          value: vendor.TermRef.value
-        }
-      }),
+    ...(vendor.TermRef && !bill.is_credit_memo && {
+      SalesTermRef: {
+        value: vendor.TermRef.value
+      }
+    }),
     TxnDate: moment(bill.date)
       //.tz(bill.job.bodyshop.timezone)
       .format("YYYY-MM-DD"),
@@ -332,9 +318,8 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
     [logKey]: logValue
   });
   try {
-    const url = urlBuilder(qbo_realmId, bill.is_credit_memo ? "vendorcredit" : "bill");
     const result = await oauthClient.makeApiCall({
-      url: url,
+      url: urlBuilder(qbo_realmId, bill.is_credit_memo ? "vendorcredit" : "bill"),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -350,12 +335,6 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
       bodyshopid: bill.job.shopid,
       email: req.user.email
     });
-    logger.log("qbo-payables-insert", "DEBUG", req.user.email, null, {
-      method: "InsertBill",
-      call: url,
-      postingObj: bill.is_credit_memo ? VendorCredit : billQbo,
-      result: result.json
-    });
 
     if (result.status >= 400) {
       throw new Error(JSON.stringify(result.json.Fault));

server/accounting/qbo/qbo-payments.js

@@ -82,7 +82,14 @@ exports.default = async (req, res) => {
 
         if (isThreeTier || (!isThreeTier && twoTierPref === "name")) {
           //Insert the name/owner and account for whether the source should be the ins co in 3 tier..
-          ownerCustomerTier = await QueryOwner(oauthClient, qbo_realmId, req, payment.job, insCoCustomerTier);
+          ownerCustomerTier = await QueryOwner(
+            oauthClient,
+            qbo_realmId,
+            req,
+            payment.job,
+            isThreeTier,
+            insCoCustomerTier
+          );
           //Query for the owner itself.
           if (!ownerCustomerTier) {
             ownerCustomerTier = await InsertOwner(
@@ -222,9 +229,8 @@ async function InsertPayment(oauthClient, qbo_realmId, req, payment, parentRef)
     paymentQbo
   });
   try {
-    const url = urlBuilder(qbo_realmId, "payment");
     const result = await oauthClient.makeApiCall({
-      url: url,
+      url: urlBuilder(qbo_realmId, "payment"),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -240,12 +246,6 @@ async function InsertPayment(oauthClient, qbo_realmId, req, payment, parentRef)
       bodyshopid: payment.job.shopid,
       email: req.user.email
     });
-    logger.log("qbo-payments-insert", "DEBUG", req.user.email, null, {
-      method: "InsertPayment",
-      call: url,
-      paymentQbo: paymentQbo,
-      result: result.json
-    });
 
     if (result.status >= 400) {
       throw new Error(JSON.stringify(result.json.Fault));
@@ -428,9 +428,8 @@ async function InsertCreditMemo(oauthClient, qbo_realmId, req, payment, parentRe
     paymentQbo
   });
   try {
-    const url = urlBuilder(qbo_realmId, "creditmemo");
     const result = await oauthClient.makeApiCall({
-      url: url,
+      url: urlBuilder(qbo_realmId, "creditmemo"),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -446,12 +445,6 @@ async function InsertCreditMemo(oauthClient, qbo_realmId, req, payment, parentRe
       bodyshopid: req.user.bodyshopid,
       email: req.user.email
     });
-    logger.log("qbo-metadata-query", "DEBUG", req.user.email, null, {
-      method: "InsertCreditMemo",
-      call: url,
-      paymentQbo: paymentQbo,
-      result: result.json
-    });
 
     if (result.status >= 400) {
       throw new Error(JSON.stringify(result.json.Fault));

server/accounting/qbo/qbo-receivables.js

@@ -213,13 +213,12 @@ exports.default = async (req, res) => {
 
 async function QueryInsuranceCo(oauthClient, qbo_realmId, req, job) {
   try {
-    const url = urlBuilder(
-      qbo_realmId,
-      "query",
-      `select * From Customer where DisplayName = '${StandardizeName(job.ins_co_nm.trim())}' and Active = true`
-    );
     const result = await oauthClient.makeApiCall({
-      url: url,
+      url: urlBuilder(
+        qbo_realmId,
+        "query",
+        `select * From Customer where DisplayName = '${StandardizeName(job.ins_co_nm.trim())}' and Active = true`
+      ),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -234,11 +233,6 @@ async function QueryInsuranceCo(oauthClient, qbo_realmId, req, job) {
       jobid: job.id,
       email: req.user.email
     });
-    logger.log("qbo-receivables-query", "DEBUG", req.user.email, job.id, {
-      method: "QueryInsuranceCo",
-      call: url,
-      result: result.json
-    });
 
     return result.json?.QueryResponse?.Customer?.[0];
   } catch (error) {
@@ -272,9 +266,8 @@ async function InsertInsuranceCo(oauthClient, qbo_realmId, req, job, bodyshop) {
     }
   };
   try {
-    const url = urlBuilder(qbo_realmId, "customer");
     const result = await oauthClient.makeApiCall({
-      url: url,
+      url: urlBuilder(qbo_realmId, "customer"),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -290,12 +283,6 @@ async function InsertInsuranceCo(oauthClient, qbo_realmId, req, job, bodyshop) {
       jobid: job.id,
       email: req.user.email
     });
-    logger.log("qbo-receivables-insert", "DEBUG", req.user.email, job.id, {
-      method: "InsertInsuranceCo",
-      call: url,
-      customerObj: Customer,
-      result: result.json
-    });
 
     return result.json?.Customer;
   } catch (error) {
@@ -311,13 +298,12 @@ exports.InsertInsuranceCo = InsertInsuranceCo;
 
 async function QueryOwner(oauthClient, qbo_realmId, req, job, parentTierRef) {
   const ownerName = generateOwnerTier(job, true, null);
-  const url = urlBuilder(
-    qbo_realmId,
-    "query",
-    `select * From Customer where DisplayName = '${StandardizeName(ownerName)}' and Active = true`
-  );
   const result = await oauthClient.makeApiCall({
-    url: url,
+    url: urlBuilder(
+      qbo_realmId,
+      "query",
+      `select * From Customer where DisplayName = '${StandardizeName(ownerName)}' and Active = true`
+    ),
     method: "POST",
     headers: {
       "Content-Type": "application/json"
@@ -332,11 +318,6 @@ async function QueryOwner(oauthClient, qbo_realmId, req, job, parentTierRef) {
     jobid: job.id,
     email: req.user.email
   });
-  logger.log("qbo-receivables-query", "DEBUG", req.user.email, job.id, {
-    method: "QueryOwner",
-    call: url,
-    result: result.json
-  });
 
   return result.json?.QueryResponse?.Customer?.find((x) => x.ParentRef?.value === parentTierRef?.Id);
 }
@@ -366,9 +347,8 @@ async function InsertOwner(oauthClient, qbo_realmId, req, job, isThreeTier, pare
       : {})
   };
   try {
-    const url = urlBuilder(qbo_realmId, "customer");
     const result = await oauthClient.makeApiCall({
-      url: url,
+      url: urlBuilder(qbo_realmId, "customer"),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -384,12 +364,6 @@ async function InsertOwner(oauthClient, qbo_realmId, req, job, isThreeTier, pare
       jobid: job.id,
       email: req.user.email
     });
-    logger.log("qbo-receivables-insert", "DEBUG", req.user.email, job.id, {
-      method: "InsertOwner",
-      call: url,
-      customerObj: Customer,
-      result: result.json
-    });
 
     return result.json?.Customer;
   } catch (error) {
@@ -404,13 +378,12 @@ async function InsertOwner(oauthClient, qbo_realmId, req, job, isThreeTier, pare
 exports.InsertOwner = InsertOwner;
 
 async function QueryJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
-  const url = urlBuilder(
-    qbo_realmId,
-    "query",
-    `select * From Customer where DisplayName = '${job.ro_number}' and Active = true`
-  );
   const result = await oauthClient.makeApiCall({
-    url: url,
+    url: urlBuilder(
+      qbo_realmId,
+      "query",
+      `select * From Customer where DisplayName = '${job.ro_number}' and Active = true`
+    ),
     method: "POST",
     headers: {
       "Content-Type": "application/json"
@@ -425,11 +398,6 @@ async function QueryJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
     jobid: job.id,
     email: req.user.email
   });
-  logger.log("qbo-receivables-query", "DEBUG", req.user.email, job.id, {
-    method: "QueryJob",
-    call: url,
-    result: result.json
-  });
 
   const customers = result.json?.QueryResponse?.Customer;
   return customers && (parentTierRef ? customers.find((x) => x.ParentRef.value === parentTierRef.Id) : customers[0]);
@@ -455,9 +423,8 @@ async function InsertJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
     }
   };
   try {
-    const url = urlBuilder(qbo_realmId, "customer");
     const result = await oauthClient.makeApiCall({
-      url: url,
+      url: urlBuilder(qbo_realmId, "customer"),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -473,12 +440,6 @@ async function InsertJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
       jobid: job.id,
       email: req.user.email
     });
-    logger.log("qbo-receivables-insert", "DEBUG", req.user.email, job.id, {
-      method: "InsertJob",
-      call: url,
-      customerObj: Customer,
-      result: result.json
-    });
 
     if (result.status >= 400) {
       throw new Error(JSON.stringify(result.json.Fault));