Merged master into development

bodyshop_translations.babel

@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -20437,48 +20437,6 @@
                                             </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,7 +20,6 @@
     "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/documents-upload/documents-upload.utility.js

@@ -5,8 +5,6 @@ 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.
@@ -87,7 +85,6 @@ export const uploadToCloudinary = async (
       if (!!onProgress) onProgress({ percent: (e.loaded / e.total) * 100 });
     },
   };
-
   const formData = new FormData();
   formData.append("file", file);
 
@@ -125,12 +122,6 @@ 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: {
@@ -144,7 +135,6 @@ export const uploadToCloudinary = async (
           extension: extension,
           bodyshopid: bodyshop.id,
           size: cloudinaryUploadResponse.data.bytes || file.size,
-          takenat,
         },
       ],
     },

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

@@ -313,12 +313,9 @@ 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) => markedTypes.includes(item.part_type)),
+        ...jobLines.filter((item) => item.part_type === e.key),
       ]);
     }
   };
@@ -381,7 +378,7 @@ export function JobLinesComponent({
                 setState({
                   ...state,
                   filteredInfo: {
-                    part_type: ["PAN,PAL,PAA,PAP,PAS,PASL"],
+                    part_type: ["PAN,PAL,PAA,PAS,PASL"],
                   },
                 });
               }}

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

@@ -26,6 +26,12 @@ 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"
@@ -306,12 +312,6 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
           </LayoutFormRow>
         </Collapse.Panel>
       </Collapse>
-      <JobsDetailRatesParts
-        jobRO={false}
-        expanded
-        required={selected && true}
-        form={form}
-      />
     </div>
   );
 }

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

@@ -1,4 +1,4 @@
-import { DatePicker, Form, Statistic, Tooltip } from "antd";
+import { DatePicker, Form, Tooltip } from "antd";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -23,10 +23,6 @@ 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")}>
@@ -56,17 +52,6 @@ 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/production-list-columns/production-list-columns.data.js

@@ -225,10 +225,8 @@ const r = ({ technician, state }) => {
       sortOrder:
         state.sortedInfo.columnKey === "totalhours" && state.sortedInfo.order,
       render: (text, record) =>
-        (
+        record.labhrs.aggregate.sum.mod_lb_hrs +
-          record.labhrs.aggregate.sum.mod_lb_hrs +
+        record.larhrs.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,20 +1,6 @@
 import moment from "moment";
 import React, { useMemo } from "react";
-import { connect } from "react-redux";
+export default function ProductionlistColumnTouchTime({ job }) {
-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 =
@@ -32,7 +18,5 @@ export function ProductionlistColumnTouchTime({ bodyshop, job }) {
     return 0;
   }, [job]);
 
-  const underTarget = ct < bodyshop.target_touchtime;
+  return <span>{ct}</span>;
-
-  return <span style={{ color: underTarget && "tomato" }}>{ct}</span>;
 }

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.vehicles")}
+        title={t("menus.header.owners")}
         extra={
           <Button
             type="primary"

client/src/graphql/documents.queries.js

@@ -9,13 +9,15 @@ export const GET_DOCUMENTS_BY_JOB = gql`
         }
       }
     }
-    documents(order_by: { takenat: desc }, where: { jobid: { _eq: $jobId } }) {
+    documents(
+      order_by: { updated_at: desc }
+      where: { jobid: { _eq: $jobId } }
+    ) {
       id
       name
       key
       type
       size
-      takenat
       bill {
         id
         invoice_number
@@ -49,7 +51,6 @@ export const INSERT_NEW_DOCUMENT = gql`
         name
         key
         size
-        takenat
       }
     }
   }
@@ -69,7 +70,7 @@ export const QUERY_TEMPORARY_DOCS = gql`
   query QUERY_TEMPORARY_DOCS {
     documents(
       where: { jobid: { _is_null: true } }
-      order_by: { takenat: desc }
+      order_by: { updated_at: desc }
     ) {
       id
       name
@@ -77,7 +78,6 @@ export const QUERY_TEMPORARY_DOCS = gql`
       type
       extension
       size
-      takenat
     }
   }
 `;
@@ -94,7 +94,6 @@ export const UPDATE_DOCUMENT = gql`
       type
       key
       size
-      takenat
     }
   }
 `;

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

@@ -155,13 +155,6 @@ 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",
@@ -227,30 +220,6 @@ 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,8 +1226,6 @@
 					"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,8 +1226,6 @@
 					"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,8 +1226,6 @@
 					"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,11 +5696,6 @@ 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

@@ -1,5 +0,0 @@
-- 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

@@ -1,5 +0,0 @@
-- 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

@@ -1,46 +0,0 @@
-- 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

@@ -1,47 +0,0 @@
-- 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

@@ -1,47 +0,0 @@
-- 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

@@ -1,48 +0,0 @@
-- 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,7 +1520,6 @@ tables:
       - key
       - name
       - size
-      - takenat
       - type
       - updated_at
       - uploaded_by
@@ -1537,7 +1536,6 @@ tables:
       - key
       - name
       - size
-      - takenat
       - type
       - updated_at
       - uploaded_by