Merge branch 'hotfix/2022-05-10' into release/2022-05-13

client/src/components/job-lines-preset-button/job-lines-preset-button.component.jsx

@@ -24,7 +24,7 @@ export function JoblinePresetButton({ bodyshop, form }) {
   const menu = (
     <Menu>
       {bodyshop.md_jobline_presets.map((i, idx) => (
-        <Menu.Item onClick={() => handleSelect(i)} key={idx}>
+        <Menu.Item onClick={() => handleSelect(i)}  key={idx}>
           {i.label}
         </Menu.Item>
       ))}

client/src/components/jobs-notes/jobs-notes.container.jsx

@@ -61,6 +61,7 @@ export function JobNotesContainer({ jobId, insertAuditTrail }) {
       jobId={jobId}
       loading={loading}
       data={data ? data.jobs_by_pk.notes : null}
+      relatedRos={data ? data.jobs_by_pk.vehicle.jobs : null}
       refetch={refetch}
       deleteLoading={deleteLoading}
       handleNoteDelete={handleNoteDelete}

client/src/components/jobs-notes/jobs.notes.component.jsx

@@ -37,6 +37,7 @@ export function JobNotesComponent({
   setNoteUpsertContext,
   deleteLoading,
   ro_number,
+  relatedRos,
 }) {
   const { t } = useTranslation();
   const Templates = TemplateList("job_special", {
@@ -149,6 +150,7 @@ export function JobNotesComponent({
                 actions: { refetch: refetch },
                 context: {
                   jobId: jobId,
+                  relatedRos: relatedRos,
                 },
               });
             }}

client/src/components/note-upsert-modal/note-upsert-modal.component.jsx

@@ -1,51 +1,92 @@
-import { Col, Form, Input, Row, Switch } from "antd";
+import { Checkbox, Col, Form, Input, Row, Space, Switch, Tag } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectNoteUpsert } from "../../redux/modals/modals.selectors";
 import NotesPresetButton from "../notes-preset-button/notes-preset-button.component";
 
-export default function NoteUpsertModalComponent({ form }) {
+const mapStateToProps = createStructuredSelector({
+  noteUpsertModal: selectNoteUpsert,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(NoteUpsertModalComponent);
+
+export function NoteUpsertModalComponent({ form, noteUpsertModal }) {
   const { t } = useTranslation();
+  const { jobId, existingNote, relatedRos } = noteUpsertModal.context;
+
+  const filteredRelatedRos = relatedRos
+    ? relatedRos.filter((j) => j.id !== jobId)
+    : [];
 
   return (
-    <Row gutter={[16, 16]}>
-      <Col span={8}>
-        <Form.Item
-          label={t("notes.fields.critical")}
-          name="critical"
-          valuePropName="checked"
-        >
-          <Switch />
-        </Form.Item>
-      </Col>
-      <Col span={8}>
-        <Form.Item
-          label={t("notes.fields.private")}
-          name="private"
-          valuePropName="checked"
-        >
-          <Switch />
-        </Form.Item>
-      </Col>
-      <Col span={8}>
-        <NotesPresetButton form={form} />
-      </Col>
-      <Col span={24}>
-        <Form.Item
-          label={t("notes.fields.text")}
-          name="text"
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
-          <Input.TextArea
-            rows={8}
-            placeholder={t("notes.labels.newnoteplaceholder")}
-          />
-        </Form.Item>
-      </Col>
-    </Row>
+    <>
+      <Row gutter={[16, 16]}>
+        <Col span={8}>
+          <Form.Item
+            label={t("notes.fields.critical")}
+            name="critical"
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <Form.Item
+            label={t("notes.fields.private")}
+            name="private"
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+        </Col>
+        <Col span={8}>
+          <NotesPresetButton form={form} />
+        </Col>
+        <Col span={24}>
+          <Form.Item
+            label={t("notes.fields.text")}
+            name="text"
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <Input.TextArea
+              rows={8}
+              placeholder={t("notes.labels.newnoteplaceholder")}
+            />
+          </Form.Item>
+        </Col>
+      </Row>
+      <div>
+        <div>{!existingNote && t("notes.labels.addtorelatedro")}</div>
+        {!existingNote &&
+          filteredRelatedRos.map((j, idx) => (
+            <Space key={j.id} align="center">
+              <Form.Item
+                noStyle
+                name={["relatedros", j.id]}
+                valuePropName="checked"
+              >
+                <Checkbox />
+              </Form.Item>
+              <Tag>
+                {`${j.ro_number || "N/A"}${j.clm_no ? ` | ${j.clm_no}` : ""}${
+                  j.status ? ` | ${j.status}` : ""
+                }`}
+              </Tag>
+            </Space>
+          ))}
+      </div>
+    </>
   );
 }

client/src/components/note-upsert-modal/note-upsert-modal.container.jsx

@@ -4,14 +4,14 @@ import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_NEW_NOTE, UPDATE_NOTE } from "../../graphql/notes.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectNoteUpsert } from "../../redux/modals/modals.selectors";
 import { selectCurrentUser } from "../../redux/user/user.selectors";
-import NoteUpsertModalComponent from "./note-upsert-modal.component";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import { insertAuditTrail } from "../../redux/application/application.actions";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import NoteUpsertModalComponent from "./note-upsert-modal.component";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -48,7 +48,9 @@ export function NoteUpsertModalContainer({
     }
   }, [existingNote, form, visible]);
 
-  const handleFinish = (values) => {
+  const handleFinish = async (formValues) => {
+    const { relatedros, ...values } = formValues;
+
     if (existingNote) {
       logImEXEvent("job_note_update");
 
@@ -70,24 +72,48 @@ export function NoteUpsertModalContainer({
       toggleModalVisible();
     } else {
       logImEXEvent("job_note_insert");
+      const AdditionalNoteInserts = Object.keys(relatedros).filter(
+        (key) => relatedros[key]
+      );
+      console.log(
+        "🚀 ~ file: note-upsert-modal.container.jsx ~ line 78 ~ handleFinish ~ AdditionalNoteInserts",
+        AdditionalNoteInserts
+      );
 
-      insertNote({
+      await insertNote({
         variables: {
           noteInput: [
             { ...values, jobid: jobId, created_by: currentUser.email },
           ],
         },
-      }).then((r) => {
-        if (refetch) refetch();
-        form.resetFields();
-        toggleModalVisible();
-        notification["success"]({
-          message: t("notes.successes.create"),
-        });
-        insertAuditTrail({
-          jobid: context.jobId,
-          operation: AuditTrailMapping.jobnoteadded(),
+      });
+
+      if (AdditionalNoteInserts.length > 0) {
+        //Insert the others.
+        AdditionalNoteInserts.forEach(async (newJobId) => {
+          await insertNote({
+            variables: {
+              noteInput: [
+                { ...values, jobid: newJobId, created_by: currentUser.email },
+              ],
+            },
+          });
+          insertAuditTrail({
+            jobid: newJobId,
+            operation: AuditTrailMapping.jobnoteadded(),
+          });
         });
+      }
+
+      if (refetch) refetch();
+      form.resetFields();
+      toggleModalVisible();
+      notification["success"]({
+        message: t("notes.successes.create"),
+      });
+      insertAuditTrail({
+        jobid: context.jobId,
+        operation: AuditTrailMapping.jobnoteadded(),
       });
     }
   };

client/src/components/notes-preset-button/notes-preset-button.component.jsx

@@ -24,7 +24,7 @@ export function NotesPresetButton({ bodyshop, form }) {
   const menu = (
     <Menu>
       {bodyshop.md_notes_presets.map((i, idx) => (
-        <Menu.Item onClick={() => handleSelect(i)} key={idx}>
+        <Menu.Item onClick={() => handleSelect(i)}  key={idx}>
           {i.label}
         </Menu.Item>
       ))}

client/src/components/shop-info/shop-info.general.component.jsx

@@ -352,10 +352,27 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Switch />
         </Form.Item>
+        <Form.Item
+          name={["accountingconfig", "ReceivableCustomField1"]}
+          label={t("bodyshop.fields.ReceivableCustomField", { number: 1 })}
+        >
+          {ReceivableCustomFieldSelect}
+        </Form.Item>
+        <Form.Item
+          name={["accountingconfig", "ReceivableCustomField2"]}
+          label={t("bodyshop.fields.ReceivableCustomField", { number: 2 })}
+        >
+          {ReceivableCustomFieldSelect}
+        </Form.Item>
+        <Form.Item
+          name={["accountingconfig", "ReceivableCustomField3"]}
+          label={t("bodyshop.fields.ReceivableCustomField", { number: 3 })}
+        >
+          {ReceivableCustomFieldSelect}
+        </Form.Item>
         <Form.Item
           name={["md_classes"]}
           label={t("bodyshop.fields.md_classes")}
-          dependencies={["enforce_class"]}
           rules={[
             ({ getFieldValue }) => {
               return {
@@ -707,7 +724,7 @@ export default function ShopInfoGeneral({ form }) {
                           },
                         ]}
                       >
-                        <Input />
+                        <Input.TextArea rows={3} />
                       </Form.Item>
                       <Space wrap>
                         <DeleteFilled
@@ -1475,3 +1492,11 @@ export default function ShopInfoGeneral({ form }) {
     </div>
   );
 }
+
+const ReceivableCustomFieldSelect = (
+  <Select>
+    <Select.Option value="v_vin">VIN</Select.Option>
+    <Select.Option value="clm_no">Claim No.</Select.Option>
+    <Select.Option value="ded_amt">Deductible Amount</Select.Option>
+  </Select>
+);