Resolve note saving issue.

Hotfix/2022 05 10

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
@@ -3586,6 +3586,27 @@
                             <folder_node>
                                 <name>fields</name>
                                 <children>
+                                    <concept_node>
+                                        <name>ReceivableCustomField</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>address1</name>
                                         <definition_loaded>false</definition_loaded>
@@ -4577,6 +4598,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>localmediatoken</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>logo_img_footer_margin</name>
                                         <definition_loaded>false</definition_loaded>
@@ -31726,6 +31768,27 @@
                             <folder_node>
                                 <name>labels</name>
                                 <children>
+                                    <concept_node>
+                                        <name>addtorelatedro</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>newnoteplaceholder</name>
                                         <definition_loaded>false</definition_loaded>
@@ -38625,6 +38688,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>credits_not_received_date_vendorid</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>csi</name>
                                         <definition_loaded>false</definition_loaded>

client/src/components/documents-local-upload/documents-local-upload.utility.js

@@ -7,8 +7,12 @@ export const handleUpload = async ({ ev, context }) => {
   const { onError, onSuccess, onProgress, file } = ev;
   const { jobid, invoice_number, vendorid, callbackAfterUpload } = context;
 
+  const bodyshop = store.getState().user.bodyshop;
   var options = {
-    headers: { "X-Requested-With": "XMLHttpRequest" },
+    headers: {
+      "X-Requested-With": "XMLHttpRequest",
+      ims_token: bodyshop.localmediatoken,
+    },
     onUploadProgress: (e) => {
       if (!!onProgress) onProgress({ percent: (e.loaded / e.total) * 100 });
     },
@@ -22,7 +26,6 @@ export const handleUpload = async ({ ev, context }) => {
     formData.append("vendorid", vendorid);
   }
   formData.append("file", file);
-  const bodyshop = store.getState().user.bodyshop;
 
   const imexMediaServerResponse = await cleanAxios.post(
     normalizeUrl(

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-documents-local-gallery/jobs-documents-local-gallery.container.jsx

@@ -15,6 +15,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import { CreateExplorerLinkForJob } from "../../utils/localmedia";
 import DocumentsLocalUploadComponent from "../documents-local-upload/documents-local-upload.component";
 import JobsDocumentsLocalGalleryReassign from "./jobs-documents-local-gallery.reassign.component";
+import JobsDocumentsLocalGallerySelectAllComponent from "./jobs-documents-local-gallery.selectall.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -76,6 +77,7 @@ export function JobsDocumentsLocalGallery({
           <Button>{t("documents.labels.openinexplorer")}</Button>
         </a>
         <JobsDocumentsLocalGalleryReassign jobid={job.id} />
+        <JobsDocumentsLocalGallerySelectAllComponent jobid={job.id} />
       </Space>
       <Card>
         <DocumentsLocalUploadComponent

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.reassign.component.jsx

@@ -39,11 +39,15 @@ export function JobsDocumentsLocalGalleryReassign({
     setLoading(true);
     const selectedDocuments = allMedia[jobid].filter((m) => m.isSelected);
 
-    await cleanAxios.post(`${bodyshop.localmediaserverhttp}/jobs/move`, {
-      from_jobid: jobid,
-      jobid: newJobid,
-      files: selectedDocuments.map((f) => f.filename),
-    });
+    await cleanAxios.post(
+      `${bodyshop.localmediaserverhttp}/jobs/move`,
+      {
+        from_jobid: jobid,
+        jobid: newJobid,
+        files: selectedDocuments.map((f) => f.filename),
+      },
+      { headers: { ims_token: bodyshop.localmediatoken } }
+    );
 
     getJobMedia(jobid);
     setVisible(false);

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.selectall.component.jsx

@@ -0,0 +1,53 @@
+import { Button, Space } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import {
+  selectAllmediaForJob,
+  deselectAllMediaForJob,
+} from "../../redux/media/media.actions";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+});
+const mapDispatchToProps = (dispatch) => ({
+  selectAllmediaForJob: (jobid) => dispatch(selectAllmediaForJob(jobid)),
+  deselectAllmediaForJob: (jobid) => dispatch(deselectAllMediaForJob(jobid)),
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobsDocumentsLocalGallerySelectAllComponent);
+
+export function JobsDocumentsLocalGallerySelectAllComponent({
+  jobid,
+  selectAllmediaForJob,
+  deselectAllmediaForJob,
+}) {
+  const { t } = useTranslation();
+
+  // onSelectImage={(index, image) => {
+  //     toggleMediaSelected({ jobid: job.id, filename: image.filename });
+  //   }}
+
+  const handleSelectAll = () => {
+    selectAllmediaForJob({ jobid });
+  };
+
+  const handleDeselectAll = () => {
+    deselectAllmediaForJob({ jobid });
+  };
+
+  return (
+    <Space wrap>
+      <Button onClick={handleSelectAll}>
+        {t("general.actions.selectall")}
+      </Button>
+
+      <Button onClick={handleDeselectAll}>
+        {t("general.actions.deselectall")}
+      </Button>
+    </Space>
+  );
+}

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,44 @@ export function NoteUpsertModalContainer({
       toggleModalVisible();
     } else {
       logImEXEvent("job_note_insert");
+      const AdditionalNoteInserts = relatedros
+        ? Object.keys(relatedros).filter((key) => relatedros[key])
+        : [];
 
-      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 {
@@ -603,6 +620,12 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Input />
         </Form.Item>
+        <Form.Item
+          name={["localmediatoken"]}
+          label={t("bodyshop.fields.localmediatoken")}
+        >
+          <Input />
+        </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow grow header={t("bodyshop.labels.messagingpresets")}>
         <Form.List name={["md_messaging_presets"]}>
@@ -701,7 +724,7 @@ export default function ShopInfoGeneral({ form }) {
                           },
                         ]}
                       >
-                        <Input />
+                        <Input.TextArea rows={3} />
                       </Form.Item>
                       <Space wrap>
                         <DeleteFilled
@@ -1469,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>
+);

client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx

@@ -6,15 +6,20 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useHistory, useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
 import { GET_JOB_BY_PK } from "../../graphql/jobs.queries";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import JobLinesContainer from "../job-detail-lines/job-lines.container";
 import JobsDetailHeader from "../jobs-detail-header/jobs-detail-header.component";
 import JobsDocumentsGalleryContainer from "../jobs-documents-gallery/jobs-documents-gallery.container";
+import JobsDocumentsLocalGallery from "../jobs-documents-local-gallery/jobs-documents-local-gallery.container";
 import JobNotesContainer from "../jobs-notes/jobs-notes.container";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 
+const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop });
+
 const mapDispatchToProps = (dispatch) => ({
   setPrintCenterContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "printCenter" })),
@@ -29,7 +34,7 @@ const mapDispatchToProps = (dispatch) => ({
 //   },
 // };
 
-export function JobDetailCards({ setPrintCenterContext }) {
+export function TechLookupJobsDrawer({ bodyshop, setPrintCenterContext }) {
   const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
     .filter((screen) => !!screen[1])
     .slice(-1)[0];
@@ -110,7 +115,13 @@ export function JobDetailCards({ setPrintCenterContext }) {
               />
             </Tabs.TabPane>
             <Tabs.TabPane key="documents" tab={t("jobs.labels.documents")}>
-              <JobsDocumentsGalleryContainer jobId={searchParams.selected} />
+              {bodyshop.uselocalmediaserver ? (
+                <JobsDocumentsLocalGallery
+                  job={data ? data.jobs_by_pk : null}
+                />
+              ) : (
+                <JobsDocumentsGalleryContainer jobId={searchParams.selected} />
+              )}
             </Tabs.TabPane>
             <Tabs.TabPane key="notes" tab={t("jobs.labels.notes")}>
               <JobNotesContainer jobId={searchParams.selected} />
@@ -121,4 +132,7 @@ export function JobDetailCards({ setPrintCenterContext }) {
     </Drawer>
   );
 }
-export default connect(null, mapDispatchToProps)(JobDetailCards);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TechLookupJobsDrawer);

client/src/graphql/bodyshop.queries.js

@@ -110,6 +110,7 @@ export const QUERY_BODYSHOP = gql`
       uselocalmediaserver
       localmediaserverhttp
       localmediaservernetwork
+      localmediatoken
       employees {
         user_email
         id
@@ -218,6 +219,7 @@ export const UPDATE_SHOP = gql`
         uselocalmediaserver
         localmediaserverhttp
         localmediaservernetwork
+        localmediatoken
         employees {
           id
           first_name

client/src/graphql/notes.queries.js

@@ -15,6 +15,14 @@ export const QUERY_NOTES_BY_JOB_PK = gql`
     jobs_by_pk(id: $id) {
       id
       ro_number
+      vehicle{
+        jobs{
+          id
+          ro_number
+          status
+          clm_no
+        }
+      }
       notes {
         created_at
         created_by

client/src/redux/media/media.actions.js

@@ -32,3 +32,13 @@ export const toggleMediaSelected = ({ jobid, filename }) => ({
   type: MediaActionTypes.TOGGLE_MEDIA_SELECTED,
   payload: { jobid, filename },
 });
+
+export const deselectAllMediaForJob = ({ jobid }) => ({
+  type: MediaActionTypes.DESELECT_ALL_MEDIA_FOR_JOB,
+  payload: { jobid },
+});
+
+export const selectAllmediaForJob = ({ jobid }) => ({
+  type: MediaActionTypes.SELECT_ALL_MEDIA_FOR_JOB,
+  payload: { jobid },
+});

client/src/redux/media/media.reducer.js

@@ -26,6 +26,23 @@ const mediaReducer = (state = INITIAL_STATE, action) => {
           return p;
         }),
       };
+    case MediaActionTypes.SELECT_ALL_MEDIA_FOR_JOB:
+      return {
+        ...state,
+        [action.payload.jobid]: state[action.payload.jobid].map((p) => {
+          p.isSelected = true;
+
+          return p;
+        }),
+      };
+    case MediaActionTypes.DESELECT_ALL_MEDIA_FOR_JOB:
+      return {
+        ...state,
+        [action.payload.jobid]: state[action.payload.jobid].map((p) => {
+          p.isSelected = false;
+          return p;
+        }),
+      };
     default:
       return state;
   }

client/src/redux/media/media.sagas.js

@@ -9,22 +9,23 @@ export function* onSetJobMedia() {
 }
 export function* getJobMedia({ payload: jobid }) {
   try {
-    const localmediaserverhttp = (yield select(
-      (state) => state.user.bodyshop.localmediaserverhttp
-    )).trim();
+    const bodyshop = yield select((state) => state.user.bodyshop);
+    const localmediaserverhttp = bodyshop.localmediaserverhttp.trim();
 
     if (localmediaserverhttp && localmediaserverhttp !== "") {
       const imagesFetch = yield cleanAxios.post(
         `${localmediaserverhttp}/jobs/list`,
         {
           jobid,
-        }
+        },
+        { headers: { ims_token: bodyshop.localmediatoken } }
       );
       const documentsFetch = yield cleanAxios.post(
         `${localmediaserverhttp}/bills/list`,
         {
           jobid,
-        }
+        },
+        { headers: { ims_token: bodyshop.localmediatoken } }
       );
 
       yield put(
@@ -66,9 +67,8 @@ export function* onSetBillMedia() {
 }
 export function* getBillMedia({ payload: { jobid, invoice_number } }) {
   try {
-    const localmediaserverhttp = (yield select(
-      (state) => state.user.bodyshop.localmediaserverhttp
-    )).trim();
+    const bodyshop = yield select((state) => state.user.bodyshop);
+    const localmediaserverhttp = bodyshop.localmediaserverhttp.trim();
 
     if (localmediaserverhttp && localmediaserverhttp !== "") {
       const documentsFetch = yield cleanAxios.post(
@@ -76,7 +76,8 @@ export function* getBillMedia({ payload: { jobid, invoice_number } }) {
         {
           jobid,
           invoice_number,
-        }
+        },
+        { headers: { ims_token: bodyshop.localmediatoken } }
       );
 
       yield put(

client/src/redux/media/media.types.js

@@ -4,9 +4,8 @@ const MediaActionTypes = {
   GET_MEDIA_FOR_JOB_ERROR: "GET_MEDIA_FOR_JOB_ERROR",
   ADD_MEDIA_FOR_JOB: "ADD_MEDIA_FOR_JOB",
   TOGGLE_MEDIA_SELECTED: "TOGGLE_MEDIA_SELECTED",
-  POST_MEDIA_FOR_JOB: "POST_MEDIA_FOR_JOB",
-  POST_MEDIA_FOR_JOB_SUCCESS: "POST_MEDIA_FOR_JOB_SUCCESS",
-  POST_MEDIA_FOR_JOB_ERROR: "POST_MEDIA_FOR_JOB_ERROR",
   GET_MEDIA_FOR_BILL: "GET_MEDIA_FOR_BILL",
+  SELECT_ALL_MEDIA_FOR_JOB: "SELECT_ALL_MEDIA_FOR_JOB",
+  DESELECT_ALL_MEDIA_FOR_JOB: "DESELECT_ALL_MEDIA_FOR_JOB",
 };
 export default MediaActionTypes;

client/src/translations/en_us/common.json

@@ -228,6 +228,7 @@
 				"saving": "Error encountered while saving. {{message}}"
 			},
 			"fields": {
+				"ReceivableCustomField": "QBO Receivable Custom Field {{number}}",
 				"address1": "Address 1",
 				"address2": "Address 2",
 				"appt_alt_transport": "Appointment Alternative Transportation Options",
@@ -284,6 +285,7 @@
 				"lastnumberworkingdays": "Scoreboard - Last Number of Working Days",
 				"localmediaserverhttp": "Local Media Server - HTTP Path",
 				"localmediaservernetwork": "Local Media Server - Network Path",
+				"localmediatoken": "Local Media Server - Token",
 				"logo_img_footer_margin": "Footer Margin (px)",
 				"logo_img_header_margin": "Header Margin (px)",
 				"logo_img_path": "Shop Logo",
@@ -1864,6 +1866,7 @@
 				"updatedat": "Updated At"
 			},
 			"labels": {
+				"addtorelatedro": "Add to Related ROs",
 				"newnoteplaceholder": "Add a note...",
 				"notetoadd": "Note to Add"
 			},
@@ -2300,6 +2303,7 @@
 				"attendance_employee": "Employee Attendance",
 				"attendance_summary": "Attendance Summary (All Employees)",
 				"credits_not_received_date": "Credits not Received by Date",
+				"credits_not_received_date_vendorid": "Credits not Received by Vendor",
 				"csi": "CSI Responses",
 				"estimates_written_converted": "Estimates Written/Converted",
 				"estimator_detail": "Jobs by Estimator (Detail)",

client/src/translations/es/common.json

@@ -228,6 +228,7 @@
 				"saving": ""
 			},
 			"fields": {
+				"ReceivableCustomField": "",
 				"address1": "",
 				"address2": "",
 				"appt_alt_transport": "",
@@ -284,6 +285,7 @@
 				"lastnumberworkingdays": "",
 				"localmediaserverhttp": "",
 				"localmediaservernetwork": "",
+				"localmediatoken": "",
 				"logo_img_footer_margin": "",
 				"logo_img_header_margin": "",
 				"logo_img_path": "",
@@ -1864,6 +1866,7 @@
 				"updatedat": "Actualizado en"
 			},
 			"labels": {
+				"addtorelatedro": "",
 				"newnoteplaceholder": "Agrega una nota...",
 				"notetoadd": ""
 			},
@@ -2300,6 +2303,7 @@
 				"attendance_employee": "",
 				"attendance_summary": "",
 				"credits_not_received_date": "",
+				"credits_not_received_date_vendorid": "",
 				"csi": "",
 				"estimates_written_converted": "",
 				"estimator_detail": "",

client/src/translations/fr/common.json

@@ -228,6 +228,7 @@
 				"saving": ""
 			},
 			"fields": {
+				"ReceivableCustomField": "",
 				"address1": "",
 				"address2": "",
 				"appt_alt_transport": "",
@@ -284,6 +285,7 @@
 				"lastnumberworkingdays": "",
 				"localmediaserverhttp": "",
 				"localmediaservernetwork": "",
+				"localmediatoken": "",
 				"logo_img_footer_margin": "",
 				"logo_img_header_margin": "",
 				"logo_img_path": "",
@@ -1864,6 +1866,7 @@
 				"updatedat": "Mis à jour à"
 			},
 			"labels": {
+				"addtorelatedro": "",
 				"newnoteplaceholder": "Ajouter une note...",
 				"notetoadd": ""
 			},
@@ -2300,6 +2303,7 @@
 				"attendance_employee": "",
 				"attendance_summary": "",
 				"credits_not_received_date": "",
+				"credits_not_received_date_vendorid": "",
 				"csi": "",
 				"estimates_written_converted": "",
 				"estimator_detail": "",

client/src/utils/TemplateConstants.js

@@ -1510,6 +1510,22 @@ export const TemplateList = (type, context) => {
             },
             group: "sales",
           },
+          credits_not_received_date_vendorid: {
+            title: i18n.t(
+              "reportcenter.templates.credits_not_received_date_vendorid"
+            ),
+            subject: i18n.t(
+              "reportcenter.templates.credits_not_received_date_vendorid"
+            ),
+            key: "credits_not_received_date_vendorid",
+            idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open"),
+            },
+            group: "purchases",
+          },
         }
       : {}),
     ...(!type || type === "courtesycarcontract"

client/src/utils/localmedia.js

@@ -2,5 +2,5 @@ import { store } from "../redux/store";
 
 export function CreateExplorerLinkForJob({ jobid }) {
   const bodyshop = store.getState().user.bodyshop;
-  return `imexmedia://${bodyshop.localmediaservernetwork}/Jobs/${jobid}`;
+  return `imexmedia://${bodyshop.localmediaservernetwork}\\Jobs\\${jobid}`;
 }

hasura/metadata/tables.yaml

@@ -837,6 +837,7 @@
           - last_name_first
           - localmediaserverhttp
           - localmediaservernetwork
+          - localmediatoken
           - logo_img_path
           - md_categories
           - md_ccc_rates
@@ -927,6 +928,7 @@
           - last_name_first
           - localmediaserverhttp
           - localmediaservernetwork
+          - localmediatoken
           - logo_img_path
           - md_categories
           - md_ccc_rates

hasura/migrations/1652310700998_alter_table_public_bodyshops_add_column_localmediatoken/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "localmediatoken" text
+--  null;

hasura/migrations/1652310700998_alter_table_public_bodyshops_add_column_localmediatoken/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "localmediatoken" text
+ null;

package.json

@@ -3,8 +3,8 @@
   "version": "0.0.1",
   "license": "UNLICENSED",
   "engines": {
-    "node": "16.15.0",
-    "npm": "7.17.0"
+    "node": ">=16.0.0",
+    "npm": ">=8.0.0"
   },
   "scripts": {
     "setup": "yarn && cd client && yarn",

server/accounting/qbo/qbo-receivables.js

@@ -503,7 +503,38 @@ async function InsertInvoice(
       bodyshop.accountingconfig.qbo_departmentid.trim() !== "" && {
         DepartmentRef: { value: bodyshop.accountingconfig.qbo_departmentid },
       }),
-
+    CustomField: [
+      ...(bodyshop.accountingconfig.ReceivableCustomField1
+        ? [
+            {
+              DefinitionId: "1",
+              StringValue:
+                job[bodyshop.accountingconfig.ReceivableCustomField1],
+              Type: "StringType",
+            },
+          ]
+        : []),
+      ...(bodyshop.accountingconfig.ReceivableCustomField2
+        ? [
+            {
+              DefinitionId: "2",
+              StringValue:
+                job[bodyshop.accountingconfig.ReceivableCustomField2],
+              Type: "StringType",
+            },
+          ]
+        : []),
+      ...(bodyshop.accountingconfig.ReceivableCustomField3
+        ? [
+            {
+              DefinitionId: "3",
+              StringValue:
+                job[bodyshop.accountingconfig.ReceivableCustomField3],
+              Type: "StringType",
+            },
+          ]
+        : []),
+    ],
     ...(bodyshop.accountingconfig &&
       bodyshop.accountingconfig.qbo &&
       bodyshop.accountingconfig.qbo_usa &&

server/graphql-client/queries.js

@@ -139,6 +139,7 @@ query QUERY_JOBS_FOR_RECEIVABLES_EXPORT($ids: [uuid!]!) {
   jobs(where: {id: {_in: $ids}}) {
     id
     job_totals
+    ded_amt
     date_invoiced
     ro_number
     clm_total
@@ -459,6 +460,7 @@ exports.QUERY_PAYMENTS_FOR_EXPORT = `
     md_responsibility_centers
     accountingconfig
     timezone
+    md_ins_cos
   }
     payments(where: {id: {_in: $payments}}) {
       id
@@ -486,6 +488,7 @@ exports.QUERY_PAYMENTS_FOR_EXPORT = `
         bodyshop{
           accountingconfig
           md_responsibility_centers
+          md_ins_cos
         }
       }
       transactionid