Merge branch 'release/2024-04-05' into release/AIO/2024-04-05

IO-2731 Payment Edit

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

@@ -34,6 +34,7 @@ export function BillDetailEditReturn({ setPartsOrderContext, insertAuditTrail, b
       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

@@ -57,7 +57,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 || jobRO}
       />
 

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

@@ -1,9 +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);
 
@@ -27,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

@@ -11,11 +11,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();
 
@@ -30,7 +34,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

@@ -97,7 +97,7 @@ export function JobLinesExpander({ jobline, jobid, bodyshop }) {
               : [
                   {
                     key: "no-orders",
-                    children: t("parts_orders.labels.notyetordered")
+                    children: t("bills.labels.nobilllines")
                   }
                 ]
           }

client/src/components/jobs-available-table/jobs-available-table.container.jsx

@@ -592,32 +592,35 @@ function ResolveCCCLineIssues(estData, bodyshop) {
   //Group by line no
   // For everything but the first one, strip out the price number in
 
-  // InstanceRenderManager({executeFunction:true, args:[], promanager: () => {
-  // const groupedByLineRef = _.groupBy(estData.joblines.data, "line_ref");
-  // Object.keys(groupedByLineRef).forEach((lineRef) => {
-  //   let index0ActPrice;
-  //   groupedByLineRef[lineRef].forEach((line, index) => {
-  //     //Let the first one keep it
-  //     if (index === 0){
-  //       index0ActPrice = line.act_price;
-  //       return;}
-  //     //Web Est seems to have additional costs with UNQ_SEQ 0. Keep them all?
-  //     if (line.unq_seq === 0) return;
-  //     if(index0ActPrice !== line.act_price){
-  //       line.notes += ` | Price override.`;
-  //       return;
-  //     }
-  //     const indexInEstData = estData.joblines.data.findIndex(
-  //       (l) => l.unq_seq === line.unq_seq
-  //     );
-  //     estData.joblines.data[
-  //       indexInEstData
-  //     ].notes += ` | Scrubbed due to the line_ref issue. (prev act price = ${estData.joblines.data[indexInEstData].act_price})`;
-  //     estData.joblines.data[indexInEstData].act_price = 0;
-  //     estData.joblines.data[indexInEstData].db_price = 0;
-  //   });
-  // })
-  // }})
+  InstanceRenderManager({
+    executeFunction: true,
+    args: [],
+    promanager: () => {
+      const groupedByLineRef = _.groupBy(estData.joblines.data, "line_ref");
+      Object.keys(groupedByLineRef).forEach((lineRef) => {
+        let index0ActPrice;
+        groupedByLineRef[lineRef].forEach((line, index) => {
+          //Let the first one keep it
+          if (index === 0) {
+            index0ActPrice = line.act_price;
+            return;
+          }
+          //Web Est seems to have additional costs with UNQ_SEQ 0. Keep them all?
+          if (line.unq_seq === 0) return;
+          if (index0ActPrice !== line.act_price) {
+            line.notes += ` | Price override.`;
+            return;
+          }
+          const indexInEstData = estData.joblines.data.findIndex((l) => l.unq_seq === line.unq_seq);
+          estData.joblines.data[
+            indexInEstData
+          ].notes += ` | Scrubbed due to the line_ref issue. (prev act price = ${estData.joblines.data[indexInEstData].act_price})`;
+          estData.joblines.data[indexInEstData].act_price = 0;
+          estData.joblines.data[indexInEstData].db_price = 0;
+        });
+      });
+    }
+  });
 
   InstanceRenderManager({
     executeFunction: true,

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

@@ -7,17 +7,20 @@ 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";
+import { selectPayment } from "../../redux/modals/modals.selectors";
 
 const mapStateToProps = createStructuredSelector({
-  currentUser: selectCurrentUser
+  currentUser: selectCurrentUser,
+  paymentModal: selectPayment
 });
 
 const mapDispatchToProps = (dispatch) => ({
   setPaymentContext: (context) => dispatch(setModalContext({ context: context, modal: "payment" }))
 });
 
-const PaymentMarkForExportButton = ({ bodyshop, payment, refetch, setPaymentContext, currentUser }) => {
+const PaymentMarkForExportButton = ({ bodyshop, payment, refetch, setPaymentContext, currentUser, paymentModal }) => {
   const { t } = useTranslation();
   const [insertExportLog, { loading: exportLogLoading }] = useMutation(INSERT_EXPORT_LOG);
   const [updatePayment, { loading: updatePaymentLoading }] = useMutation(UPDATE_PAYMENT);
@@ -56,16 +59,20 @@ const PaymentMarkForExportButton = ({ bodyshop, payment, refetch, setPaymentCont
           refetch
         },
         context: {
+          ...paymentModal.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";
@@ -85,13 +84,19 @@ function PaymentModalContainer({ paymentModal, toggleModalVisible, bodyshop, cur
         });
 
         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"]);
@@ -166,13 +171,7 @@ function PaymentModalContainer({ paymentModal, toggleModalVisible, bodyshop, cur
         </Space>
       )}
 
-      <Form
-        onFinish={handleFinish}
-        autoComplete={"off"}
-        form={form}
-        layout="vertical"
-        disabled={context?.exportedat}
-      >
+      <Form onFinish={handleFinish} autoComplete={"off"} form={form} layout="vertical" disabled={context?.exportedat}>
         <PaymentForm form={form} />
       </Form>
     </Modal>

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

@@ -3,14 +3,24 @@ 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";
+import { createStructuredSelector } from "reselect";
 
+const mapStateToProps = createStructuredSelector({
+  paymentModal: selectPayment
+});
+
+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);
 
@@ -34,15 +44,20 @@ const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
           refetch
         },
         context: {
+          ...paymentModal.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", {
@@ -59,4 +74,4 @@ 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,6 +14,7 @@ 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";
@@ -171,7 +172,7 @@ 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

@@ -1,4 +1,5 @@
-import { Button, Card, Form, InputNumber, notification, Popover, Radio } from "antd";
+import { Button, Card, Form, InputNumber, notification, Popover, Radio   Space,
+} from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -95,10 +96,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/graphql/courtesy-car.queries.js

@@ -41,7 +41,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

@@ -219,6 +219,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/pages/bills/bills.page.component.jsx

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

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

@@ -72,7 +72,11 @@ export function CourtesyCarCreateContainer({ bodyshop, setBreadcrumbs, setSelect
     <RbacWrapper action="courtesycar:create">
       <FeatureWrapperComponent featureName="courtesycars">
         <Form form={form} autoComplete="new-password" onFinish={handleFinish} layout="vertical">
-          <CourtesyCarFormComponent form={form} saveLoading={loading} />
+          <CourtesyCarFormComponent
+          form={form}
+          saveLoading={loading}
+          newCC={true}
+        />
         </Form>
       </FeatureWrapperComponent>
     </RbacWrapper>

client/src/translations/en_us/common.json

@@ -223,8 +223,9 @@
 				"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",
 				"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.",
@@ -2504,6 +2505,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

@@ -2504,6 +2504,7 @@
 				"markexported": "",
 				"markreexported": "",
 				"payment": "",
+				"paymentupdate": "",
 				"stripe": ""
 			}
 		},

client/src/translations/fr/common.json

@@ -2504,6 +2504,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();

server/job/job-costing.js

@@ -770,7 +770,7 @@ const getAdditionalCostCenter = (jl, profitCenters) => {
       return profitCenters["TOW"];
     } else if (jl.act_price > 0) {
       //TODO:AIO Ensure that this is tested.
-      ret.profitcenter_part = defaults.profits["PAO"];
+      return profitCenters["PAO"];
     } else {
       return null;
     }