IO-1095 unrequire fields on vehicle create.

Release Hotfix for 2021-05-21

_reference/test api setup.md

@@ -22,7 +22,7 @@ hooks.js:
 module.exports = [
   {
     path: "/pull",
-    command: "git pull && npm i",
+    command: "git pull && yarn && pm2 restart 0",
     cwd: "/home/ubuntu/io/",
     method: "post",
   },

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
@@ -20437,6 +20437,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>calc_repair_days</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>calc_repair_days_tt</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>
                                     <folder_node>
                                         <name>cards</name>
                                         <children>

client/package.json

@@ -20,6 +20,7 @@
     "dinero.js": "^1.8.1",
     "dotenv": "^9.0.2",
     "env-cmd": "^10.1.0",
+    "exifr": "^7.0.0",
     "firebase": "^8.6.0",
     "graphql": "^15.5.0",
     "i18next": "^20.2.2",

client/src/components/accounting-payments-table/accounting-payments-table.component.jsx

@@ -7,7 +7,7 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
 import PaymentExportButton from "../payment-export-button/payment-export-button.component";
-import { PaymentsExportAllButton } from "../payments-export-all-button/payments-export-all-button.component";
+import PaymentsExportAllButton from "../payments-export-all-button/payments-export-all-button.component";
 
 export default function AccountingPayablesTableComponent({
   loading,

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

@@ -5,6 +5,8 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_NEW_DOCUMENT } from "../../graphql/documents.queries";
 import { axiosAuthInterceptorId } from "../../utils/CleanAxios";
 import client from "../../utils/GraphQLClient";
+import exifr from "exifr";
+
 //Context: currentUserEmail, bodyshop, jobid, invoiceid
 
 //Required to prevent headers from getting set and rejected from Cloudinary.
@@ -85,6 +87,7 @@ export const uploadToCloudinary = async (
       if (!!onProgress) onProgress({ percent: (e.loaded / e.total) * 100 });
     },
   };
+
   const formData = new FormData();
   formData.append("file", file);
 
@@ -122,6 +125,12 @@ export const uploadToCloudinary = async (
   }
 
   //Insert the document with the matching key.
+  let takenat;
+  if (fileType.includes("image")) {
+    const exif = await exifr.parse(file);
+    console.log(`exif`, exif);
+    takenat = exif && exif.DateTimeOriginal;
+  }
   const documentInsert = await client.mutate({
     mutation: INSERT_NEW_DOCUMENT,
     variables: {
@@ -135,6 +144,7 @@ export const uploadToCloudinary = async (
           extension: extension,
           bodyshopid: bodyshop.id,
           size: cloudinaryUploadResponse.data.bytes || file.size,
+          takenat,
         },
       ],
     },

client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx

@@ -15,6 +15,7 @@ import {
 } from "../../../../redux/user/user.selectors";
 import ConfigFormComponents from "../../../config-form-components/config-form-components.component";
 import DateTimePicker from "../../../form-date-time-picker/form-date-time-picker.component";
+import moment from "moment-business-days";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -133,7 +134,14 @@ export function JobChecklistForm({
         initialValues={{
           ...(type === "intake" && {
             addToProduction: true,
-            scheduled_completion: job && job.scheduled_completion,
+            scheduled_completion:
+              (job && job.scheduled_completion) ||
+              moment().businessAdd(
+                (job.labhrs.aggregate.sum.mod_lb_hrs +
+                  job.larhrs.aggregate.sum.mod_lb_hrs) /
+                  bodyshop.target_touchtime,
+                "days"
+              ),
             scheduled_delivery: job && job.scheduled_delivery,
           }),
           ...(type === "deliver" && {

client/src/components/job-detail-lines/job-lines.component.jsx

@@ -313,9 +313,12 @@ export function JobLinesComponent({
     if (e.key === "clear") {
       setSelectedLines([]);
     } else {
+      const markedTypes = [e.key];
+      if (e.key === "PAN") markedTypes.push("PAP");
+      if (e.key === "PAS") markedTypes.push("PASL");
       setSelectedLines([
         ...selectedLines,
-        ...jobLines.filter((item) => item.part_type === e.key),
+        ...jobLines.filter((item) => markedTypes.includes(item.part_type)),
       ]);
     }
   };
@@ -378,7 +381,7 @@ export function JobLinesComponent({
                 setState({
                   ...state,
                   filteredInfo: {
-                    part_type: ["PAN,PAL,PAA,PAS,PASL"],
+                    part_type: ["PAN,PAL,PAA,PAP,PAS,PASL"],
                   },
                 });
               }}

client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx

@@ -123,7 +123,7 @@ export default function JobLinesUpsertModalComponent({
             //   }),
             // ]}
           >
-            <InputCurrency />
+            <InputNumber precision={1} />
           </Form.Item>
         </LayoutFormRow>
         <LayoutFormRow>

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

@@ -26,12 +26,6 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
   const { getFieldValue } = form;
   return (
     <div>
-      <JobsDetailRatesParts
-        jobRO={false}
-        expanded
-        required={selected && true}
-        form={form}
-      />
       <Collapse defaultActiveKey="insurance">
         <Collapse.Panel
           key="insurance"
@@ -57,7 +51,13 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
               <FormDatePicker />
             </Form.Item>
             <Form.Item label={t("jobs.fields.ins_co_nm")} name="ins_co_nm">
-              <Input />
+              <Select>
+                {bodyshop.md_ins_cos.map((s) => (
+                  <Select.Option key={s.name} value={s.name}>
+                    {s.name}
+                  </Select.Option>
+                ))}
+              </Select>
             </Form.Item>
             <Form.Item label={t("jobs.fields.ins_addr1")} name="ins_addr1">
               <Input />
@@ -312,6 +312,12 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
           </LayoutFormRow>
         </Collapse.Panel>
       </Collapse>
+      <JobsDetailRatesParts
+        jobRO={false}
+        expanded
+        required={selected && true}
+        form={form}
+      />
     </div>
   );
 }

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

@@ -83,24 +83,12 @@ export default function JobsCreateVehicleInfoNewComponent() {
         <Form.Item
           label={t("vehicles.fields.plate_st")}
           name={["vehicle", "data", "plate_st"]}
-          rules={[
-            {
-              required: state.vehicle.new,
-              //message: t("general.validation.required"),
-            },
-          ]}
         >
           <Input disabled={!state.vehicle.new} />
         </Form.Item>
         <Form.Item
           label={t("vehicles.fields.plate_no")}
           name={["vehicle", "data", "plate_no"]}
-          rules={[
-            {
-              required: state.vehicle.new,
-              //message: t("general.validation.required"),
-            },
-          ]}
         >
           <Input disabled={!state.vehicle.new} />
         </Form.Item>

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

@@ -1,4 +1,4 @@
-import { DatePicker, Form, Tooltip } from "antd";
+import { DatePicker, Form, Statistic, Tooltip } from "antd";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -23,6 +23,10 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
     );
   }, [job.status, bodyshop.md_ro_statuses.post_production_statuses]);
 
+  const calcRepairDays =
+    job.joblines.reduce((acc, val) => acc + val.mod_lb_hrs, 0) /
+    (bodyshop.target_touchtime === 0 ? 1 : bodyshop.target_touchtime);
+
   return (
     <div>
       <FormRow header={t("jobs.forms.estdates")}>
@@ -52,6 +56,17 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
         <Form.Item label={t("jobs.fields.actual_in")} name="actual_in">
           <DateTimePicker disabled={jobRO} />
         </Form.Item>
+        <Tooltip
+          title={t("jobs.labels.calc_repair_days_tt", {
+            target_touchtime: bodyshop.target_touchtime,
+          })}
+        >
+          <Statistic
+            value={calcRepairDays}
+            precision={1}
+            title={t("jobs.labels.calc_repair_days")}
+          />
+        </Tooltip>
       </FormRow>
       <FormRow header={t("jobs.forms.repairdates")}>
         <Form.Item

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

@@ -54,7 +54,13 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
         </Form.Item>
 
         <Form.Item label={t("jobs.fields.ins_co_nm")} name="ins_co_nm">
-          <Input disabled={jobRO} />
+          <Select disabled={jobRO}>
+            {bodyshop.md_ins_cos.map((s) => (
+              <Select.Option key={s.name} value={s.name}>
+                {s.name}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item label={t("jobs.fields.ins_addr1")} name="ins_addr1">
           <Input disabled={jobRO} />

client/src/components/jobs-documents-gallery/jobs-document-gallery.download.component.jsx

@@ -1,11 +1,17 @@
-import { Button } from "antd";
+import { Button, Space } from "antd";
 import axios from "axios";
-import React from "react";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import cleanAxios from "../../utils/CleanAxios";
+import formatBytes from "../../utils/formatbytes";
 
-export default function JobsDocumentsDownloadButton({ galleryImages }) {
+export default function JobsDocumentsDownloadButton({
+  galleryImages,
+  identifier,
+}) {
   const { t } = useTranslation();
+  const [download, setDownload] = useState(null);
   const imagesToDownload = [
     ...galleryImages.images.filter((image) => image.isSelected),
     ...galleryImages.other.filter((image) => image.isSelected),
@@ -18,13 +24,68 @@ export default function JobsDocumentsDownloadButton({ galleryImages }) {
         ids: imagesToDownload.map((_) => _.key),
       })
       .then((r) => {
-        window.open(r.data);
+        //     window.open(r.data);
+        downloadAs(
+          r.data,
+          `${identifier || "images"}.zip`,
+          (progressEvent) => {
+            const percentage = Math.round(
+              (progressEvent.loaded * 100) / progressEvent.total
+            );
+            console.log(progressEvent, percentage);
+            setDownload((currentDownloadState) => {
+              return {
+                downloaded: progressEvent.loaded || 0,
+                speed:
+                  (progressEvent.loaded || 0) -
+                  ((currentDownloadState && currentDownloadState.downloaded) ||
+                    0),
+              };
+            });
+          },
+          () => setDownload(null)
+        );
       });
   };
 
   return (
-    <Button disabled={imagesToDownload.length < 1} onClick={handleDownload}>
+    <>
-      {t("documents.actions.download")}
+      <Button
-    </Button>
+        loading={!!download}
+        disabled={imagesToDownload.length < 1}
+        onClick={handleDownload}
+      >
+        <Space>
+          <span>{t("documents.actions.download")}</span>
+          {download && (
+            <span>{`(${formatBytes(download.downloaded)} @ ${formatBytes(
+              download.speed
+            )} / second)`}</span>
+          )}
+        </Space>
+      </Button>
+    </>
   );
 }
+
+const downloadAs = (url, name, onDownloadProgress, onCompleted) => {
+  cleanAxios
+    .get(url, {
+      headers: {
+        "Content-Type": "application/octet-stream",
+      },
+      responseType: "blob",
+      onDownloadProgress: onDownloadProgress,
+    })
+    .then((response) => {
+      onCompleted && onCompleted();
+      const a = document.createElement("a");
+      const url = window.URL.createObjectURL(response.data);
+      a.href = url;
+      a.download = name;
+      a.click();
+    })
+    .catch((err) => {
+      console.log("error", err);
+    });
+};

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

@@ -17,7 +17,7 @@ function JobsDocumentsComponent({
   billId,
   billsCallback,
   totalSize,
-  bodyshop,
+  downloadIdentifier,
   ignoreSizeLimit,
 }) {
   const [galleryImages, setgalleryImages] = useState({ images: [], other: [] });
@@ -117,7 +117,10 @@ function JobsDocumentsComponent({
               galleryImages={galleryImages}
               setGalleryImages={setgalleryImages}
             />
-            <JobsDocumentsDownloadButton galleryImages={galleryImages} />
+            <JobsDocumentsDownloadButton
+              galleryImages={galleryImages}
+              identifier={downloadIdentifier}
+            />
             <JobsDocumentsDeleteButton
               galleryImages={galleryImages}
               deletionCallback={billsCallback || refetch}
@@ -173,6 +176,7 @@ function JobsDocumentsComponent({
                   backgroundImage: <FileExcelFilled />,
                   height: "100%",
                   width: "100%",
+                  cursor: "pointer",
                 };
               }}
               onClickThumbnail={(index) => {

client/src/components/jobs-documents-gallery/jobs-documents-gallery.container.jsx

@@ -23,6 +23,7 @@ export default function JobsDocumentsContainer({
   return (
     <JobDocuments
       data={(data && data.documents) || documentsList || []}
+      downloadIdentifier={data && data.jobs_by_pk.ro_number}
       totalSize={data && data.documents_aggregate.aggregate.sum.size}
       billId={billId}
       jobId={jobId}

client/src/components/labor-allocations-table/labor-allocations-table.component.jsx

@@ -110,7 +110,7 @@ export function LaborAllocationsTable({
       render: (text, record) => (
         <strong
           style={{
-            color: record.difference > 0 ? "green" : "red",
+            color: record.difference >= 0 ? "green" : "red",
           }}
         >
           {record.difference}

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

@@ -31,55 +31,19 @@ export default function OwnerDetailFormComponent({ form, loading }) {
       </LayoutFormRow>
 
       <LayoutFormRow header={t("owners.forms.address")}>
-        <Form.Item
+        <Form.Item label={t("owners.fields.ownr_addr1")} name="ownr_addr1">
-          label={t("owners.fields.ownr_addr1")}
-          name="ownr_addr1"
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
           <Input />
         </Form.Item>
         <Form.Item label={t("owners.fields.ownr_addr2")} name="ownr_addr2">
           <Input />
         </Form.Item>
-        <Form.Item
+        <Form.Item label={t("owners.fields.ownr_city")} name="ownr_city">
-          label={t("owners.fields.ownr_city")}
-          name="ownr_city"
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
           <Input />
         </Form.Item>
-        <Form.Item
+        <Form.Item label={t("owners.fields.ownr_st")} name="ownr_st">
-          label={t("owners.fields.ownr_st")}
-          name="ownr_st"
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
           <Input />
         </Form.Item>
-        <Form.Item
+        <Form.Item label={t("owners.fields.ownr_zip")} name="ownr_zip">
-          label={t("owners.fields.ownr_zip")}
-          name="ownr_zip"
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
           <Input />
         </Form.Item>
         <Form.Item label={t("owners.fields.ownr_ctry")} name="ownr_ctry">

client/src/components/production-list-columns/production-list-columns.data.js

@@ -225,8 +225,10 @@ const r = ({ technician, state }) => {
       sortOrder:
         state.sortedInfo.columnKey === "totalhours" && state.sortedInfo.order,
       render: (text, record) =>
-        record.labhrs.aggregate.sum.mod_lb_hrs +
+        (
-        record.larhrs.aggregate.sum.mod_lb_hrs,
+          record.labhrs.aggregate.sum.mod_lb_hrs +
+          record.larhrs.aggregate.sum.mod_lb_hrs
+        ).toFixed(1),
     },
     {
       title: i18n.t("production.labels.alert"),

client/src/components/production-list-columns/prodution-list-columns.touchtime.component.jsx

@@ -1,6 +1,20 @@
 import moment from "moment";
 import React, { useMemo } from "react";
-export default function ProductionlistColumnTouchTime({ job }) {
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ProductionlistColumnTouchTime);
+
+export function ProductionlistColumnTouchTime({ bodyshop, job }) {
   let ct = useMemo(() => {
     if (!!job.actual_in) {
       const totalHrs =
@@ -18,5 +32,7 @@ export default function ProductionlistColumnTouchTime({ job }) {
     return 0;
   }, [job]);
 
-  return <span>{ct}</span>;
+  const underTarget = ct < bodyshop.target_touchtime;
+
+  return <span style={{ color: underTarget && "tomato" }}>{ct}</span>;
 }

client/src/components/vehicle-detail-form/vehicle-detail-form.component.jsx

@@ -76,28 +76,10 @@ export default function VehicleDetailFormComponent({ form, loading }) {
       </LayoutFormRow>
 
       <LayoutFormRow header={t("vehicles.forms.registration")}>
-        <Form.Item
+        <Form.Item label={t("vehicles.fields.plate_st")} name="plate_st">
-          label={t("vehicles.fields.plate_st")}
-          name="plate_st"
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
           <Input />
         </Form.Item>
-        <Form.Item
+        <Form.Item label={t("vehicles.fields.plate_no")} name="plate_no">
-          label={t("vehicles.fields.plate_no")}
-          name="plate_no"
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-        >
           <Input />
         </Form.Item>
       </LayoutFormRow>

client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx

@@ -39,7 +39,7 @@ function VehicleDetailFormContainer({ vehicle, refetch }) {
   return (
     <>
       <PageHeader
-        title={t("menus.header.owners")}
+        title={t("menus.header.vehicles")}
         extra={
           <Button
             type="primary"

client/src/graphql/appointments.queries.js

@@ -85,6 +85,7 @@ export const INSERT_APPOINTMENT = gql`
         title
         isintake
         block
+        color
       }
     }
     update_jobs(
@@ -110,6 +111,7 @@ export const QUERY_APPOINTMENT_BY_DATE = gql`
       title
       isintake
       block
+      color
       job {
         alt_transport
         ro_number

client/src/graphql/bodyshop.queries.js

@@ -197,6 +197,28 @@ export const QUERY_INTAKE_CHECKLIST = gql`
       scheduled_delivery
       intakechecklist
       status
+      labhrs: joblines_aggregate(
+        where: {
+          _and: [{ mod_lbr_ty: { _neq: "LAR" } }, { removed: { _eq: false } }]
+        }
+      ) {
+        aggregate {
+          sum {
+            mod_lb_hrs
+          }
+        }
+      }
+      larhrs: joblines_aggregate(
+        where: {
+          _and: [{ mod_lbr_ty: { _eq: "LAR" } }, { removed: { _eq: false } }]
+        }
+      ) {
+        aggregate {
+          sum {
+            mod_lb_hrs
+          }
+        }
+      }
     }
   }
 `;

client/src/graphql/documents.queries.js

@@ -2,6 +2,10 @@ import { gql } from "@apollo/client";
 
 export const GET_DOCUMENTS_BY_JOB = gql`
   query GET_DOCUMENTS_BY_JOB($jobId: uuid!) {
+    jobs_by_pk(id: $jobId) {
+      id
+      ro_number
+    }
     documents_aggregate(where: { jobid: { _eq: $jobId } }) {
       aggregate {
         sum {
@@ -9,15 +13,13 @@ export const GET_DOCUMENTS_BY_JOB = gql`
         }
       }
     }
-    documents(
+    documents(order_by: { takenat: desc }, where: { jobid: { _eq: $jobId } }) {
-      order_by: { updated_at: desc }
-      where: { jobid: { _eq: $jobId } }
-    ) {
       id
       name
       key
       type
       size
+      takenat
       bill {
         id
         invoice_number
@@ -51,6 +53,7 @@ export const INSERT_NEW_DOCUMENT = gql`
         name
         key
         size
+        takenat
       }
     }
   }
@@ -70,7 +73,7 @@ export const QUERY_TEMPORARY_DOCS = gql`
   query QUERY_TEMPORARY_DOCS {
     documents(
       where: { jobid: { _is_null: true } }
-      order_by: { updated_at: desc }
+      order_by: { takenat: desc }
     ) {
       id
       name
@@ -78,6 +81,7 @@ export const QUERY_TEMPORARY_DOCS = gql`
       type
       extension
       size
+      takenat
     }
   }
 `;
@@ -94,6 +98,7 @@ export const UPDATE_DOCUMENT = gql`
       type
       key
       size
+      takenat
     }
   }
 `;

client/src/pages/jobs-create/jobs-create.container.jsx

@@ -155,6 +155,13 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
           layout="vertical"
           autoComplete={"off"}
           initialValues={{
+            tax_tow_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+            tax_str_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+            tax_paint_mat_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+            tax_shop_mat_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+            tax_sub_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+            tax_lbr_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+            tax_levies_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
             parts_tax_rates: {
               PAA: {
                 prt_type: "PAA",
@@ -220,6 +227,30 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
                 prt_tax_in: true,
                 prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
               },
+              PASL: {
+                prt_type: "PASL",
+                prt_discp: 0,
+                prt_mktyp: false,
+                prt_mkupp: 0,
+                prt_tax_in: true,
+                prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+              },
+              PAP: {
+                prt_type: "PAP",
+                prt_discp: 0,
+                prt_mktyp: false,
+                prt_mkupp: 0,
+                prt_tax_in: true,
+                prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+              },
+              PAO: {
+                prt_type: "PAO",
+                prt_discp: 0,
+                prt_mktyp: false,
+                prt_mkupp: 0,
+                prt_tax_in: true,
+                prt_tax_rt: bodyshop.bill_tax_rates.state_tax_rate / 100,
+              },
             },
           }}
         >

client/src/translations/en_us/common.json

@@ -1226,6 +1226,8 @@
 					"rate": "PVRT Rate"
 				},
 				"ca_gst_all_if_null": "If the job is marked as a \"GST Registrant\" and this value is set to $0,  the customer will be responsible for paying all of the GST by default. ",
+				"calc_repair_days": "Calculated Repair Days",
+				"calc_repair_days_tt": "This is the approximate number of days required to complete the repair according to the target touch time in your shop configuration (current set to {{target_touchtime}}).",
 				"cards": {
 					"customer": "Customer Information",
 					"damage": "Area of Damage",

client/src/translations/es/common.json

@@ -1226,6 +1226,8 @@
 					"rate": ""
 				},
 				"ca_gst_all_if_null": "",
+				"calc_repair_days": "",
+				"calc_repair_days_tt": "",
 				"cards": {
 					"customer": "Información al cliente",
 					"damage": "Área de Daño",

client/src/translations/fr/common.json

@@ -1226,6 +1226,8 @@
 					"rate": ""
 				},
 				"ca_gst_all_if_null": "",
+				"calc_repair_days": "",
+				"calc_repair_days_tt": "",
 				"cards": {
 					"customer": "Informations client",
 					"damage": "Zone de dommages",

client/yarn.lock

@@ -5696,6 +5696,11 @@ exenv@^1.2.2:
   resolved "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz"
   integrity sha1-KueOhdmJQVhnCwPUe+wfA72Ru50=
 
+exifr@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/exifr/-/exifr-7.0.0.tgz#065d54639f2999ac901dd8475db99b4d3f31f11e"
+  integrity sha512-5JRtopcolAfsX4YGcvTkldXyFDC+VPV40DxhSdRvrDr4OJQHtyccNoYl4aRzYBnVVpNueMmenS0KhzLiyNSfEQ==
+
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"

hasura/migrations/1621469433708_alter_table_public_documents_add_column_takenat/down.yaml

@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."documents" DROP COLUMN "takenat";
+  type: run_sql

hasura/migrations/1621469433708_alter_table_public_documents_add_column_takenat/up.yaml

@@ -0,0 +1,5 @@
+- args:
+    cascade: false
+    read_only: false
+    sql: ALTER TABLE "public"."documents" ADD COLUMN "takenat" timestamptz NULL;
+  type: run_sql

hasura/migrations/1621469445403_update_permission_user_public_table_documents/down.yaml

@@ -0,0 +1,46 @@
+- args:
+    role: user
+    table:
+      name: documents
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        _or:
+        - job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+        - bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - billid
+      - bodyshopid
+      - created_at
+      - extension
+      - id
+      - jobid
+      - key
+      - name
+      - size
+      - type
+      - updated_at
+      - uploaded_by
+      set: {}
+    role: user
+    table:
+      name: documents
+      schema: public
+  type: create_insert_permission

hasura/migrations/1621469445403_update_permission_user_public_table_documents/up.yaml

@@ -0,0 +1,47 @@
+- args:
+    role: user
+    table:
+      name: documents
+      schema: public
+  type: drop_insert_permission
+- args:
+    permission:
+      check:
+        _or:
+        - job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+        - bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+      columns:
+      - billid
+      - bodyshopid
+      - created_at
+      - extension
+      - id
+      - jobid
+      - key
+      - name
+      - size
+      - takenat
+      - type
+      - updated_at
+      - uploaded_by
+      set: {}
+    role: user
+    table:
+      name: documents
+      schema: public
+  type: create_insert_permission

hasura/migrations/1621469452694_update_permission_user_public_table_documents/down.yaml

@@ -0,0 +1,47 @@
+- args:
+    role: user
+    table:
+      name: documents
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: true
+      columns:
+      - billid
+      - bodyshopid
+      - created_at
+      - extension
+      - id
+      - jobid
+      - key
+      - name
+      - size
+      - type
+      - updated_at
+      - uploaded_by
+      computed_fields: []
+      filter:
+        _or:
+        - job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+        - bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: documents
+      schema: public
+  type: create_select_permission

hasura/migrations/1621469452694_update_permission_user_public_table_documents/up.yaml

@@ -0,0 +1,48 @@
+- args:
+    role: user
+    table:
+      name: documents
+      schema: public
+  type: drop_select_permission
+- args:
+    permission:
+      allow_aggregations: true
+      columns:
+      - billid
+      - bodyshopid
+      - created_at
+      - extension
+      - id
+      - jobid
+      - key
+      - name
+      - size
+      - takenat
+      - type
+      - updated_at
+      - uploaded_by
+      computed_fields: []
+      filter:
+        _or:
+        - job:
+            bodyshop:
+              associations:
+                _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+        - bodyshop:
+            associations:
+              _and:
+              - user:
+                  authid:
+                    _eq: X-Hasura-User-Id
+              - active:
+                  _eq: true
+    role: user
+    table:
+      name: documents
+      schema: public
+  type: create_select_permission

hasura/migrations/metadata.yaml

@@ -1520,6 +1520,7 @@ tables:
       - key
       - name
       - size
+      - takenat
       - type
       - updated_at
       - uploaded_by
@@ -1536,6 +1537,7 @@ tables:
       - key
       - name
       - size
+      - takenat
       - type
       - updated_at
       - uploaded_by

server.js

@@ -34,7 +34,11 @@ app.post("/sendemail", fb.validateFirebaseIdToken, sendEmail.sendEmail);
 //Test route to ensure Express is responding.
 app.get("/test", async function (req, res) {
   console.log("Incoming request verified.", req);
-  res.status(200).send("OK");
+  const Commit = require("child_process").execSync(
+    "git rev-parse --short HEAD"
+  );
+
+  res.status(200).send(`OK - ${Commit}`);
 });
 const test = require("./server/_test/test.js");
 app.post("/test", test.testResponse);