From e46307e7156136f78b94f86b704b1af173608582 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 9 Sep 2021 13:09:05 -0700
Subject: [PATCH] IO-1350 Audatex import issues.

---
 bodyshop_translations.babel                   | 21 +++++
 ...p-info.responsibilitycenters.component.jsx | 78 +++++++++++++++++++
 client/src/translations/en_us/common.json     |  1 +
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 server/job/job-totals.js                      | 12 ++-
 6 files changed, 113 insertions(+), 1 deletion(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 4bb07a045..9d91b0a8c 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -6344,6 +6344,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>pasl</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>refund</name>
                                                 <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
index c50b7b9b0..0da65dd3d 100644
--- a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
+++ b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
@@ -871,6 +871,27 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                 ))}
                               </Select>
                             </Form.Item>
+                            <Form.Item
+                              label={t(
+                                "bodyshop.fields.responsibilitycenters.pasl"
+                              )}
+                              rules={[
+                                {
+                                  required: true,
+                                  //message: t("general.validation.required"),
+                                },
+                              ]}
+                              key={`${index}costs-PASL`}
+                              name={[field.name, "costs", "PASL"]}
+                            >
+                              <Select>
+                                {costOptions.map((item, idx) => (
+                                  <Select.Option key={idx} value={item}>
+                                    {item}
+                                  </Select.Option>
+                                ))}
+                              </Select>
+                            </Form.Item>
                             <Form.Item
                               label={t(
                                 "bodyshop.fields.responsibilitycenters.tow"
@@ -1337,6 +1358,27 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                 ))}
                               </Select>
                             </Form.Item>
+                            <Form.Item
+                              label={t(
+                                "bodyshop.fields.responsibilitycenters.pasl"
+                              )}
+                              rules={[
+                                {
+                                  required: true,
+                                  //message: t("general.validation.required"),
+                                },
+                              ]}
+                              key={`${index}profits-PASL`}
+                              name={[field.name, "profits", "PASL"]}
+                            >
+                              <Select>
+                                {profitOptions.map((item, idx) => (
+                                  <Select.Option key={idx} value={item}>
+                                    {item}
+                                  </Select.Option>
+                                ))}
+                              </Select>
+                            </Form.Item>
                             <Form.Item
                               label={t(
                                 "bodyshop.fields.responsibilitycenters.tow"
@@ -1771,6 +1813,24 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
               ))}
             </Select>
           </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.pasl")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "PASL"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
           <Form.Item
             label={t("bodyshop.fields.responsibilitycenters.tow")}
             rules={[
@@ -2169,6 +2229,24 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
               ))}
             </Select>
           </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.pasl")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "PASL"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
           <Form.Item
             label={t("bodyshop.fields.responsibilitycenters.tow")}
             rules={[
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 532a1baa5..b81c260bc 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -406,6 +406,7 @@
 					"pap": "OEM Partial",
 					"par": "Recored",
 					"pas": "Sublet",
+					"pasl": "Sublet (L)",
 					"refund": "Refund",
 					"sales_tax_codes": {
 						"code": "Code",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 1dd2932ba..750848258 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -406,6 +406,7 @@
 					"pap": "",
 					"par": "",
 					"pas": "",
+					"pasl": "",
 					"refund": "",
 					"sales_tax_codes": {
 						"code": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index e1f87f3a3..5ae2f652b 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -406,6 +406,7 @@
 					"pap": "",
 					"par": "",
 					"pas": "",
+					"pasl": "",
 					"refund": "",
 					"sales_tax_codes": {
 						"code": "",
diff --git a/server/job/job-totals.js b/server/job/job-totals.js
index 54b94f5e1..e0c069bba 100644
--- a/server/job/job-totals.js
+++ b/server/job/job-totals.js
@@ -242,7 +242,16 @@ function CalculatePartsTotals(jobLines) {
                 subtotal: acc.sublets.subtotal.add(
                   Dinero({
                     amount: Math.round(value.act_price * 100),
-                  }).multiply(value.part_qty || 0)
+                  })
+                    .multiply(value.part_qty || 0)
+                    .add(
+                      Dinero({
+                        amount: Math.round(value.act_price * 100),
+                      })
+                        .multiply(value.part_qty || 0)
+                        .percentage(Math.abs(value.prt_dsmk_p || 0))
+                        .multiply(value.prt_dsmk_p > 0 ? 1 : -1)
+                    )
                 ),
               },
             };
@@ -306,6 +315,7 @@ function CalculatePartsTotals(jobLines) {
         },
         sublets: {
           subtotal: Dinero({ amount: 0 }),
+
           total: Dinero({ amount: 0 }),
         },
       }