IO-2717 CDK Use Scale Data for Paint Materials Cost

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

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

@@ -1,5 +1,5 @@
 import { DeleteFilled, EyeFilled, SyncOutlined } from "@ant-design/icons";
-import { useLazyQuery, useMutation } from "@apollo/client";
+import { useMutation } from "@apollo/client";
 import {
   Button,
   Card,
@@ -13,21 +13,20 @@ import {
   Table,
 } from "antd";
 import queryString from "query-string";
-import React, { useEffect, useState } from "react";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 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 { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
-import { TemplateList } from "../../utils/TemplateConstants";
 import { alphaSort } from "../../utils/sorters";
+import { TemplateList } from "../../utils/TemplateConstants";
 import DataLabel from "../data-label/data-label.component";
 import PartsOrderBackorderEta from "../parts-order-backorder-eta/parts-order-backorder-eta.component";
 import PartsOrderCmReceived from "../parts-order-cm-received/parts-order-cm-received.component";
@@ -79,46 +78,19 @@ export function PartsOrderListTableComponent({
   const [state, setState] = useState({
     sortedInfo: {},
   });
-
-  const [returnfrombill, setReturnFromBill] = useState();
-  const [billData, setBillData] = useState();
   const search = queryString.parse(useLocation().search);
   const selectedpartsorder = search.partsorderid;
   const [searchText, setSearchText] = useState("");
 
-  const [billQuery] = useLazyQuery(QUERY_BILL_BY_PK);
   const [deletePartsOrder] = useMutation(DELETE_PARTS_ORDER);
 
   const parts_orders = billsQuery.data ? billsQuery.data.parts_orders : [];
   const { refetch } = billsQuery;
 
-  useEffect(() => {
-    if (returnfrombill === null) {
-      setBillData(null);
-    } else {
-      const fetchData = async () => {
-        const result = await billQuery({
-          variables: { billid: returnfrombill },
-        });
-        setBillData(result.data);
-      };
-      fetchData();
-    }
-  }, [returnfrombill, billQuery]);
-
   const recordActions = (record, showView = false) => (
     <Space wrap>
       {showView && (
-        <Button
-          onClick={() => {
-            if (record.returnfrombill) {
-              setReturnFromBill(record.returnfrombill);
-            } else {
-              setReturnFromBill(null);
-            }
-            handleOnRowClick(record);
-          }}
-        >
+        <Button onClick={() => handleOnRowClick(record)}>
           <EyeFilled />
         </Button>
       )}
@@ -445,11 +417,7 @@ export function PartsOrderListTableComponent({
     return (
       <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}`
-          }
+          title={record && `${record.vendor.name} - ${record.order_number}`}
           extra={recordActions(record)}
         />
         <Table

client/src/graphql/bills.queries.js

@@ -73,7 +73,6 @@ export const QUERY_BILLS_BY_JOBID = gql`
       order_date
       deliver_by
       return
-      returnfrombill
       orderedby
       parts_order_lines {
         id

client/src/translations/en_us/common.json

@@ -222,7 +222,6 @@
 				"onlycmforinvoiced": "Only credit memos can be entered for any Job that has been invoiced, exported, or voided.",
 				"printlabels": "Print Labels",
 				"retailtotal": "Bills Retail Total",
-				"returnfrombill": "Return From Bill",
 				"savewithdiscrepancy": "You are about to save this bill with a discrepancy.  The system will continue to use the calculated amount using the bill lines.  Press cancel to return to the bill.",
 				"state_tax": "Provincial/State Tax",
 				"subtotal": "Subtotal",

client/src/translations/es/common.json

@@ -221,7 +221,6 @@
 				"onlycmforinvoiced": "",
 				"printlabels": "",
 				"retailtotal": "",
-				"returnfrombill": "",
 				"savewithdiscrepancy": "",
 				"state_tax": "",
 				"subtotal": "",

client/src/translations/fr/common.json

@@ -221,7 +221,6 @@
 				"onlycmforinvoiced": "",
 				"printlabels": "",
 				"retailtotal": "",
-				"returnfrombill": "",
 				"savewithdiscrepancy": "",
 				"state_tax": "",
 				"subtotal": "",

server/cdk/cdk-calculate-allocations.js

@@ -224,11 +224,34 @@ exports.default = async function (socket, jobid) {
       if (mapaAccount) {
         if (!costCenterHash[mapaAccountName])
           costCenterHash[mapaAccountName] = Dinero();
-        costCenterHash[mapaAccountName] = costCenterHash[mapaAccountName].add(
-          Dinero(job.job_totals.rates.mapa.total).percentage(
-            bodyshop?.cdk_configuration?.sendmaterialscosting
-          )
-        );
+        if (job.bodyshop.use_paint_scale_data === true) {
+          if (job.mixdata.length > 0) {
+            costCenterHash[mapaAccountName] = costCenterHash[
+              mapaAccountName
+            ].add(
+              Dinero({
+                amount: Math.round(
+                  ((job.mixdata[0] && job.mixdata[0].totalliquidcost) || 0) *
+                    100
+                ),
+              })
+            );
+          } else {
+            costCenterHash[mapaAccountName] = costCenterHash[
+              mapaAccountName
+            ].add(
+              Dinero(job.job_totals.rates.mapa.total).percentage(
+                bodyshop?.cdk_configuration?.sendmaterialscosting
+              )
+            );
+          }
+        } else {
+          costCenterHash[mapaAccountName] = costCenterHash[mapaAccountName].add(
+            Dinero(job.job_totals.rates.mapa.total).percentage(
+              bodyshop?.cdk_configuration?.sendmaterialscosting
+            )
+          );
+        }
       } else {
         //console.log("NO MAPA ACCOUNT FOUND!!");
       }

server/graphql-client/queries.js

@@ -1793,6 +1793,7 @@ exports.GET_CDK_ALLOCATIONS = `query QUERY_JOB_CLOSE_DETAILS($id: uuid!) {
       md_responsibility_centers
       cdk_configuration
       pbs_configuration
+      use_paint_scale_data
     }
     ro_number
     dms_allocation
@@ -1900,6 +1901,10 @@ exports.GET_CDK_ALLOCATIONS = `query QUERY_JOB_CLOSE_DETAILS($id: uuid!) {
       line_ref
       unq_seq
     }
+    mixdata(limit: 1, order_by: {updated_at: desc}) {
+      jobid
+      totalliquidcost
+    }
   }
 }`;