BOD-59 Added vehicle fields to job and updated wherever appropriate to use Job fields instead.

client/src/components/invoice-enter-modal/invoice-enter-modal.component.jsx

@@ -75,9 +75,9 @@ export default function InvoiceEnterModalComponent({
                     >
                       {`${
                         o.ro_number ? o.ro_number : o.est_number
-                      } | ${o.ownr_ln || ""} ${o.ownr_fn || ""} | ${o.vehicle
-                        .v_model_yr || ""} ${o.vehicle.v_make_desc || ""} ${o
-                        .vehicle.v_model_desc || ""}`}
+                      } | ${o.ownr_ln || ""} ${o.ownr_fn ||
+                        ""} | ${o.v_model_yr || ""} ${o.v_make_desc ||
+                        ""} ${o.v_model_desc || ""}`}
                     </Select.Option>
                   ))
                 : null}

client/src/components/job-detail-cards/job-detail-cards.customer.component.jsx

@@ -11,7 +11,8 @@ export default function JobDetailCardsCustomerComponent({ loading, data }) {
     <CardTemplate
       loading={loading}
       title={t("jobs.labels.cards.customer")}
-      extraLink={data && data.owner ? `/manage/owners/${data.owner.id}` : null}>
+      extraLink={data && data.owner ? `/manage/owners/${data.owner.id}` : null}
+    >
       {data ? (
         <span>
           <div>
@@ -35,9 +36,9 @@ export default function JobDetailCardsCustomerComponent({ loading, data }) {
           </div>
           <div>{`${(data.owner && data.owner.preferred_contact) || ""}`}</div>
           {data.vehicle ? (
-            <Link to={`/manage/vehicles/${data.vehicle.id}`}>
-              {`${data.vehicle.v_model_yr || ""} ${data.vehicle.v_make_desc ||
-                ""} ${data.vehicle.v_model_desc || ""}`}
+            <Link to={`/manage/vehicles/${data.vehicleid}`}>
+              {`${data.v_model_yr || ""} ${data.v_make_desc ||
+                ""} ${data.v_model_desc || ""}`}
             </Link>
           ) : (
             <span>{t("jobs.errors.novehicle")}</span>

client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.search.component.jsx

@@ -82,7 +82,12 @@ export default function JobsCreateVehicleInfoSearchComponent({
         onSelect: props => {
           setState({
             ...state,
-            vehicle: { ...state.vehicle, new: false, selectedid: props.id }
+            vehicle: {
+              ...state.vehicle,
+              new: false,
+              selectedid: props.id,
+              vehicleObj: props
+            }
           });
         },
         type: "radio",
@@ -98,7 +103,8 @@ export default function JobsCreateVehicleInfoSearchComponent({
                   vehicle: {
                     ...state.vehicle,
                     new: false,
-                    selectedid: record.id
+                    selectedid: record.id,
+                    vehicleObj: record
                   }
                 });
 
@@ -107,7 +113,7 @@ export default function JobsCreateVehicleInfoSearchComponent({
             }
             setState({
               ...state,
-              vehicle: { ...state.vehicle, selectedid: null }
+              vehicle: { ...state.vehicle, selectedid: null, vehicleObj: null }
             });
           }
         };

client/src/components/jobs-detail-header/jobs-detail-header.component.jsx

@@ -114,15 +114,23 @@ export default connect(
           {job.status ? <Tag color="blue">{job.status}</Tag> : null}
           <OwnerTagPopoverComponent job={job} />
           <Tag color="green">
-            {job.vehicle ? (
-              <Link to={`/manage/vehicles/${job.vehicle.id}`}>
-                {job.vehicle.v_model_yr || t("general.labels.na")}{" "}
-                {job.vehicle.v_make_desc || t("general.labels.na")}{" "}
-                {job.vehicle.v_model_desc || t("general.labels.na")} |{" "}
-                {job.vehicle.plate_no || t("general.labels.na")} |{" "}
-                {job.vehicle.v_vin || t("general.labels.na")}
+            {job.vehicleid ? (
+              <Link to={`/manage/vehicles/${job.vehicleid}`}>
+                {`${job.v_model_yr || t("general.labels.na")} 
+                ${job.v_make_desc || t("general.labels.na")} 
+                ${job.v_model_desc || t("general.labels.na")} | 
+                ${job.plate_no || t("general.labels.na")} | 
+                ${job.v_vin || t("general.labels.na")}`}
               </Link>
-            ) : null}
+            ) : (
+              <span>
+                {`${job.v_model_yr || t("general.labels.na")} 
+              ${job.v_make_desc || t("general.labels.na")} 
+              ${job.v_model_desc || t("general.labels.na")} | 
+              ${job.plate_no || t("general.labels.na")} | 
+              ${job.v_vin || t("general.labels.na")}`}
+              </span>
+            )}
           </Tag>
           <BarcodePopup value={job.id} />
         </span>

client/src/components/jobs-find-modal/jobs-find-modal.component.jsx

@@ -81,9 +81,9 @@ export default function JobsFindModalComponent({
       ellipsis: true,
       render: (text, record) => {
         return record.vehicle ? (
-          <Link to={"/manage/vehicles/" + record.vehicle.id}>
-            {record.vehicle.v_model_yr} {record.vehicle.v_make_desc}{" "}
-            {record.vehicle.v_model_desc}
+          <Link to={"/manage/vehicles/" + record.vehicleid}>
+            {`${record.v_model_yr || ""} ${record.v_make_desc ||
+              ""} ${record.v_model_desc || ""}`}
           </Link>
         ) : (
           t("jobs.errors.novehicle")

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

@@ -108,9 +108,9 @@ export default withRouter(function JobsList({
       ellipsis: true,
       render: (text, record) => {
         return record.vehicle ? (
-          <Link to={"/manage/vehicles/" + record.vehicle.id}>
-            {record.vehicle.v_model_yr} {record.vehicle.v_make_desc}{" "}
-            {record.vehicle.v_model_desc}
+          <Link to={"/manage/vehicles/" + record.vehicleid}>
+            {`${record.v_model_yr || ""} ${record.v_make_desc ||
+              ""} ${record.v_model_desc || ""}`}
           </Link>
         ) : (
           t("jobs.errors.novehicle")

client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx

@@ -29,11 +29,11 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
     },
     {
       title: t("jobs.fields.vehicle"),
-      dataIndex: "owner",
-      key: "owner",
+      dataIndex: "vehicleid",
+      key: "vehicleid",
       render: (text, record) => (
-        <Link to={`/manage/vehicles/${record.vehicle.id}`}>
-          {`${record.vehicle.v_model_yr} ${record.vehicle.v_make_desc} ${record.vehicle.v_model_desc}`}
+        <Link to={`/manage/vehicles/${record.vehicleid}`}>
+          {`${record.v_model_yr} ${record.v_make_desc} ${record.v_model_desc}`}
         </Link>
       )
     },
@@ -71,7 +71,7 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
       )}
       pagination={{ position: "bottom" }}
       columns={columns.map(item => ({ ...item }))}
-      rowKey='id'
+      rowKey="id"
       dataSource={owner.jobs}
       rowSelection={{
         onSelect: (record, selected, selectedRows) => {

client/src/components/schedule-event/schedule-event.component.jsx

@@ -17,9 +17,9 @@ export default function ScheduleEventComponent({ event, handleCancel }) {
             event.job.ownr_ln) ||
             ""}`}</strong>
           <span style={{ margin: 4 }}>
-            {`${(event.job && event.job.vehicle.v_model_yr) ||
-              ""} ${(event.job && event.job.vehicle.v_make_desc) ||
-              ""} ${(event.job && event.job.vehicle.v_model_desc) || ""}`}
+            {`${(event.job && event.job.v_model_yr) ||
+              ""} ${(event.job && event.job.v_make_desc) ||
+              ""} ${(event.job && event.job.v_model_desc) || ""}`}
           </span>
         </div>
       )}
@@ -85,9 +85,9 @@ export default function ScheduleEventComponent({ event, handleCancel }) {
               event.job.ownr_ln) ||
               ""}`}</strong>
             <span style={{ margin: 4 }}>
-              {`${(event.job && event.job.vehicle.v_model_yr) ||
-                ""} ${(event.job && event.job.vehicle.v_make_desc) ||
-                ""} ${(event.job && event.job.vehicle.v_model_desc) || ""}`}
+              {`${(event.job && event.job.v_model_yr) ||
+                ""} ${(event.job && event.job.v_make_desc) ||
+                ""} ${(event.job && event.job.v_model_desc) || ""}`}
             </span>
           </div>
         ) : (