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