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] 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": ""