Merged in release/2022-10-21 (pull request #599)

Release/2022 10 21

bodyshop_translations.babel

@@ -37395,6 +37395,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>parts_invoice_label_single</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>parts_label_multiple</name>
                                         <definition_loaded>false</definition_loaded>
@@ -43081,6 +43102,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>shiftalreadyclockedon</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                 </children>
                             </folder_node>
                             <folder_node>

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -229,23 +229,26 @@ function BillEnterModalContainer({
         });
       }
     }
+    //If it's not a credit memo, update the statuses.
 
-    await Promise.all(
+    if (!values.is_credit_memo) {
-      remainingValues.billlines
+      await Promise.all(
-        .filter((il) => il.joblineid !== "noline")
+        remainingValues.billlines
-        .map((li) => {
+          .filter((il) => il.joblineid !== "noline")
-          return updateJobLines({
+          .map((li) => {
-            variables: {
+            return updateJobLines({
-              lineId: li.joblineid,
+              variables: {
-              line: {
+                lineId: li.joblineid,
-                location: li.location || location,
+                line: {
-                status:
+                  location: li.location || location,
-                  bodyshop.md_order_statuses.default_received || "Received*",
+                  status:
+                    bodyshop.md_order_statuses.default_received || "Received*",
+                },
               },
-            },
+            });
-          });
+          })
-        })
+      );
-    );
+    }
 
     /////////////////////////
     if (upload && upload.length > 0) {

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

@@ -1,11 +1,12 @@
 import { useQuery } from "@apollo/client";
-import { Row, Col, Timeline, Typography, Space, Divider, Skeleton } from "antd";
+import { Col, Divider, Row, Skeleton, Space, Timeline, Typography } from "antd";
 import React from "react";
-import { GET_JOB_LINE_ORDERS } from "../../graphql/jobs.queries";
 import { useTranslation } from "react-i18next";
-import AlertComponent from "../alert/alert.component";
-import { DateFormatter } from "../../utils/DateFormatter";
 import { Link } from "react-router-dom";
+import { GET_JOB_LINE_ORDERS } from "../../graphql/jobs.queries";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { DateFormatter } from "../../utils/DateFormatter";
+import AlertComponent from "../alert/alert.component";
 
 export default function JobLinesExpander({ jobline, jobid }) {
   const { t } = useTranslation();
@@ -48,7 +49,46 @@ export default function JobLinesExpander({ jobline, jobid }) {
           )}
         </Timeline>
       </Col>
-      <Col md={24} lg={12}></Col>
+      <Col md={24} lg={12}>
+        <Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
+        <Timeline>
+          {data.billlines.length > 0 ? (
+            data.billlines.map((line) => (
+              <Timeline.Item key={line.id}>
+                <Row wrap>
+                  <Col span={4}>
+                    <Link
+                      to={`/manage/jobs/${jobid}?tab=partssublet&billid=${line.bill.id}`}
+                    >
+                      {line.bill.invoice_number}
+                    </Link>
+                  </Col>
+                  <Col span={4}>
+                    <span>
+                      {`${t("billlines.fields.actual_price")}: `}
+                      <CurrencyFormatter>{line.actual_price}</CurrencyFormatter>
+                    </span>
+                  </Col>
+                  <Col span={4}>
+                    <span>
+                    {`${t("billlines.fields.actual_cost")}: `}
+                      <CurrencyFormatter>{line.actual_cost}</CurrencyFormatter>
+                    </span>
+                  </Col>
+                  <Col span={4}>
+                    <DateFormatter>{line.bill.date}</DateFormatter>
+                  </Col>
+                  <Col span={4}> {line.bill.vendor.name}</Col>
+                </Row>
+              </Timeline.Item>
+            ))
+          ) : (
+            <Timeline.Item>
+              {t("parts_orders.labels.notyetordered")}
+            </Timeline.Item>
+          )}
+        </Timeline>
+      </Col>
     </Row>
   );
 }

client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx

@@ -27,6 +27,7 @@ export function TimeTicektShiftContainer({
   technician,
   currentUser,
   isTechConsole,
+  checkIfAlreadyClocked,
 }) {
   const [form] = Form.useForm();
   const [insertTimeTicket] = useMutation(INSERT_NEW_TIME_TICKET);
@@ -43,36 +44,47 @@ export function TimeTicektShiftContainer({
 
   const handleFinish = async (values) => {
     setLoading(true);
-    const theTime = moment((await axios.post("/utils/time")).data);
 
-    const result = await insertTimeTicket({
+    const alreadyClocked = await checkIfAlreadyClocked();
-      variables: {
-        timeTicketInput: [
-          {
-            bodyshopid: bodyshop.id,
-            employeeid: isTechConsole ? technician.id : employeeId,
-            cost_center: "timetickets.labels.shift",
-            clockon: theTime,
-            date: theTime,
-            memo: values.memo,
-          },
-        ],
-      },
-      awaitRefetchQueries: true,
-      refetchQueries: ["QUERY_ACTIVE_SHIFT_TIME_TICKETS"],
-    });
 
-    if (!!result.errors) {
+    if (alreadyClocked) {
+      //Show the error.
       notification["error"]({
-        message: t("timetickets.errors.clockingin", {
+        message: t("timetickets.errors.shiftalreadyclockedon"),
-          message: JSON.stringify(result.errors),
-        }),
       });
     } else {
-      notification["success"]({
+      const theTime = moment((await axios.post("/utils/time")).data);
-        message: t("timetickets.successes.clockedin"),
+
+      const result = await insertTimeTicket({
+        variables: {
+          timeTicketInput: [
+            {
+              bodyshopid: bodyshop.id,
+              employeeid: isTechConsole ? technician.id : employeeId,
+              cost_center: "timetickets.labels.shift",
+              clockon: theTime,
+              date: theTime,
+              memo: values.memo,
+            },
+          ],
+        },
+        awaitRefetchQueries: true,
+        refetchQueries: ["QUERY_ACTIVE_SHIFT_TIME_TICKETS"],
       });
+
+      if (!!result.errors) {
+        notification["error"]({
+          message: t("timetickets.errors.clockingin", {
+            message: JSON.stringify(result.errors),
+          }),
+        });
+      } else {
+        notification["success"]({
+          message: t("timetickets.successes.clockedin"),
+        });
+      }
     }
+
     setLoading(false);
   };
 

client/src/components/time-ticket-shift/time-ticket-shift.container.jsx

@@ -64,6 +64,12 @@ export function TimeTicketShiftContainer({
       </div>
     );
 
+  const checkIfAlreadyClocked = async () => {
+    const { data } = await refetch();
+
+    return data.timetickets.length > 0;
+  };
+
   return (
     <div>
       {data.timetickets.length > 0 ? (
@@ -72,7 +78,10 @@ export function TimeTicketShiftContainer({
           refetch={refetch}
         />
       ) : (
-        <TimeTicketShiftFormContainer isTechConsole={isTechConsole} />
+        <TimeTicketShiftFormContainer
+          isTechConsole={isTechConsole}
+          checkIfAlreadyClocked={checkIfAlreadyClocked}
+        />
       )}
     </div>
   );

client/src/graphql/jobs.queries.js

@@ -2120,6 +2120,22 @@ export const DELETE_RELATED_RO = gql`
 `;
 export const GET_JOB_LINE_ORDERS = gql`
   query GET_JOB_LINE_ORDERS($joblineid: uuid!) {
+    billlines(where: { joblineid: { _eq: $joblineid } }) {
+      actual_cost
+      actual_price
+      billid
+      quantity
+      bill {
+        id
+        invoice_number
+        date
+        vendorid
+        vendor {
+          id
+          name
+        }
+      }
+    }
     parts_order_lines(where: { job_line_id: { _eq: $joblineid } }) {
       id
       act_price

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -354,7 +354,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
                             totalAllocated
                           )
                         : Dinero();
-                      return discrep.getAmount() > 0
+                      return discrep.getAmount() >= 0
                         ? Promise.resolve()
                         : Promise.reject(
                             new Error(

client/src/translations/en_us/common.json

@@ -2215,6 +2215,7 @@
 				"mpi_eglass_auth": "MPI - eGlass Auth",
 				"mpi_final_acct_sheet": "MPI - Final Accounting Sheet",
 				"paint_grid": "Paint Grid",
+				"parts_invoice_label_single": "Parts Label Single",
 				"parts_label_multiple": "Parts Label - Multi",
 				"parts_label_single": "Parts Label - Single",
 				"parts_list": "Parts List",
@@ -2557,7 +2558,8 @@
 				"creating": "Error creating time ticket. {{message}}",
 				"deleting": "Error deleting time ticket. {{message}}",
 				"noemployeeforuser": "Unable to use Shift Clock",
-				"noemployeeforuser_sub": "An employee record has not been created for this user. Please create one before using the shift clock. "
+				"noemployeeforuser_sub": "An employee record has not been created for this user. Please create one before using the shift clock. ",
+				"shiftalreadyclockedon": "You are already clocked onto a shift. Unable to create shift entry."
 			},
 			"fields": {
 				"actualhrs": "Actual Hours",

client/src/translations/es/common.json

@@ -2215,6 +2215,7 @@
 				"mpi_eglass_auth": "",
 				"mpi_final_acct_sheet": "",
 				"paint_grid": "",
+				"parts_invoice_label_single": "",
 				"parts_label_multiple": "",
 				"parts_label_single": "",
 				"parts_list": "",
@@ -2557,7 +2558,8 @@
 				"creating": "",
 				"deleting": "",
 				"noemployeeforuser": "",
-				"noemployeeforuser_sub": ""
+				"noemployeeforuser_sub": "",
+				"shiftalreadyclockedon": ""
 			},
 			"fields": {
 				"actualhrs": "",

client/src/translations/fr/common.json

@@ -2215,6 +2215,7 @@
 				"mpi_eglass_auth": "",
 				"mpi_final_acct_sheet": "",
 				"paint_grid": "",
+				"parts_invoice_label_single": "",
 				"parts_label_multiple": "",
 				"parts_label_single": "",
 				"parts_list": "",
@@ -2557,7 +2558,8 @@
 				"creating": "",
 				"deleting": "",
 				"noemployeeforuser": "",
-				"noemployeeforuser_sub": ""
+				"noemployeeforuser_sub": "",
+				"shiftalreadyclockedon": ""
 			},
 			"fields": {
 				"actualhrs": "",