IO-2762 Return from Bill Reference in Parts Return Drawer

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

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

@@ -45,6 +45,7 @@ export function BillDetailEditReturn({
       actions: {},
       context: {
         jobId: data.bills_by_pk.jobid,
+        job: data.bills_by_pk.job,
         vendorId: data.bills_by_pk.vendorid,
         returnFromBill: data.bills_by_pk.id,
         invoiceNumber: data.bills_by_pk.invoice_number,

client/src/components/bills-list-table/bills-list-table.component.jsx

@@ -60,7 +60,7 @@ export function BillsListTableComponent({
       )}
       <BillDeleteButton bill={record} jobid={job.id} />
       <BillDetailEditReturnComponent
-        data={{ bills_by_pk: { ...record, jobid: job.id } }}
+        data={{ bills_by_pk: { ...record, jobid: job.id, job: job } }}
         disabled={
           record.is_credit_memo ||
           record.vendorid === bodyshop.inhousevendorid ||

client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx

@@ -1,8 +1,8 @@
-import React, { useState } from "react";
-import { Button, Form, InputNumber, Popover } from "antd";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import { useTranslation } from "react-i18next";
 import { CalculatorFilled } from "@ant-design/icons";
+import { Button, Form, InputNumber, Popover, Space } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 export default function CABCpvrtCalculator({ disabled, form }) {
   const [visibility, setVisibility] = useState(false);
 
@@ -26,10 +26,14 @@ export default function CABCpvrtCalculator({ disabled, form }) {
         <Form.Item name="days" label={t("jobs.labels.ca_bc_pvrt.days")}>
           <InputNumber precision={0} min={0} />
         </Form.Item>
-        <Button type="primary" htmlType="submit">
-          {t("general.actions.calculate")}
-        </Button>
-        <Button onClick={() => setVisibility(false)}>Close</Button>
+        <div style={{ display: "flex", justifyContent: "flex-end" }}>
+          <Space>
+            <Button type="primary" htmlType="submit">
+              {t("general.actions.calculate")}
+            </Button>
+            <Button onClick={() => setVisibility(false)}>Close</Button>
+          </Space>
+        </div>
       </Form>
     </div>
   );

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

@@ -10,11 +10,15 @@ import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel
 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";
+import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
-export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
+export default function CourtesyCarCreateFormComponent({
+  form,
+  saveLoading,
+  newCC,
+}) {
   const { t } = useTranslation();
   const client = useApolloClient();
 
@@ -33,7 +37,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
         }
       />
 
-      {/* <FormFieldsChanged form={form} /> */}
+      {newCC ? null : <FormFieldsChanged form={form} />}
       <LayoutFormRow header={t("courtesycars.labels.vehicle")}>
         <Form.Item
           label={t("courtesycars.fields.year")}

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

@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client";
-import { Col, Divider, Row, Skeleton, Space, Timeline, Typography } from "antd";
+import { Col, Row, Skeleton, Timeline, Typography } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
@@ -31,15 +31,27 @@ export default function JobLinesExpander({ jobline, jobid }) {
           {data.parts_order_lines.length > 0 ? (
             data.parts_order_lines.map((line) => (
               <Timeline.Item key={line.id}>
-                <Space split={<Divider type="vertical" />} wrap>
-                  <Link
-                    to={`/manage/jobs/${jobid}?partsorderid=${line.parts_order.id}`}
-                  >
-                    {line.parts_order.order_number}
-                  </Link>
-                  <DateFormatter>{line.parts_order.order_date}</DateFormatter>
-                  {line.parts_order.vendor.name}
-                </Space>
+                <Row wrap>
+                  <Col span={4}>
+                    <Link
+                      to={`/manage/jobs/${jobid}?partsorderid=${line.parts_order.id}`}
+                    >
+                      {line.parts_order.order_number}
+                    </Link>
+                  </Col>
+                  <Col span={4}>
+                    <DateFormatter>{line.parts_order.order_date}</DateFormatter>
+                  </Col>
+                  <Col span={4}>{line.parts_order.vendor.name}</Col>
+                  {line.backordered_eta ? (
+                    <Col span={4}>
+                      <span>
+                        {`${t("parts_orders.fields.backordered_eta")}: `}
+                        <DateFormatter>{line.backordered_eta}</DateFormatter>
+                      </span>
+                    </Col>
+                  ) : null}
+                </Row>
               </Timeline.Item>
             ))
           ) : (
@@ -71,7 +83,7 @@ export default function JobLinesExpander({ jobline, jobid }) {
                   </Col>
                   <Col span={4}>
                     <span>
-                    {`${t("billlines.fields.actual_cost")}: `}
+                      {`${t("billlines.fields.actual_cost")}: `}
                       <CurrencyFormatter>{line.actual_cost}</CurrencyFormatter>
                     </span>
                   </Col>
@@ -84,7 +96,7 @@ export default function JobLinesExpander({ jobline, jobid }) {
             ))
           ) : (
             <Timeline.Item>
-              {t("parts_orders.labels.notyetordered")}
+              {t("bills.labels.nobilllines")}
             </Timeline.Item>
           )}
         </Timeline>

client/src/components/parts-order-list-table/parts-order-list-table.component.jsx

@@ -1,5 +1,5 @@
 import { DeleteFilled, EyeFilled, SyncOutlined } from "@ant-design/icons";
-import { useMutation } from "@apollo/client";
+import { useLazyQuery, useMutation } from "@apollo/client";
 import {
   Button,
   Card,
@@ -13,20 +13,21 @@ import {
   Table,
 } from "antd";
 import queryString from "query-string";
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { QUERY_BILL_BY_PK } from "../../graphql/bills.queries";
 import { DELETE_PARTS_ORDER } from "../../graphql/parts-orders.queries";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
-import { alphaSort } from "../../utils/sorters";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { alphaSort } from "../../utils/sorters";
 import DataLabel from "../data-label/data-label.component";
 import PartsOrderBackorderEta from "../parts-order-backorder-eta/parts-order-backorder-eta.component";
 import PartsOrderCmReceived from "../parts-order-cm-received/parts-order-cm-received.component";
@@ -78,19 +79,46 @@ export function PartsOrderListTableComponent({
   const [state, setState] = useState({
     sortedInfo: {},
   });
+
+  const [returnfrombill, setReturnFromBill] = useState();
+  const [billData, setBillData] = useState();
   const search = queryString.parse(useLocation().search);
   const selectedpartsorder = search.partsorderid;
   const [searchText, setSearchText] = useState("");
 
+  const [billQuery] = useLazyQuery(QUERY_BILL_BY_PK);
   const [deletePartsOrder] = useMutation(DELETE_PARTS_ORDER);
 
   const parts_orders = billsQuery.data ? billsQuery.data.parts_orders : [];
   const { refetch } = billsQuery;
 
+  useEffect(() => {
+    if (returnfrombill === null) {
+      setBillData(null);
+    } else {
+      const fetchData = async () => {
+        const result = await billQuery({
+          variables: { billid: returnfrombill },
+        });
+        setBillData(result.data);
+      };
+      fetchData();
+    }
+  }, [returnfrombill, billQuery]);
+
   const recordActions = (record, showView = false) => (
     <Space wrap>
       {showView && (
-        <Button onClick={() => handleOnRowClick(record)}>
+        <Button
+          onClick={() => {
+            if (record.returnfrombill) {
+              setReturnFromBill(record.returnfrombill);
+            } else {
+              setReturnFromBill(null);
+            }
+            handleOnRowClick(record);
+          }}
+        >
           <EyeFilled />
         </Button>
       )}
@@ -417,7 +445,11 @@ export function PartsOrderListTableComponent({
     return (
       <div>
         <PageHeader
-          title={record && `${record.vendor.name} - ${record.order_number}`}
+          title={
+            billData
+              ? `${record.vendor.name} - ${record.order_number} - ${t("bills.labels.returnfrombill")}: ${billData.bills_by_pk.invoice_number}`
+              : `${record.vendor.name} - ${record.order_number}`
+          }
           extra={recordActions(record)}
         />
         <Table

client/src/components/parts-order-modal/parts-order-modal.component.jsx

@@ -1,17 +1,17 @@
-import { DeleteFilled, WarningFilled, DownOutlined } from "@ant-design/icons";
+import { DeleteFilled, DownOutlined, WarningFilled } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import {
+  Checkbox,
   Divider,
+  Dropdown,
   Form,
   Input,
   InputNumber,
+  Menu,
   Radio,
+  Select,
   Space,
   Tag,
-  Select,
-  Menu,
-  Dropdown,
-  Checkbox,
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -255,7 +255,7 @@ export function PartsOrderModalComponent({
                           },
                         ]}
                       >
-                        <InputNumber />
+                        <InputNumber min={1} />
                       </Form.Item>
                       <Form.Item
                         label={t("parts_orders.fields.act_price")}

client/src/components/payment-mark-export-button/payment-mark-export-button-component.jsx

@@ -7,10 +7,12 @@ import { createStructuredSelector } from "reselect";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectPayment } from "../../redux/modals/modals.selectors";
 import { selectCurrentUser } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
+  paymentModal: selectPayment,
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -24,6 +26,7 @@ const PaymentMarkForExportButton = ({
   refetch,
   setPaymentContext,
   currentUser,
+  paymentModal,
 }) => {
   const { t } = useTranslation();
   const [insertExportLog, { loading: exportLogLoading }] =
@@ -65,16 +68,22 @@ const PaymentMarkForExportButton = ({
           refetch,
         },
         context: {
+          ...paymentModal.context,
           ...payment,
           exportedat: today,
         },
       });
 
-      if (refetch)
-        refetch(
-          paymentUpdateResponse &&
-            paymentUpdateResponse.data.update_payments.returning[0]
-        );
+      if (refetch) {
+        if (paymentModal.context.refetchRequiresContext) {
+          refetch(
+            paymentUpdateResponse &&
+              paymentUpdateResponse.data.update_payments.returning[0]
+          );
+        } else {
+          refetch();
+        }
+      }
     } else {
       notification["error"]({
         message: t("payments.errors.exporting", {

client/src/components/payment-modal/payment-modal.container.jsx

@@ -1,5 +1,4 @@
 import { useMutation } from "@apollo/client";
-
 import { Button, Form, Modal, notification, Space } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -97,16 +96,21 @@ function PaymentModalContainer({
         });
 
         if (!!!updatedPayment.errors) {
-          notification["success"]({ message: t("payments.successes.payment") });
+          notification["success"]({ message: t("payments.successes.paymentupdate") });
         } else {
-          notification["error"]({ message: t("payments.errors.payment") });
+          notification["error"]({ message: t("payments.errors.paymentupdate") });
         }
       }
 
-      if (actions.refetch)
-        actions.refetch(
-          updatedPayment && updatedPayment.data.update_payments.returning[0]
-        );
+      if (actions.refetch) {
+        if (context.refetchRequiresContext) {
+          actions.refetch(
+            updatedPayment && updatedPayment.data.update_payments.returning[0]
+          );
+        } else {
+          actions.refetch();
+        }
+      }
 
       if (enterAgain) {
         const prev = form.getFieldsValue(["date"]);
@@ -159,7 +163,7 @@ function PaymentModalContainer({
       }}
       afterClose={() => form.resetFields()}
       footer={
-        <span>
+        <Space>
           <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
           <Button loading={loading} onClick={() => form.submit()}>
             {t("general.actions.save")}
@@ -175,7 +179,7 @@ function PaymentModalContainer({
               {t("general.actions.saveandnew")}
             </Button>
           )}
-        </span>
+        </Space>
       }
     >
       {!context || (context && !context.id) ? null : (

client/src/components/payment-reexport-button/payment-reexport-button.component.jsx

@@ -3,15 +3,25 @@ import { Button, notification } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
 import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectPayment } from "../../redux/modals/modals.selectors";
 
+const mapStateToProps = createStructuredSelector({
+  paymentModal: selectPayment,
+});
 const mapDispatchToProps = (dispatch) => ({
   setPaymentContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "payment" })),
 });
 
-const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
+const PaymentReexportButton = ({
+  paymentModal,
+  payment,
+  refetch,
+  setPaymentContext,
+}) => {
   const { t } = useTranslation();
   const [updatePayment, { loading }] = useMutation(UPDATE_PAYMENT);
 
@@ -35,15 +45,21 @@ const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
           refetch,
         },
         context: {
+          ...paymentModal.context,
           ...payment,
           exportedat: null,
         },
       });
-      if (refetch)
-        refetch(
-          paymentUpdateResponse &&
-            paymentUpdateResponse.data.update_payments.returning[0]
-        );
+      if (refetch) {
+        if (paymentModal.context.refetchRequiresContext) {
+          refetch(
+            paymentUpdateResponse &&
+              paymentUpdateResponse.data.update_payments.returning[0]
+          );
+        } else {
+          refetch();
+        }
+      }
     } else {
       notification["error"]({
         message: t("payments.errors.exporting", {
@@ -64,4 +80,7 @@ const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
   );
 };
 
-export default connect(null, mapDispatchToProps)(PaymentReexportButton);
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(PaymentReexportButton);

client/src/components/payments-list-paginated/payment-list-paginated.component.jsx

@@ -14,11 +14,11 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { pageLimit } from "../../utils/config";
 import { alphaSort } from "../../utils/sorters";
 import CaBcEtfTableModalContainer from "../ca-bc-etf-table-modal/ca-bc-etf-table-modal.container";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
-import {pageLimit} from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -184,7 +184,10 @@ export function PaymentsListPaginated({
                       }
                     : refetch,
                 },
-                context: apolloResults ? apolloResults : record,
+                context: {
+                  ...(apolloResults ? apolloResults : record),
+                  refetchRequiresContext: true,
+                },
               });
             }}
           >

client/src/components/print-center-jobs-labels/print-center-jobs-labels.component.jsx

@@ -6,6 +6,7 @@ import {
   notification,
   Popover,
   Radio,
+  Space,
 } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -115,10 +116,16 @@ export function PrintCenterJobsLabels({ bodyshop, jobId }) {
         >
           <InputNumber min={1} precision={0} max={99} />
         </Form.Item>
-        <Button type="primary" loading={loading} onClick={handleOk}>
-          {t("general.actions.print")}
-        </Button>
-        <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
+        <div style={{ display: "flex", justifyContent: "flex-end" }}>
+          <Space>
+            <Button type="primary" loading={loading} onClick={handleOk}>
+              {t("general.actions.print")}
+            </Button>
+            <Button onClick={handleCancel}>
+              {t("general.actions.cancel")}
+            </Button>
+          </Space>
+        </div>
       </Form>
     </Card>
   );

client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js

@@ -1,5 +1,5 @@
 import Icon from "@ant-design/icons";
-import { Popover } from "antd";
+import { Popover, Space } from "antd";
 import _ from "lodash";
 import moment from "moment";
 import React, { useMemo } from "react";
@@ -69,19 +69,22 @@ export function ScheduleCalendarHeaderComponent({
           {loadData && loadData.allJobsOut ? (
             loadData.allJobsOut.map((j) => (
               <tr key={j.id}>
-                <td>
-                  <Link to={`/manage/jobs/${j.id}`}>{j.ro_number}</Link>
+                <td style={{ padding: "2.5px" }}>
+                  <Link to={`/manage/jobs/${j.id}`}>{j.ro_number}</Link> (
+                  {j.status})
                 </td>
-                <td>
+                <td style={{ padding: "2.5px" }}>
                   <OwnerNameDisplay ownerObject={j} />
                 </td>
-                <td>
-                  {`(${(
-                    j.labhrs.aggregate.sum.mod_lb_hrs +
-                    j.larhrs.aggregate.sum.mod_lb_hrs
+                <td style={{ padding: "2.5px" }}>
+                  {`(${j.labhrs?.aggregate?.sum?.mod_lb_hrs?.toFixed(1) || 0}/${
+                    j.larhrs?.aggregate?.sum?.mod_lb_hrs?.toFixed(1) || 0
+                  }/${(
+                    j.labhrs.aggregate?.sum?.mod_lb_hrs +
+                    j.larhrs.aggregate?.sum?.mod_lb_hrs
                   ).toFixed(1)} ${t("general.labels.hours")})`}
                 </td>
-                <td>
+                <td style={{ padding: "2.5px" }}>
                   <DateTimeFormatter>
                     {j.scheduled_completion}
                   </DateTimeFormatter>
@@ -90,7 +93,9 @@ export function ScheduleCalendarHeaderComponent({
             ))
           ) : (
             <tr>
-              <td>{t("appointments.labels.nocompletingjobs")}</td>
+              <td style={{ padding: "2.5px" }}>
+                {t("appointments.labels.nocompletingjobs")}
+              </td>
             </tr>
           )}
         </tbody>
@@ -105,27 +110,30 @@ export function ScheduleCalendarHeaderComponent({
           {loadData && loadData.allJobsIn ? (
             loadData.allJobsIn.map((j) => (
               <tr key={j.id}>
-                <td>
+                <td style={{ padding: "2.5px" }}>
                   <Link to={`/manage/jobs/${j.id}`}>{j.ro_number}</Link>
-                  {j.status}
                 </td>
-                <td>
+                <td style={{ padding: "2.5px" }}>
                   <OwnerNameDisplay ownerObject={j} />
                 </td>
-                <td>
-                  {`(${(
-                    j.labhrs.aggregate.sum.mod_lb_hrs +
-                    j.larhrs.aggregate.sum.mod_lb_hrs
+                <td style={{ padding: "2.5px" }}>
+                  {`(${j.labhrs?.aggregate?.sum.mod_lb_hrs?.toFixed(1) || 0}/${
+                    j.larhrs?.aggregate?.sum?.mod_lb_hrs?.toFixed(1) || 0
+                  }/${(
+                    j.labhrs?.aggregate?.sum?.mod_lb_hrs +
+                    j.larhrs?.aggregate?.sum?.mod_lb_hrs
                   ).toFixed(1)} ${t("general.labels.hours")})`}
                 </td>
-                <td>
+                <td style={{ padding: "2.5px" }}>
                   <DateTimeFormatter>{j.scheduled_in}</DateTimeFormatter>
                 </td>
               </tr>
             ))
           ) : (
             <tr>
-              <td>{t("appointments.labels.noarrivingjobs")}</td>
+              <td style={{ padding: "2.5px" }}>
+                {t("appointments.labels.noarrivingjobs")}
+              </td>
             </tr>
           )}
         </tbody>
@@ -136,25 +144,32 @@ export function ScheduleCalendarHeaderComponent({
   const LoadComponent = loadData ? (
     <div>
       <div className="imex-flex-row imex-flex-row__flex-space-around">
-        <Popover
-          placement={"bottom"}
-          content={jobsInPopup}
-          trigger="hover"
-          title={t("appointments.labels.arrivingjobs")}
-        >
-          <Icon component={MdFileDownload} style={{ color: "green" }} />
-          {(loadData.allHoursIn || 0) && loadData.allHoursIn.toFixed(2)}
-        </Popover>
-        <Popover
-          placement={"bottom"}
-          content={jobsOutPopup}
-          trigger="hover"
-          title={t("appointments.labels.completingjobs")}
-        >
-          <Icon component={MdFileUpload} style={{ color: "red" }} />
-          {(loadData.allHoursOut || 0) && loadData.allHoursOut.toFixed(2)}
-        </Popover>
-        <ScheduleCalendarHeaderGraph loadData={loadData} />
+        <Space>
+          <Popover
+            placement={"bottom"}
+            content={jobsInPopup}
+            trigger="hover"
+            title={t("appointments.labels.arrivingjobs")}
+          >
+            <Icon component={MdFileDownload} style={{ color: "green" }} />
+            {(loadData.allHoursInBody || 0) &&
+              loadData.allHoursInBody.toFixed(1)}
+            /
+            {(loadData.allHoursInRefinish || 0) &&
+              loadData.allHoursInRefinish.toFixed(1)}
+            /{(loadData.allHoursIn || 0) && loadData.allHoursIn.toFixed(1)}
+          </Popover>
+          <Popover
+            placement={"bottom"}
+            content={jobsOutPopup}
+            trigger="hover"
+            title={t("appointments.labels.completingjobs")}
+          >
+            <Icon component={MdFileUpload} style={{ color: "red" }} />
+            {(loadData.allHoursOut || 0) && loadData.allHoursOut.toFixed(1)}
+          </Popover>
+          <ScheduleCalendarHeaderGraph loadData={loadData} />
+        </Space>
       </div>
       <div>
         <ul style={{ listStyleType: "none", columns: "2 auto", padding: 0 }}>

client/src/graphql/bills.queries.js

@@ -73,6 +73,7 @@ export const QUERY_BILLS_BY_JOBID = gql`
       order_date
       deliver_by
       return
+      returnfrombill
       orderedby
       parts_order_lines {
         id

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

@@ -46,7 +46,7 @@ export const QUERY_AVAILABLE_CC = gql`
 `;
 
 export const CHECK_CC_FLEET_NUMBER = gql`
-  query CHECK_VENDOR_NAME($name: String!) {
+  query CHECK_CC_FLEET_NUMBER($name: String!) {
     courtesycars_aggregate(where: { fleetnumber: { _ilike: $name } }) {
       aggregate {
         count

client/src/graphql/jobs-lines.queries.js

@@ -172,6 +172,12 @@ export const UPDATE_JOB_LINE = gql`
         id
         notes
         mod_lbr_ty
+        mod_lb_hrs
+        part_type
+        op_code_desc
+        prt_dsmk_m
+        prt_dsmk_p
+        tax_part
         part_qty
         db_price
         act_price

client/src/graphql/jobs.queries.js

@@ -2205,6 +2205,8 @@ export const GET_JOB_LINE_ORDERS = gql`
     parts_order_lines(where: { job_line_id: { _eq: $joblineid } }) {
       id
       act_price
+      backordered_eta
+      backordered_on
       parts_order {
         id
         order_date

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

@@ -241,7 +241,7 @@ export function BillsListPage({
       extra={
         <Space wrap>
           {search.search && (
-            <>
+            <Space align="center">
               <Typography.Title level={4}>
                 {t("general.labels.searchresults", { search: search.search })}
               </Typography.Title>
@@ -254,7 +254,7 @@ export function BillsListPage({
               >
                 {t("general.actions.clear")}
               </Button>
-            </>
+            </Space>
           )}
           <Button onClick={() => refetch()}>
             <SyncOutlined />

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

@@ -76,7 +76,11 @@ export function CourtesyCarCreateContainer({
         onFinish={handleFinish}
         layout="vertical"
       >
-        <CourtesyCarFormComponent form={form} saveLoading={loading} />
+        <CourtesyCarFormComponent
+          form={form}
+          saveLoading={loading}
+          newCC={true}
+        />
       </Form>
     </RbacWrapper>
   );

client/src/redux/application/application.sagas.js

@@ -131,7 +131,12 @@ export function* calculateScheduleLoad({ payload: end }) {
           (load[itemDate].allHoursIn || 0) +
           item.labhrs.aggregate.sum.mod_lb_hrs +
           item.larhrs.aggregate.sum.mod_lb_hrs;
-
+        load[itemDate].allHoursInBody =
+          (load[itemDate].allHoursInBody || 0) +
+          item.labhrs.aggregate.sum.mod_lb_hrs;
+        load[itemDate].allHoursInRefinish =
+          (load[itemDate].allHoursInRefinish || 0) +
+          item.larhrs.aggregate.sum.mod_lb_hrs;
         //If the job hasn't already arrived, add it to the jobs in list.
         // Make sure it also hasn't already been completed, or isn't an in and out job.
         //This prevents the duplicate counting.
@@ -142,6 +147,12 @@ export function* calculateScheduleLoad({ payload: end }) {
             (load[itemDate].hoursIn || 0) +
             item.labhrs.aggregate.sum.mod_lb_hrs +
             item.larhrs.aggregate.sum.mod_lb_hrs;
+          load[itemDate].hoursInBody =
+            (load[itemDate].hoursInBody || 0) +
+            item.labhrs.aggregate.sum.mod_lb_hrs;
+          load[itemDate].hoursInRefinish =
+            (load[itemDate].hoursInRefinish || 0) +
+            item.larhrs.aggregate.sum.mod_lb_hrs;
         }
       } else {
         load[itemDate] = {
@@ -152,10 +163,18 @@ export function* calculateScheduleLoad({ payload: end }) {
           allHoursIn:
             item.labhrs.aggregate.sum.mod_lb_hrs +
             item.larhrs.aggregate.sum.mod_lb_hrs,
+          allHoursInBody: item.labhrs.aggregate.sum.mod_lb_hrs,
+          allHoursInRefinish: item.larhrs.aggregate.sum.mod_lb_hrs,
           hoursIn: AddJobForSchedulingCalc
             ? item.labhrs.aggregate.sum.mod_lb_hrs +
               item.larhrs.aggregate.sum.mod_lb_hrs
             : 0,
+          hoursInBody: AddJobForSchedulingCalc
+            ? item.labhrs.aggregate.sum.mod_lb_hrs
+            : 0,
+          hoursInRefinish: AddJobForSchedulingCalc
+            ? item.larhrs.aggregate.sum.mod_lb_hrs
+            : 0,
         };
       }
     });
@@ -179,6 +198,12 @@ export function* calculateScheduleLoad({ payload: end }) {
           (load[itemDate].allHoursOut || 0) +
           item.labhrs.aggregate.sum.mod_lb_hrs +
           item.larhrs.aggregate.sum.mod_lb_hrs;
+        load[itemDate].allHoursOutBody =
+          (load[itemDate].allHoursOutBody || 0) +
+          item.labhrs.aggregate.sum.mod_lb_hrs;
+        load[itemDate].allHoursOutRefinish =
+          (load[itemDate].allHoursOutRefinish || 0) +
+          item.larhrs.aggregate.sum.mod_lb_hrs;
         //Add only the jobs that are still in production to get rid of.
         //If it's not in production, we'd subtract unnecessarily.
         load[itemDate].allJobsOut.push(item);
@@ -189,6 +214,12 @@ export function* calculateScheduleLoad({ payload: end }) {
             (load[itemDate].hoursOut || 0) +
             item.labhrs.aggregate.sum.mod_lb_hrs +
             item.larhrs.aggregate.sum.mod_lb_hrs;
+          load[itemDate].hoursOutBody =
+            (load[itemDate].hoursOutBody || 0) +
+            item.labhrs.aggregate.sum.mod_lb_hrs;
+          load[itemDate].hoursOutRefinish =
+            (load[itemDate].hoursOutRefinish || 0) +
+            item.larhrs.aggregate.sum.mod_lb_hrs;
         }
       } else {
         load[itemDate] = {
@@ -201,6 +232,8 @@ export function* calculateScheduleLoad({ payload: end }) {
           allHoursOut:
             item.labhrs.aggregate.sum.mod_lb_hrs +
             item.larhrs.aggregate.sum.mod_lb_hrs,
+          allHoursOutBody: item.labhrs.aggregate.sum.mod_lb_hrs,
+          allHoursOutRefinish: item.larhrs.aggregate.sum.mod_lb_hrs,
         };
       }
     });

client/src/translations/en_us/common.json

@@ -217,10 +217,12 @@
 				"markexported": "Mark Exported",
 				"markforreexport": "Mark for Re-export",
 				"new": "New Bill",
+				"nobilllines": "This part has not yet been recieved.",
 				"noneselected": "No bill selected.",
-				"onlycmforinvoiced": "Only credit memos can be entered for any Job that has been invoiced,  exported,  or voided.",
+				"onlycmforinvoiced": "Only credit memos can be entered for any Job that has been invoiced, exported, or voided.",
 				"printlabels": "Print Labels",
 				"retailtotal": "Bills Retail Total",
+				"returnfrombill": "Return From Bill",
 				"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",
 				"subtotal": "Subtotal",
@@ -2332,6 +2334,7 @@
 				"markexported": "Payment(s) marked exported.",
 				"markreexported": "Payment marked for re-export successfully",
 				"payment": "Payment created successfully. ",
+				"paymentupdate": "Payment updated successfully. ",
 				"stripe": "Credit card transaction charged successfully."
 			}
 		},

client/src/translations/es/common.json

@@ -221,6 +221,7 @@
 				"onlycmforinvoiced": "",
 				"printlabels": "",
 				"retailtotal": "",
+				"returnfrombill": "",
 				"savewithdiscrepancy": "",
 				"state_tax": "",
 				"subtotal": "",
@@ -2331,6 +2332,7 @@
 				"markexported": "",
 				"markreexported": "",
 				"payment": "",
+				"paymentupdate": "",
 				"stripe": ""
 			}
 		},

client/src/translations/fr/common.json

@@ -221,6 +221,7 @@
 				"onlycmforinvoiced": "",
 				"printlabels": "",
 				"retailtotal": "",
+				"returnfrombill": "",
 				"savewithdiscrepancy": "",
 				"state_tax": "",
 				"subtotal": "",
@@ -2331,6 +2332,7 @@
 				"markexported": "",
 				"markreexported": "",
 				"payment": "",
+				"paymentupdate": "",
 				"stripe": ""
 			}
 		},

hasura/metadata/tables.yaml

@@ -969,6 +969,7 @@
           - md_rbac
           - md_referral_sources
           - md_responsibility_centers
+          - md_ro_guard
           - md_ro_statuses
           - md_tasks_presets
           - md_to_emails
@@ -1068,6 +1069,7 @@
           - md_rbac
           - md_referral_sources
           - md_responsibility_centers
+          - md_ro_guard
           - md_ro_statuses
           - md_tasks_presets
           - md_to_emails

hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/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"."bodyshops" add column "md_ro_guard" jsonb
+--  null default jsonb_build_object();

hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "md_ro_guard" jsonb
+ null default jsonb_build_object();