From 059b328354061ea90d7be01f8cca3099162352bc Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Tue, 23 Feb 2021 11:08:33 -0800
Subject: [PATCH] Update LAR split in config. IO-698

---
 bodyshop_translations.babel                   | 27 +++++++++++--
 client/package-lock.json                      | 18 +++++++++
 client/package.json                           |  1 +
 .../shop-info/shop-info.component.jsx         | 40 +++++++++++++------
 .../pages/manage/manage.page.component.jsx    |  5 ++-
 client/src/translations/en_us/common.json     |  5 ++-
 client/src/translations/es/common.json        |  5 ++-
 client/src/translations/fr/common.json        |  5 ++-
 8 files changed, 84 insertions(+), 22 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 2d832720b..dcc21d7a8 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
@@ -3280,7 +3280,7 @@
                                         <name>md_hour_split</name>
                                         <children>
                                             <concept_node>
-                                                <name>lab</name>
+                                                <name>paint</name>
                                                 <definition_loaded>false</definition_loaded>
                                                 <description></description>
                                                 <comment></comment>
@@ -3301,7 +3301,7 @@
                                                 </translations>
                                             </concept_node>
                                             <concept_node>
-                                                <name>lar</name>
+                                                <name>prep</name>
                                                 <definition_loaded>false</definition_loaded>
                                                 <description></description>
                                                 <comment></comment>
@@ -6760,6 +6760,27 @@
                             <folder_node>
                                 <name>validation</name>
                                 <children>
+                                    <concept_node>
+                                        <name>larsplit</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>useremailmustexist</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/package-lock.json b/client/package-lock.json
index 18783dd0f..a74178952 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -5554,6 +5554,16 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz",
       "integrity": "sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw=="
     },
+    "babel-plugin-preval": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-preval/-/babel-plugin-preval-5.0.0.tgz",
+      "integrity": "sha512-8DqJq6/LPUjSZ0Qq6bVIFpsj2flCEE0Cbnbut9TvGU6jP9g3dOWEXtQ/sdvsA9d6souza8eNGh04WRXpuH9ThA==",
+      "requires": {
+        "@babel/runtime": "^7.9.2",
+        "babel-plugin-macros": "^2.8.0",
+        "require-from-string": "^2.0.2"
+      }
+    },
     "babel-plugin-styled-components": {
       "version": "1.12.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz",
@@ -16432,6 +16442,14 @@
         }
       }
     },
+    "preval.macro": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/preval.macro/-/preval.macro-5.0.0.tgz",
+      "integrity": "sha512-+OZRqZYx1pjZ7H5Jis8bPFXkiT7lwA46UzAT4IjuzFVKwkJK+TwIx1TCqrqNCf8U3e5O12mEJEz1BXslkCLWfQ==",
+      "requires": {
+        "babel-plugin-preval": "^5.0.0"
+      }
+    },
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
diff --git a/client/package.json b/client/package.json
index 8480a5e74..445834c46 100644
--- a/client/package.json
+++ b/client/package.json
@@ -30,6 +30,7 @@
     "logrocket": "^1.0.13",
     "moment-business-days": "^1.2.0",
     "node-sass": "^4.14.1",
+    "preval.macro": "^5.0.0",
     "prop-types": "^15.7.2",
     "query-string": "^6.14.0",
     "react": "^17.0.1",
diff --git a/client/src/components/shop-info/shop-info.component.jsx b/client/src/components/shop-info/shop-info.component.jsx
index 3ebd9797e..2afd24223 100644
--- a/client/src/components/shop-info/shop-info.component.jsx
+++ b/client/src/components/shop-info/shop-info.component.jsx
@@ -755,25 +755,41 @@ export default function ShopInfoComponent({ form, saveLoading }) {
               <Switch />
             </Form.Item>
             <Form.Item
-              label={t("bodyshop.fields.md_hour_split.lab")}
-              name={["md_hour_split", "lab"]}
+              label={t("bodyshop.fields.md_hour_split.prep")}
+              name={["md_hour_split", "prep"]}
+              dependencies={[["md_hour_split", "paint"]]}
               rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
+                ({ getFieldValue }) => ({
+                  validator(rule, value) {
+                    if (
+                      value + getFieldValue(["md_hour_split", "paint"]) ===
+                      1
+                    ) {
+                      return Promise.resolve();
+                    }
+                    return Promise.reject(t("bodyshop.validation.larsplit"));
+                  },
+                }),
               ]}
             >
               <InputNumber min={0} max={1} precision={2} />
             </Form.Item>
             <Form.Item
-              label={t("bodyshop.fields.md_hour_split.lar")}
-              name={["md_hour_split", "lar"]}
+              label={t("bodyshop.fields.md_hour_split.paint")}
+              name={["md_hour_split", "paint"]}
+              dependencies={[["md_hour_split", "prep"]]}
               rules={[
-                {
-                  required: true,
-                  message: t("general.validation.required"),
-                },
+                ({ getFieldValue }) => ({
+                  validator(rule, value) {
+                    if (
+                      value + getFieldValue(["md_hour_split", "prep"]) ===
+                      1
+                    ) {
+                      return Promise.resolve();
+                    }
+                    return Promise.reject(t("bodyshop.validation.larsplit"));
+                  },
+                }),
               ]}
             >
               <InputNumber min={0} max={1} precision={2} />
diff --git a/client/src/pages/manage/manage.page.component.jsx b/client/src/pages/manage/manage.page.component.jsx
index 32929bb41..a224c8148 100644
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -11,6 +11,7 @@ import ChatAffixContainer from "../../components/chat-affix/chat-affix.container
 import ConflictComponent from "../../components/conflict/conflict.component";
 import ErrorBoundary from "../../components/error-boundary/error-boundary.component";
 import FcmNotification from "../../components/fcm-notification/fcm-notification.component";
+import preval from "preval.macro";
 //import FooterComponent from "../../components/footer/footer.component";
 //Component Imports
 import HeaderContainer from "../../components/header/header.container";
@@ -402,7 +403,9 @@ export function Manage({ match, conflict }) {
         <BackTop />
         <div style={{ textAlign: "center", margin: "1rem 0rem" }}>
           <div>
-            {`ImEX Online V.${process.env.NODE_ENV}-${process.env.REACT_APP_GIT_SHA}`}
+            {`ImEX Online V.${process.env.NODE_ENV} - ${
+              process.env.REACT_APP_GIT_SHA
+            } - ${preval`module.exports = new Date().toLocaleString();`}`}
           </div>
           <Link to="/about" target="_blank" style={{ color: "#ccc" }}>
             Disclaimer
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 5e186ca7c..a00a8af29 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -216,8 +216,8 @@
 				"md_categories": "Categories",
 				"md_classes": "Classes",
 				"md_hour_split": {
-					"lab": "Body Hour Split",
-					"lar": "Refinish Hour Split"
+					"paint": "Paint Hour Split",
+					"prep": "Prep Hour Split"
 				},
 				"md_ins_co": {
 					"city": "City",
@@ -432,6 +432,7 @@
 				"save": "Shop configuration saved successfully. "
 			},
 			"validation": {
+				"larsplit": "Refinish hour split must add up to 1.",
 				"useremailmustexist": "This email is not a valid user."
 			}
 		},
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index e7da811b1..ba47edd5c 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -216,8 +216,8 @@
 				"md_categories": "",
 				"md_classes": "",
 				"md_hour_split": {
-					"lab": "",
-					"lar": ""
+					"paint": "",
+					"prep": ""
 				},
 				"md_ins_co": {
 					"city": "",
@@ -432,6 +432,7 @@
 				"save": ""
 			},
 			"validation": {
+				"larsplit": "",
 				"useremailmustexist": ""
 			}
 		},
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index b469cbfa5..821a40d4d 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -216,8 +216,8 @@
 				"md_categories": "",
 				"md_classes": "",
 				"md_hour_split": {
-					"lab": "",
-					"lar": ""
+					"paint": "",
+					"prep": ""
 				},
 				"md_ins_co": {
 					"city": "",
@@ -432,6 +432,7 @@
 				"save": ""
 			},
 			"validation": {
+				"larsplit": "",
 				"useremailmustexist": ""
 			}
 		},