Merged in feature/2020-06-04 (pull request #97)

Feature/2020 06 04

bodyshop_translations.babel

@@ -2527,6 +2527,27 @@
                             <folder_node>
                                 <name>validation</name>
                                 <children>
+                                    <concept_node>
+                                        <name>manualinhouse</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>unique_invoice_number</name>
                                         <definition_loaded>false</definition_loaded>

client/src/App/App.styles.scss

@@ -118,3 +118,9 @@
 .production-list-min-height {
   min-height: 19px;
 }
+
+#noticeable-widget {
+  iframe {
+    z-index: 2 !important;
+  }
+}

client/src/components/bill-form/bill-form.component.jsx

@@ -106,6 +106,18 @@ export function BillFormComponent({
               required: true,
               //message: t("general.validation.required"),
             },
+            ({ getFieldValue }) => ({
+              validator(rule, value) {
+                if (
+                  value &&
+                  !getFieldValue(["isinhouse"]) &&
+                  value === bodyshop.inhousevendorid
+                ) {
+                  return Promise.reject(t("bills.validation.manualinhouse"));
+                }
+                return Promise.resolve();
+              },
+            }),
           ]}
         >
           <VendorSearchSelect

client/src/redux/user/user.sagas.js

@@ -165,7 +165,7 @@ export function* onSignInSuccess() {
 export function* signInSuccessSaga({ payload }) {
   LogRocket.identify(payload.email);
   try {
-    window.$crisp.push(["set", "user:email", [payload.email]]);
+    // window.$crisp.push(["set", "user:email", [payload.email]]);
     window.$crisp.push([
       "set",
       "user:nickname",
@@ -236,6 +236,10 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
       (a) => a.useremail === userEmail
     );
 
+    if (authRecord[0] && authRecord[0].user.validemail) {
+      window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
+    }
+
     yield put(setAuthlevel(authRecord[0] ? authRecord[0].authlevel : 0));
     yield put(
       updateUserDetailsSuccess(

client/src/translations/en_us/common.json

@@ -167,6 +167,7 @@
 				"exported": "Bill exported successfully."
 			},
 			"validation": {
+				"manualinhouse": "Manual posting to the in house vendor is restricted. ",
 				"unique_invoice_number": "This invoice number has already been entered for this vendor."
 			}
 		},

client/src/translations/es/common.json

@@ -167,6 +167,7 @@
 				"exported": ""
 			},
 			"validation": {
+				"manualinhouse": "",
 				"unique_invoice_number": ""
 			}
 		},

client/src/translations/fr/common.json

@@ -167,6 +167,7 @@
 				"exported": ""
 			},
 			"validation": {
+				"manualinhouse": "",
 				"unique_invoice_number": ""
 			}
 		},