From acc9145d5296cd841f1b8190c9d287899b125e75 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Tue, 17 Oct 2023 10:45:16 -0700
Subject: [PATCH 1/3] Enhanced payroll deduct from labor correction.

---
 .../bill-enter-modal.container.jsx            | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
index 9cad08f90..23a2e9c7f 100644
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -98,6 +98,7 @@ function BillEnterModalContainer({
     } = values;
 
     let adjustmentsToInsert = {};
+    let payrollAdjustmentsToInsert = [];
 
     const r1 = await insertBill({
       variables: {
@@ -121,6 +122,24 @@ function BillEnterModalContainer({
                       (adjustmentsToInsert[lbr_adjustment.mod_lbr_ty] || 0) -
                       restI.actual_price / lbr_adjustment.rate;
                   }
+
+                  //If deduct from labor has lines,
+                  //
+                  if (
+                    deductedfromlbr &&
+                    true //payroll is on
+                  ) {
+                    payrollAdjustmentsToInsert.push({
+                      id: i.joblineid,
+                      convertedtolbr: true,
+                      convertedtolbr_data: {
+                        mod_lb_hrs:
+                          (restI.actual_price / lbr_adjustment.rate) * -1,
+                        mod_lbr_ty: lbr_adjustment.mod_lbr_ty,
+                      },
+                    });
+                  }
+
                   return {
                     ...restI,
                     deductedfromlbr: deductedfromlbr,
@@ -146,6 +165,20 @@ function BillEnterModalContainer({
       refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID"],
     });
 
+    await Promise.all(
+      payrollAdjustmentsToInsert.map((li) => {
+        return updateJobLines({
+          variables: {
+            lineId: li.id,
+            line: {
+              convertedtolbr: li.convertedtolbr,
+              convertedtolbr_data: li.convertedtolbr_data,
+            },
+          },
+        });
+      })
+    );
+
     const adjKeys = Object.keys(adjustmentsToInsert);
     if (adjKeys.length > 0) {
       //Query the adjustments, merge, and update them.

From b9a6a98feef032c931a2a8f568a50b42e4f742a9 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Wed, 18 Oct 2023 09:51:17 -0700
Subject: [PATCH 2/3] Resolve deduct from labor calculations.

---
 bodyshop_translations.babel                   | 23 +++++++++-
 .../bill-form/bill-form.lines.component.jsx   | 44 +++++++++++++++++--
 .../bill-line-search-select.component.jsx     |  6 +++
 ...or-allocations-table.payroll.component.jsx |  2 +-
 client/src/graphql/jobs-lines.queries.js      |  1 +
 client/src/translations/en_us/common.json     |  5 ++-
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 8 files changed, 75 insertions(+), 8 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 6d11973f7..a688deb45 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -2349,6 +2349,27 @@
                             <folder_node>
                                 <name>actions</name>
                                 <children>
+                                    <concept_node>
+                                        <name>deductallhours</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>edit</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/bill-form/bill-form.lines.component.jsx b/client/src/components/bill-form/bill-form.lines.component.jsx
index d3fc1f8e1..bf33d2aba 100644
--- a/client/src/components/bill-form/bill-form.lines.component.jsx
+++ b/client/src/components/bill-form/bill-form.lines.component.jsx
@@ -40,7 +40,7 @@ export function BillEnterModalLinesComponent({
   billid,
 }) {
   const { t } = useTranslation();
-  const { setFieldsValue, getFieldsValue, getFieldValue } = form;
+  const { setFieldsValue, getFieldsValue, getFieldValue, setFieldValue } = form;
   const { Simple_Inventory } = useTreatments(
     ["Simple_Inventory"],
     {},
@@ -376,9 +376,43 @@ export function BillEnterModalLinesComponent({
                 "rate",
               ]);
 
+              const billline = getFieldValue(["billlines", record.name]);
+
+              const jobline = lineData.find(
+                (line) => line.id === billline?.joblineid
+              );
+
+              const employeeTeamName = bodyshop.employee_teams.find(
+                (team) => team.id === jobline?.assigned_team
+              );
+
               if (getFieldValue(["billlines", record.name, "deductedfromlbr"]))
                 return (
                   <div>
+                    <Space>
+                      {t("joblines.fields.assigned_team", {
+                        name: employeeTeamName?.name,
+                      })}
+                      {`${jobline.mod_lb_hrs} units`}
+                      <Button
+                        onClick={() => {
+                          const applicableRate =
+                            billline.actual_price / jobline.mod_lb_hrs;
+
+                          setFieldValue(
+                            [
+                              "billlines",
+                              record.name,
+                              "lbr_adjustment",
+                              "rate",
+                            ],
+                            applicableRate
+                          );
+                        }}
+                      >
+                        {t("bills.actions.deductallhours")}
+                      </Button>
+                    </Space>
                     <Form.Item
                       label={t("joblines.fields.mod_lbr_ty")}
                       key={`${index}modlbrty`}
@@ -448,9 +482,11 @@ export function BillEnterModalLinesComponent({
                     >
                       <InputNumber precision={2} min={0.01} />
                     </Form.Item>
-                    {price &&
-                      adjustmentRate &&
-                      `${(price / adjustmentRate).toFixed(1)} hrs`}
+                    <Space>
+                      {price &&
+                        adjustmentRate &&
+                        `${(price / adjustmentRate).toFixed(1)} hrs`}
+                    </Space>
                   </div>
                 );
               return <></>;
diff --git a/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx b/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
index 552c2ad47..aace2a52a 100644
--- a/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
+++ b/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
@@ -63,6 +63,12 @@ const BillLineSearchSelect = (
                   item.oem_partno ? ` - ${item.oem_partno}` : ""
                 }${item.alt_partno ? ` (${item.alt_partno})` : ""}`.trim()}
               </span>
+              {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)}`
diff --git a/client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx b/client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx
index 504d0dce6..6bb247992 100644
--- a/client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx
+++ b/client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx
@@ -239,7 +239,7 @@ export function PayrollLaborAllocationsTable({
                   });
 
                   if (response.status === 200) {
-                    if (response.data.success) {
+                    if (response.data.success !== false) {
                       notification.open({
                         type: "success",
                         message: t("timetickets.successes.payall"),
diff --git a/client/src/graphql/jobs-lines.queries.js b/client/src/graphql/jobs-lines.queries.js
index 47c382054..4ee5e5515 100644
--- a/client/src/graphql/jobs-lines.queries.js
+++ b/client/src/graphql/jobs-lines.queries.js
@@ -274,6 +274,7 @@ export const GET_JOB_LINES_TO_ENTER_BILL = gql`
       lbr_amt
       op_code_desc
       alt_partno
+      assigned_team
     }
     jobs_by_pk(id: $id) {
       id
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index ecd1e183e..782cf469b 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -155,6 +155,7 @@
 		},
 		"bills": {
 			"actions": {
+				"deductallhours": "Deduct all",
 				"edit": "Edit",
 				"receive": "Receive Part",
 				"return": "Return Items"
@@ -1242,7 +1243,7 @@
 			"fields": {
 				"act_price": "Retail Price",
 				"ah_detail_line": "Mark as Detail Labor Line (Autohouse Only)",
-				"assigned_team": "Team",
+				"assigned_team": "Team {{name}}",
 				"db_price": "List Price",
 				"lbr_types": {
 					"LA1": "LA1",
@@ -1753,7 +1754,7 @@
 				"closejob": "Close Job {{ro_number}}",
 				"closingperiod": "This Invoice Date is outside of the Closing Period.",
 				"contracts": "CC Contracts",
-				"convertedtolabor": "Lines Converted to Labor",
+				"convertedtolabor": "Labor Line Adjustments",
 				"cost": "Cost",
 				"cost_Additional": "Cost - Additional",
 				"cost_labor": "Cost - Labor",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 6ca073170..90f1129e2 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -155,6 +155,7 @@
 		},
 		"bills": {
 			"actions": {
+				"deductallhours": "",
 				"edit": "",
 				"receive": "",
 				"return": ""
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index a65bef325..5efa33eb4 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -155,6 +155,7 @@
 		},
 		"bills": {
 			"actions": {
+				"deductallhours": "",
 				"edit": "",
 				"receive": "",
 				"return": ""

From e05b72615eb451a0c7ff8450f6d2b22e01767eb5 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Wed, 18 Oct 2023 17:28:48 -0700
Subject: [PATCH 3/3] Improve labor deduction for enhanced payroll.

---
 bodyshop_translations.babel                   | 23 +++++-
 .../bill-enter-modal.container.jsx            | 47 +++++++-----
 .../bill-form/bill-form.lines.component.jsx   | 76 +++++++++++--------
 client/src/translations/en_us/common.json     |  1 +
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 6 files changed, 95 insertions(+), 54 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index a688deb45..5f1fb1616 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -2250,6 +2250,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>mod_lbr_adjustment</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>other</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
index 23a2e9c7f..3fc134ce5 100644
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -29,6 +29,7 @@ import BillFormContainer from "../bill-form/bill-form.container";
 import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -63,6 +64,11 @@ function BillEnterModalContainer({
     "enter_bill_generate_label",
     false
   );
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
   const formValues = useMemo(() => {
     return {
       ...billEnterModal.context.bill,
@@ -117,27 +123,26 @@ function BillEnterModalContainer({
                     ...restI
                   } = i;
 
-                  if (deductedfromlbr) {
-                    adjustmentsToInsert[lbr_adjustment.mod_lbr_ty] =
-                      (adjustmentsToInsert[lbr_adjustment.mod_lbr_ty] || 0) -
-                      restI.actual_price / lbr_adjustment.rate;
-                  }
-
-                  //If deduct from labor has lines,
-                  //
-                  if (
-                    deductedfromlbr &&
-                    true //payroll is on
-                  ) {
-                    payrollAdjustmentsToInsert.push({
-                      id: i.joblineid,
-                      convertedtolbr: true,
-                      convertedtolbr_data: {
-                        mod_lb_hrs:
-                          (restI.actual_price / lbr_adjustment.rate) * -1,
-                        mod_lbr_ty: lbr_adjustment.mod_lbr_ty,
-                      },
-                    });
+                  if (Enhanced_Payroll.treatment === "on") {
+                    if (
+                      deductedfromlbr &&
+                      true //payroll is on
+                    ) {
+                      payrollAdjustmentsToInsert.push({
+                        id: i.joblineid,
+                        convertedtolbr: true,
+                        convertedtolbr_data: {
+                          mod_lb_hrs: lbr_adjustment.mod_lb_hrs * -1,
+                          mod_lbr_ty: lbr_adjustment.mod_lbr_ty,
+                        },
+                      });
+                    }
+                  } else {
+                    if (deductedfromlbr) {
+                      adjustmentsToInsert[lbr_adjustment.mod_lbr_ty] =
+                        (adjustmentsToInsert[lbr_adjustment.mod_lbr_ty] || 0) -
+                        restI.actual_price / lbr_adjustment.rate;
+                    }
                   }
 
                   return {
diff --git a/client/src/components/bill-form/bill-form.lines.component.jsx b/client/src/components/bill-form/bill-form.lines.component.jsx
index bf33d2aba..17a69ffad 100644
--- a/client/src/components/bill-form/bill-form.lines.component.jsx
+++ b/client/src/components/bill-form/bill-form.lines.component.jsx
@@ -46,6 +46,13 @@ export function BillEnterModalLinesComponent({
     {},
     bodyshop && bodyshop.imexshopid
   );
+
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
+
   const columns = (remove) => {
     return [
       {
@@ -393,29 +400,14 @@ export function BillEnterModalLinesComponent({
                       {t("joblines.fields.assigned_team", {
                         name: employeeTeamName?.name,
                       })}
-                      {`${jobline.mod_lb_hrs} units`}
-                      <Button
-                        onClick={() => {
-                          const applicableRate =
-                            billline.actual_price / jobline.mod_lb_hrs;
-
-                          setFieldValue(
-                            [
-                              "billlines",
-                              record.name,
-                              "lbr_adjustment",
-                              "rate",
-                            ],
-                            applicableRate
-                          );
-                        }}
-                      >
-                        {t("bills.actions.deductallhours")}
-                      </Button>
+                      {`${jobline.mod_lb_hrs} units/${t(
+                        `joblines.fields.lbr_types.${jobline.mod_lbr_ty}`
+                      )}`}
                     </Space>
                     <Form.Item
                       label={t("joblines.fields.mod_lbr_ty")}
                       key={`${index}modlbrty`}
+                      initialValue={jobline ? jobline.mod_lbr_ty : null}
                       rules={[
                         {
                           required: true,
@@ -469,19 +461,39 @@ export function BillEnterModalLinesComponent({
                         </Select.Option>
                       </Select>
                     </Form.Item>
-                    <Form.Item
-                      label={t("jobs.labels.adjustmentrate")}
-                      name={[record.name, "lbr_adjustment", "rate"]}
-                      initialValue={bodyshop.default_adjustment_rate}
-                      rules={[
-                        {
-                          required: true,
-                          //message: t("general.validation.required"),
-                        },
-                      ]}
-                    >
-                      <InputNumber precision={2} min={0.01} />
-                    </Form.Item>
+                    {Enhanced_Payroll.treatment === "on" ? (
+                      <Form.Item
+                        label={t("billlines.labels.mod_lbr_adjustment")}
+                        name={[record.name, "lbr_adjustment", "mod_lb_hrs"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <InputNumber
+                          precision={5}
+                          min={0.01}
+                          max={jobline ? jobline.mod_lb_hrs : 0}
+                        />
+                      </Form.Item>
+                    ) : (
+                      <Form.Item
+                        label={t("jobs.labels.adjustmentrate")}
+                        name={[record.name, "lbr_adjustment", "rate"]}
+                        initialValue={bodyshop.default_adjustment_rate}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <InputNumber precision={2} min={0.01} />
+                      </Form.Item>
+                    )}
+
                     <Space>
                       {price &&
                         adjustmentRate &&
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 782cf469b..612a81bb6 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -145,6 +145,7 @@
 				"deductedfromlbr": "Deduct from Labor?",
 				"entered": "Entered",
 				"from": "From",
+				"mod_lbr_adjustment": "Adjustment Units",
 				"other": "-- Not On Estimate --",
 				"reconciled": "Reconciled!",
 				"unreconciled": "Unreconciled"
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 90f1129e2..d80a7d141 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -145,6 +145,7 @@
 				"deductedfromlbr": "",
 				"entered": "",
 				"from": "",
+				"mod_lbr_adjustment": "",
 				"other": "",
 				"reconciled": "",
 				"unreconciled": ""
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 5efa33eb4..4eaf2cb8b 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -145,6 +145,7 @@
 				"deductedfromlbr": "",
 				"entered": "",
 				"from": "",
+				"mod_lbr_adjustment": "",
 				"other": "",
 				"reconciled": "",
 				"unreconciled": ""