- Release commit

Signed-off-by: Dave Richer <dave@imexsystems.ca>

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

@@ -1,5 +1,5 @@
 import {useMutation, useQuery} from "@apollo/client";
-import {Button, Form, Popconfirm, Space} from "antd";
+import {Button, Form, Popconfirm, Space, Divider} from "antd";
 import dayjs from "../../utils/day";
 import queryString from "query-string";
 import React, {useState} from "react";
@@ -203,7 +203,7 @@ export function BillDetailEditcontainer({setPartsOrderContext, insertAuditTrail,
                         layout="vertical"
                     >
                         <BillFormContainer form={form} billEdit disabled={exported}/>
-
+                        <Divider orientation="left">{t("general.labels.media")}</Divider>
                         {bodyshop.uselocalmediaserver ? (
                             <JobsDocumentsLocalGallery
                                 job={{id: data ? data.bills_by_pk.jobid : null}}

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

@@ -173,7 +173,11 @@ export function BillDetailEditReturn({
                 </Form>
             </Modal>
             <Button
-                disabled={data.bills_by_pk.is_credit_memo || disabled}
+                disabled={
+                    data.bills_by_pk.is_credit_memo ||
+                    data.bills_by_pk.isinhouse ||
+                    disabled
+                }
                 onClick={() => {
                     setOpen(true);
                 }}

client/src/components/bill-form/bill-form.component.jsx

@@ -492,10 +492,11 @@ export function BillFormComponent({
                     billEdit={billEdit}
                 />
             )}
-
+            <Divider orientation="left" style={{ display: billEdit ? "none" : null }}>
+                {t("documents.labels.upload")}
+            </Divider>
             <Form.Item
                 name="upload"
-                label="Upload"
                 style={{display: billEdit ? "none" : null}}
                 valuePropName="fileList"
                 getValueFromEvent={(e) => {

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

@@ -60,6 +60,10 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
                     text: t("courtesycars.status.in"),
                     value: "courtesycars.status.in",
                 },
+                {
+                    text: t("courtesycars.status.inservice"),
+                    value: "courtesycars.status.inservice",
+                },
                 {
                     text: t("courtesycars.status.out"),
                     value: "courtesycars.status.out",
@@ -73,7 +77,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
                     value: "courtesycars.status.leasereturn",
                 },
             ],
-            onFilter: (value, record) => value.includes(record.status),
+            onFilter: (value, record) => record.status === value,
             sortOrder:
                 state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
             render: (text, record) => {
@@ -176,7 +180,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
             title: t("courtesycars.fields.fuel"),
             dataIndex: "fuel",
             key: "fuel",
-            sorter: (a, b) => alphaSort(a.fuel, b.fuel),
+            sorter: (a, b) => a.fuel - b.fuel,
             sortOrder:
                 state.sortedInfo.columnKey === "fuel" && state.sortedInfo.order,
             render: (text, record) => {
@@ -185,12 +189,14 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
                         return t("courtesycars.labels.fuel.full");
                     case 88:
                         return t("courtesycars.labels.fuel.78");
+                    case 75:
+                        return t("courtesycars.labels.fuel.34");
                     case 63:
                         return t("courtesycars.labels.fuel.58");
                     case 50:
                         return t("courtesycars.labels.fuel.12");
                     case 38:
-                        return t("courtesycars.labels.fuel.34");
+                        return t("courtesycars.labels.fuel.38");
                     case 25:
                         return t("courtesycars.labels.fuel.14");
                     case 13:

client/src/components/job-employee-assignments/job-employee-assignments.component.jsx

@@ -23,7 +23,6 @@ export function JobEmployeeAssignments({
                                            jobRO,
                                            body,
                                            refinish,
-
                                            prep,
                                            csr,
                                            handleAdd,
@@ -78,7 +77,7 @@ export function JobEmployeeAssignments({
                             setVisibility(false);
                         }}
                     >
-                        Assign
+                        {t("allocations.actions.assign")}
                     </Button>
                     <Button onClick={() => setVisibility(false)}>Close</Button>
                 </Space>

client/src/components/job-employee-assignments/job-employee-assignments.container.jsx

@@ -44,13 +44,13 @@ export function JobEmployeeAssignmentsContainer({
         });
         if (refetch) refetch();
 
-        insertAuditTrail({
+        if (!!!result.errors) {
-            jobid: job.id,
+            insertAuditTrail({
-            operation: AuditTrailMapping.jobassignmentchange(operation, name),
+                jobid: job.id,
-        type: "jobassignmentchange",
+                operation: AuditTrailMapping.jobassignmentchange(operation, name),
-    });
+                type: "jobassignmentchange",
-
+            });
-        if (!!result.errors) {
+        } else {
             notification["error"]({
                 message: t("jobs.errors.assigning", {
                     message: JSON.stringify(result.errors),
@@ -68,17 +68,19 @@ export function JobEmployeeAssignmentsContainer({
             variables: {jobId: job.id, job: {[empAssignment]: null}},
         });
 
-        if (!!result.errors) {
+        if (!!!result.errors) {
+            insertAuditTrail({
+                jobid: job.id,
+                operation: AuditTrailMapping.jobassignmentremoved(operation),
+                type: "jobassignmentremoved",
+            });
+        } else {
             notification["error"]({
                 message: t("jobs.errors.assigning", {
                     message: JSON.stringify(result.errors),
                 }),
             });
         }
-        insertAuditTrail({
-            jobid: job.id,
-            operation: AuditTrailMapping.jobassignmentremoved(operation),
-        type: "jobassignmentremoved",});
         setLoading(false);
     };
 

client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx

@@ -82,7 +82,7 @@ export default function JobReconciliationBillsTable({
                 state.sortedInfo.order,
 
             render: (text, record) => (
-                <Checkbox disabled checked={record.bill.is_credit_memo}/>
+                <Checkbox  checked={record.bill.is_credit_memo}/>
             ),
         },
     ];

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

@@ -97,7 +97,11 @@ export function JobsDetailHeader({job, bodyshop, disabled}) {
                                 {job.status === bodyshop.md_ro_statuses.default_scheduled &&
                                 job.scheduled_in ? (
                                     <Tag>
-                                        <Link to={`/manage/schedule?date=${dayjs(job.scheduled_in).format('YYYY-MM-DD')}`}>
+                                        <Link
+                                            to={`/manage/schedule?date=${dayjs(
+                                                job.scheduled_in
+                                            ).format("YYYY-MM-DD")}`}
+                                        >
                                             <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
                                         </Link>
                                     </Tag>
@@ -131,20 +135,20 @@ export function JobsDetailHeader({job, bodyshop, disabled}) {
                             <DataLabel label={t("jobs.labels.contracts")}>
                                 {job.cccontracts.map((c, index) => (
                                     <Space wrap>
-                                    <Link
+                                        <Link
-                                        key={c.id}
+                                            key={c.id}
-                                        to={`/manage/courtesycars/contracts/${c.id}`}
+                                            to={`/manage/courtesycars/contracts/${c.id}`}
-                                    >{`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}{index !== job.cccontracts.length - 1 ? "," : null}
+                                        >
-                                    </Link>
+                                            {`${c.agreementnumber} - ${c.courtesycar.fleetnumber} ${c.courtesycar.year} ${c.courtesycar.make} ${c.courtesycar.model}`}
+                                            {index !== job.cccontracts.length - 1 ? "," : null}
+                                        </Link>
                                     </Space>
                                 ))}
                             </DataLabel>
                         )}
-
                         <DataLabel label={t("jobs.fields.production_vars.note")}>
                             <ProductionListColumnProductionNote record={job}/>
                         </DataLabel>
-
                         <Space wrap>
                             {job.special_coverage_policy && (
                                 <Tag color="tomato">
@@ -217,6 +221,12 @@ export function JobsDetailHeader({job, bodyshop, disabled}) {
                                 {job.owner?.tax_number || ""}
                             </DataLabel>
                         )}
+                        <DataLabel
+                            label={t("owners.fields.note")}
+                            valueStyle={{ overflow: "hidden", textOverflow: "ellipsis" }}
+                        >
+                            {job.owner?.note || ""}
+                        </DataLabel>
                     </div>
                 </Card>
             </Col>

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

@@ -301,7 +301,7 @@ const r = ({technician, state, activeStatuses, data, bodyshop, refetch}) => {
       onFilter: (value, record) =>
         value.includes(record.special_coverage_policy),
       render: (text, record) => (
-        <Checkbox disabled checked={record.special_coverage_policy} />
+        <Checkbox checked={record.special_coverage_policy} />
       ),
     },
 

client/src/graphql/jobs.queries.js

@@ -708,6 +708,7 @@ export const GET_JOB_BY_PK = gql`
             other_amount_payable
             owner {
                 id
+                note
                 ownr_fn
                 ownr_ln
                 ownr_co_nm

client/src/pages/bills/bills.page.component.jsx

@@ -125,9 +125,7 @@ export function BillsListPage({
             sortOrder:
                 state.sortedInfo.columnKey === "is_credit_memo" &&
                 state.sortedInfo.order,
-            render: (text, record) => (
+            render: (text, record) => <Checkbox checked={record.is_credit_memo} />,
-                <Checkbox disabled checked={record.is_credit_memo}/>
-            ),
         },
         {
             title: t("bills.fields.exported"),
@@ -136,7 +134,7 @@ export function BillsListPage({
             sorter: (a, b) => a.exported - b.exported,
             sortOrder:
                 state.sortedInfo.columnKey === "exported" && state.sortedInfo.order,
-            render: (text, record) => <Checkbox disabled checked={record.exported}/>,
+            render: (text, record) => <Checkbox  checked={record.exported}/>,
         },
         {
             title: t("general.labels.actions"),

client/src/pages/export-logs/export-logs.page.component.jsx

@@ -162,9 +162,7 @@ sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
         { text: "False", value: false },
       ],
       onFilter: (value, record) => record.successful === value,
-            render: (text, record) => (
+        render: (text, record) => <Checkbox checked={record.successful} />,
-                <Checkbox disabled checked={record.successful}/>
-            ),
         },
         {
             title: t("general.labels.message"),

client/src/translations/en_us/common.json

@@ -1148,6 +1148,7 @@
         "loadingshop": "Loading shop data...",
         "loggingin": "Authorizing...",
         "markedexported": "Manually marked as exported.",
+        "media": "Media",
         "message": "Message",
         "monday": "Monday",
         "na": "N/A",