Merged in release/2022-03-04 (pull request #409)

release/2022-03-04

Approved-by: Patrick Fic

client/src/components/jobs-notes/jobs.notes.component.jsx

@@ -124,7 +124,7 @@ export function JobNotesComponent({
             messageObject={{
               subject: Templates.individual_job_note.subject,
             }}
-            id={record.id}
+            id={jobId}
           />
         </Space>
       ),

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

@@ -73,6 +73,7 @@ export function PartsOrderModalComponent({
             options={vendorList}
             disabled={isReturn}
             preferredMake={preferredMake}
+            showPhone
           />
         </Form.Item>
         <Form.Item

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

@@ -196,6 +196,11 @@ export function PartsOrderModalContainer({
         (item) => item.id === values.vendorid
       )[0];
 
+      let vendorEmails =
+        matchingVendor &&
+        matchingVendor.email &&
+        matchingVendor.email.split(RegExp("[;,]"));
+
       GenerateDocument(
         {
           name: isReturn
@@ -206,7 +211,7 @@ export function PartsOrderModalContainer({
           },
         },
         {
-          to: matchingVendor ? [matchingVendor.email] : null,
+          to: matchingVendor ? vendorEmails : null,
           replyTo: bodyshop.email,
           subject: isReturn
             ? Templates.parts_return_slip.subject

client/src/components/vendor-search-select/vendor-search-select.component.jsx

@@ -7,7 +7,7 @@ const { Option } = Select;
 //To be used as a form element only.
 
 const VendorSearchSelect = (
-  { value, onChange, options, onSelect, disabled, preferredMake },
+  { value, onChange, options, onSelect, disabled, preferredMake, showPhone },
   ref
 ) => {
   const [option, setOption] = useState(value);
@@ -54,7 +54,7 @@ const VendorSearchSelect = (
                 <div style={{ flex: 1 }}>{o.name}</div>
                 <Space style={{ marginLeft: "1rem" }}>
                   <HeartOutlined style={{ color: "red" }} />
-                  {o.phone && (
+                  {o.phone && showPhone && (
                     <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>
                   )}
                   {o.discount && o.discount !== 0 ? (
@@ -72,7 +72,7 @@ const VendorSearchSelect = (
                 <div style={{ flex: 1 }}>{o.name}</div>
 
                 <Space style={{ marginLeft: "1rem" }}>
-                  {o.phone && (
+                  {o.phone && showPhone && (
                     <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>
                   )}
                   {o.discount && o.discount !== 0 ? (

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

@@ -109,12 +109,14 @@ export default function VendorsFormComponent({
 
         <Form.Item
           label={t("vendors.fields.email")}
-          rules={[
+          rules={
-            {
+            [
-              type: "email",
+              // {
-              message: t("general.validation.invalidemail"),
+              //   type: "email",
-            },
+              //   message: t("general.validation.invalidemail"),
-          ]}
+              // },
+            ]
+          }
           name="email"
         >
           <FormItemEmail email={getFieldValue("email")} />

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

@@ -59,6 +59,8 @@ export const GET_LINE_TICKET_BY_PK = gql`
       employeeid
       memo
       flat_rate
+      clockon
+      clockoff
       employee {
         id
         first_name

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

@@ -70,7 +70,12 @@ export function CourtesyCarCreateContainer({
 
   return (
     <RbacWrapper action="courtesycar:create">
-      <Form form={form} autoComplete="new-password" onFinish={handleFinish}>
+      <Form
+        form={form}
+        autoComplete="new-password"
+        onFinish={handleFinish}
+        layout="vertical"
+      >
         <CourtesyCarFormComponent form={form} saveLoading={loading} />
       </Form>
     </RbacWrapper>