Merged in release/2023-12-29 (pull request #1127)

Release/2023 12 29

client/src/components/bill-detail-edit/bill-detail-edit-component.jsx

@@ -10,7 +10,7 @@ import { createStructuredSelector } from "reselect";
 import {
   DELETE_BILL_LINE,
   INSERT_NEW_BILL_LINES,
-  UPDATE_BILL_LINE
+  UPDATE_BILL_LINE,
 } from "../../graphql/bill-lines.queries";
 import { QUERY_BILL_BY_PK, UPDATE_BILL } from "../../graphql/bills.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
@@ -20,6 +20,7 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import AlertComponent from "../alert/alert.component";
 import BillFormContainer from "../bill-form/bill-form.container";
 import BillMarkExportedButton from "../bill-mark-exported-button/bill-mark-exported-button.component";
+import BillPrintButton from "../bill-print-button/bill-print-button.component";
 import BillReeportButtonComponent from "../bill-reexport-button/bill-reexport-button.component";
 import JobDocumentsGallery from "../jobs-documents-gallery/jobs-documents-gallery.container";
 import JobsDocumentsLocalGallery from "../jobs-documents-local-gallery/jobs-documents-local-gallery.container";
@@ -176,7 +177,7 @@ export function BillDetailEditcontainer({
             extra={
               <Space>
                 <BillDetailEditReturn data={data} />
-
+                <BillPrintButton billid={search.billid} />
                 <Popconfirm
                   visible={visible}
                   onConfirm={() => form.submit()}

client/src/components/bill-print-button/bill-print-button.component.jsx

@@ -0,0 +1,38 @@
+import { Button, Space } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { GenerateDocument } from "../../utils/RenderTemplate";
+import { TemplateList } from "../../utils/TemplateConstants";
+
+export default function BillPrintButton({ billid }) {
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+  const Templates = TemplateList("job_special");
+
+  const submitHandler = async () => {
+    setLoading(true);
+    try {
+      await GenerateDocument(
+        {
+          name: Templates.parts_invoice_label_single.key,
+          variables: {
+            id: billid,
+          },
+        },
+        {},
+        "p"
+      );
+    } catch (e) {
+      console.warn("Warning: Error generating a document.");
+    }
+    setLoading(false);
+  };
+
+  return (
+    <Space wrap>
+      <Button loading={loading} onClick={submitHandler}>
+        {t("bills.labels.printlabels")}
+      </Button>
+    </Space>
+  );
+}

client/src/components/contract-cars/contract-cars.component.jsx

@@ -35,6 +35,15 @@ export default function ContractsCarsComponent({
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       render: (text, record) => <div>{t(record.status)}</div>,
     },
+    {
+      title: t("courtesycars.fields.readiness"),
+      dataIndex: "readiness",
+      key: "readiness",
+      sorter: (a, b) => alphaSort(a.readiness, b.readiness),
+      sortOrder:
+        state.sortedInfo.columnKey === "readiness" && state.sortedInfo.order,
+      render: (text, record) => t(record.readiness),
+    },
     {
       title: t("courtesycars.fields.year"),
       dataIndex: "year",

client/src/components/courtesy-car-form/courtesy-car-form.component.jsx

@@ -7,6 +7,7 @@ import { useTranslation } from "react-i18next";
 import { CHECK_CC_FLEET_NUMBER } from "../../graphql/courtesy-car.queries";
 import { DateFormatter } from "../../utils/DateFormatter";
 import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
+import CourtesyCarReadiness from "../courtesy-car-readiness-select/courtesy-car-readiness-select.component";
 import CourtesyCarStatus from "../courtesy-car-status-select/courtesy-car-status-select.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 //import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
@@ -213,6 +214,12 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
         >
           <CourtesyCarStatus />
         </Form.Item>
+        <Form.Item
+          label={t("courtesycars.fields.readiness")}
+          name="readiness"
+        >
+          <CourtesyCarReadiness />
+        </Form.Item>
         <div>
           <Form.Item
             label={t("courtesycars.fields.nextservicekm")}

client/src/components/courtesy-car-fuel-select/courtesy-car-fuel-select.component.jsx

@@ -34,6 +34,32 @@ const CourtesyCarFuelComponent = (props, ref) => {
       step={null}
       style={{ marginLeft: "2rem", marginRight: "2rem" }}
       {...props}
+      tooltip={{
+        formatter: (value) => {
+          switch (value) {
+            case 0:
+              return t("courtesycars.labels.fuel.empty");
+            case 13:
+              return t("courtesycars.labels.fuel.18");
+            case 25:
+              return t("courtesycars.labels.fuel.14");
+            case 38:
+              return t("courtesycars.labels.fuel.38");
+            case 50:
+              return t("courtesycars.labels.fuel.12");
+            case 63:
+              return t("courtesycars.labels.fuel.58");
+            case 75:
+              return t("courtesycars.labels.fuel.34");
+            case 88:
+              return t("courtesycars.labels.fuel.78");
+            case 100:
+              return t("courtesycars.labels.fuel.full");
+            default:
+              return value;
+          }
+        },
+      }}
     />
   );
 };

client/src/components/courtesy-car-readiness-select/courtesy-car-readiness-select.component.jsx

@@ -0,0 +1,35 @@
+import { Select } from "antd";
+import React, { forwardRef, useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+const { Option } = Select;
+
+const CourtesyCarReadinessComponent = ({ value, onChange }, ref) => {
+  const [option, setOption] = useState(value);
+  const { t } = useTranslation();
+
+  useEffect(() => {
+    if (value !== option && onChange) {
+      onChange(option);
+    }
+  }, [value, option, onChange]);
+
+  return (
+    <Select
+      allowClear
+      ref={ref}
+      value={option}
+      style={{
+        width: 100,
+      }}
+      onChange={setOption}
+    >
+      <Option value="courtesycars.readiness.ready">
+        {t("courtesycars.readiness.ready")}
+      </Option>
+      <Option value="courtesycars.readiness.notready">
+        {t("courtesycars.readiness.notready")}
+      </Option>
+    </Select>
+  );
+};
+export default forwardRef(CourtesyCarReadinessComponent);

client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx

@@ -91,6 +91,26 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
         );
       },
     },
+    {
+      title: t("courtesycars.fields.readiness"),
+      dataIndex: "readiness",
+      key: "readiness",
+      sorter: (a, b) => alphaSort(a.readiness, b.readiness),
+      filters: [
+        {
+          text: t("courtesycars.readiness.ready"),
+          value: "courtesycars.readiness.ready",
+        },
+        {
+          text: t("courtesycars.readiness.notready"),
+          value: "courtesycars.readiness.notready",
+        },
+      ],
+      onFilter: (value, record) => value.includes(record.readiness),
+      sortOrder:
+        state.sortedInfo.columnKey === "readiness" && state.sortedInfo.order,
+      render: (text, record) => t(record.readiness),
+    },
     {
       title: t("courtesycars.fields.year"),
       dataIndex: "year",
@@ -131,6 +151,36 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       sortOrder:
         state.sortedInfo.columnKey === "plate" && state.sortedInfo.order,
     },
+    {
+      title: t("courtesycars.fields.fuel"),
+      dataIndex: "fuel",
+      key: "fuel",
+      sorter: (a, b) => alphaSort(a.fuel, b.fuel),
+      sortOrder:
+        state.sortedInfo.columnKey === "fuel" && state.sortedInfo.order,
+      render: (text, record) => {
+        switch (record.fuel) {
+          case 100:
+            return t("courtesycars.labels.fuel.full");
+          case 88:
+            return t("courtesycars.labels.fuel.78");
+          case 63:
+            return t("courtesycars.labels.fuel.58");
+          case 50:
+            return t("courtesycars.labels.fuel.12");
+          case 38:
+            return t("courtesycars.labels.fuel.34");
+          case 25:
+            return t("courtesycars.labels.fuel.14");
+          case 13:
+            return t("courtesycars.labels.fuel.18");
+          case 0:
+            return t("courtesycars.labels.fuel.empty");
+          default:
+            return record.fuel;
+        }
+      },
+    },
     {
       title: t("courtesycars.labels.outwith"),
       dataIndex: "outwith",

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

@@ -1,8 +1,8 @@
 import {
+  BranchesOutlined,
   ExclamationCircleFilled,
   PauseCircleOutlined,
   WarningFilled,
-  BranchesOutlined,
 } from "@ant-design/icons";
 import { Card, Col, Row, Space, Tag, Tooltip } from "antd";
 import React, { useState } from "react";
@@ -222,6 +222,9 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                 {`${job.v_vin || t("general.labels.na")}`}
               </VehicleVinDisplay>
             </DataLabel>
+            <DataLabel label={t("jobs.fields.regie_number")}>
+              {job.regie_number || t("general.labels.na")}
+            </DataLabel>
             <DataLabel label={t("jobs.labels.relatedros")}>
               <JobsRelatedRos jobid={job.id} job={job} />
             </DataLabel>

client/src/graphql/courtesy-car.queries.js

@@ -30,15 +30,15 @@ export const QUERY_AVAILABLE_CC = gql`
       fuel
       id
       make
-      model
-      plate
-      status
-      year
-      dailycost
       mileage
+      model
       notes
       nextservicekm
       nextservicedate
+      plate
+      readiness
+      status
+      year
     }
   }
 `;
@@ -68,19 +68,20 @@ export const QUERY_ALL_CC = gql`
       insuranceexpires
       leaseenddate
       make
+      mileage
       model
       nextservicedate
       nextservicekm
       notes
       plate
       purchasedate
+      readiness
       registrationexpires
       serviceenddate
       servicestartdate
       status
       vin
       year
-      mileage
       cccontracts(
         where: { status: { _eq: "contracts.status.out" } }
         order_by: { contract_date: desc }
@@ -90,10 +91,10 @@ export const QUERY_ALL_CC = gql`
         scheduledreturn
         job {
           id
-          ro_number
           ownr_fn
           ownr_ln
           ownr_co_nm
+          ro_number
         }
       }
     }
@@ -119,19 +120,20 @@ export const QUERY_CC_BY_PK = gql`
       insuranceexpires
       leaseenddate
       make
+      mileage
       model
       nextservicedate
       nextservicekm
       notes
       plate
       purchasedate
+      readiness
       registrationexpires
       serviceenddate
       servicestartdate
       status
       vin
       year
-      mileage
       cccontracts_aggregate {
         aggregate {
           count(distinct: true)
@@ -139,21 +141,20 @@ export const QUERY_CC_BY_PK = gql`
       }
       cccontracts(offset: $offset, limit: $limit, order_by: $order) {
         agreementnumber
+        driver_fn
+        driver_ln
         id
-        status
-        start
-        scheduledreturn
         kmstart
         kmend
-        driver_ln
+        scheduledreturn
-        driver_fn
+        start
+        status
         job {
-          ro_number
+          id
-
           ownr_ln
           ownr_fn
           ownr_co_nm
-          id
+          ro_number
         }
       }
     }

client/src/pages/courtesy-car-detail/courtesy-car-detail.page.container.jsx

@@ -1,11 +1,14 @@
 import { useMutation, useQuery } from "@apollo/client";
 import { Form, notification } from "antd";
 import moment from "moment";
+import queryString from "query-string";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { useParams } from "react-router-dom";
+import { useLocation, useParams } from "react-router-dom";
 import AlertComponent from "../../components/alert/alert.component";
+import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
+import NotFound from "../../components/not-found/not-found.component";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { QUERY_CC_BY_PK, UPDATE_CC } from "../../graphql/courtesy-car.queries";
 import {
@@ -13,13 +16,10 @@ import {
   setBreadcrumbs,
   setSelectedHeader,
 } from "../../redux/application/application.actions";
+import { pageLimit } from "../../utils/config";
 import { CreateRecentItem } from "../../utils/create-recent-item";
+import UndefinedToNull from "./../../utils/undefinedtonull";
 import CourtesyCarDetailPageComponent from "./courtesy-car-detail.page.component";
-import NotFound from "../../components/not-found/not-found.component";
-import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
-import queryString from "query-string";
-import { useLocation } from "react-router-dom";
-import {pageLimit} from "../../utils/config";
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -112,7 +112,10 @@ export function CourtesyCarDetailPageContainer({
     setSaveLoading(true);
 
     const result = await updateCourtesyCar({
-      variables: { cc: { ...values }, ccId: ccId },
+      variables: {
+        cc: { ...UndefinedToNull(values, ["readiness"]) },
+        ccId: ccId,
+      },
       refetchQueries: ["QUERY_CC_BY_PK"],
       awaitRefetchQueries: true,
     });

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

@@ -1,6 +1,6 @@
-import _ from "lodash";
 import { useLazyQuery, useMutation } from "@apollo/client";
 import { Form, notification } from "antd";
+import _ from "lodash";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -90,6 +90,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
       {},
       values,
       { date_open: new Date() },
+      { date_estimated: new Date() },
       {
         vehicle:
           state.vehicle.selectedid || state.vehicle.none

client/src/translations/en_us/common.json

@@ -214,6 +214,7 @@
 				"new": "New Bill",
 				"noneselected": "No bill selected.",
 				"onlycmforinvoiced": "Only credit memos can be entered for any Job that has been invoiced,  exported,  or voided.",
+				"printlabels": "Print Labels",
 				"retailtotal": "Bills Retail Total",
 				"savewithdiscrepancy": "You are about to save this bill with a discrepancy.  The system will continue to use the calculated amount using the bill lines.  Press cancel to return to the bill.",
 				"state_tax": "Provincial/State Tax",
@@ -785,6 +786,7 @@
 				"notes": "Notes",
 				"plate": "Plate Number",
 				"purchasedate": "Purchase Date",
+				"readiness": "Readiness",
 				"registrationexpires": "Registration Expires On",
 				"serviceenddate": "Usage End Date",
 				"servicestartdate": "Usage Start Date",
@@ -821,6 +823,10 @@
 			},
 			"successes": {
 				"saved": "Courtesy Car saved successfully."
+			},
+			"readiness": {
+				"notready": "Not Ready",
+				"ready": "Ready"
 			}
 		},
 		"csi": {

client/src/translations/es/common.json

@@ -214,6 +214,7 @@
 				"new": "",
 				"noneselected": "",
 				"onlycmforinvoiced": "",
+				"printlabels": "",
 				"retailtotal": "",
 				"savewithdiscrepancy": "",
 				"state_tax": "",
@@ -785,6 +786,7 @@
 				"notes": "",
 				"plate": "",
 				"purchasedate": "",
+				"readiness": "",
 				"registrationexpires": "",
 				"serviceenddate": "",
 				"servicestartdate": "",
@@ -821,6 +823,10 @@
 			},
 			"successes": {
 				"saved": ""
+			},
+			"readiness": {
+				"notready": "",
+				"ready": ""
 			}
 		},
 		"csi": {

client/src/translations/fr/common.json

@@ -214,6 +214,7 @@
 				"new": "",
 				"noneselected": "",
 				"onlycmforinvoiced": "",
+				"printlabels": "",
 				"retailtotal": "",
 				"savewithdiscrepancy": "",
 				"state_tax": "",
@@ -785,6 +786,7 @@
 				"notes": "",
 				"plate": "",
 				"purchasedate": "",
+				"readiness": "",
 				"registrationexpires": "",
 				"serviceenddate": "",
 				"servicestartdate": "",
@@ -821,6 +823,10 @@
 			},
 			"successes": {
 				"saved": ""
+			},
+			"readiness": {
+				"notready": "",
+				"ready": ""
 			}
 		},
 		"csi": {

hasura/metadata/tables.yaml

@@ -1388,60 +1388,62 @@
                 - active:
                     _eq: true
         columns:
-          - id
-          - created_at
-          - updated_at
           - bodyshopid
-          - make
-          - model
-          - year
-          - plate
           - color
-          - vin
+          - created_at
-          - fleetnumber
-          - purchasedate
-          - servicestartdate
-          - serviceenddate
-          - leaseenddate
-          - status
-          - nextservicekm
-          - nextservicedate
-          - damage
-          - notes
-          - fuel
-          - registrationexpires
-          - insuranceexpires
           - dailycost
+          - damage
+          - fleetnumber
+          - fuel
+          - id
+          - insuranceexpires
+          - leaseenddate
+          - make
           - mileage
+          - model
+          - nextservicedate
+          - nextservicekm
+          - notes
+          - plate
+          - purchasedate
+          - readiness
+          - registrationexpires
+          - serviceenddate
+          - servicestartdate
+          - status
+          - updated_at
+          - vin
+          - year
   select_permissions:
     - role: user
       permission:
         columns:
+          - bodyshopid
+          - color
+          - created_at
+          - dailycost
+          - damage
+          - fleetnumber
+          - fuel
+          - id
           - insuranceexpires
           - leaseenddate
+          - make
+          - mileage
+          - model
           - nextservicedate
+          - nextservicekm
+          - notes
+          - plate
           - purchasedate
+          - readiness
           - registrationexpires
           - serviceenddate
           - servicestartdate
-          - dailycost
-          - fuel
-          - mileage
-          - nextservicekm
-          - color
-          - damage
-          - fleetnumber
-          - make
-          - model
-          - notes
-          - plate
           - status
+          - updated_at
           - vin
           - year
-          - created_at
-          - updated_at
-          - bodyshopid
-          - id
         filter:
           bodyshop:
             associations:
@@ -1456,31 +1458,32 @@
     - role: user
       permission:
         columns:
+          - bodyshopid
+          - color
+          - created_at
+          - dailycost
+          - damage
+          - fleetnumber
+          - fuel
+          - id
           - insuranceexpires
           - leaseenddate
+          - make
+          - mileage
+          - model
           - nextservicedate
+          - nextservicekm
+          - notes
+          - plate
           - purchasedate
+          - readiness
           - registrationexpires
           - serviceenddate
           - servicestartdate
-          - dailycost
-          - fuel
-          - mileage
-          - nextservicekm
-          - color
-          - damage
-          - fleetnumber
-          - make
-          - model
-          - notes
-          - plate
           - status
+          - updated_at
           - vin
           - year
-          - created_at
-          - updated_at
-          - bodyshopid
-          - id
         filter:
           bodyshop:
             associations:

hasura/migrations/1703706449547_alter_table_public_courtesycars_add_column_readiness/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"."courtesycars" add column "readiness" text
+--  null;

hasura/migrations/1703706449547_alter_table_public_courtesycars_add_column_readiness/up.sql

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