From 85497eb8156cb59ff27140f57f8e96338eb325e7 Mon Sep 17 00:00:00 2001
From: Allan Carr <allan.carr@thinkimex.com>
Date: Wed, 2 Aug 2023 16:36:47 -0700
Subject: [PATCH 1/6] IO-2370 Work In Progress Jobs

---
 client/src/translations/en_us/common.json |  1 +
 client/src/translations/es/common.json    |  1 +
 client/src/translations/fr/common.json    |  1 +
 client/src/utils/TemplateConstants.js     | 13 +++++++++++++
 4 files changed, 16 insertions(+)

diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index f28b5c3c0..184fe9802 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2625,6 +2625,7 @@
 				"timetickets_summary": "Time Tickets Summary",
 				"unclaimed_hrs": "Unclaimed Hours",
 				"void_ros": "Void ROs",
+				"work_in_progress_jobs": "Work in Progress - Jobs",
 				"work_in_progress_labour": "Work in Progress - Labor",
 				"work_in_progress_payables": "Work in Progress - Payables"
 			}
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 1987de28a..746caa909 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2625,6 +2625,7 @@
 				"timetickets_summary": "",
 				"unclaimed_hrs": "",
 				"void_ros": "",
+				"work_in_progress_jobs": "",
 				"work_in_progress_labour": "",
 				"work_in_progress_payables": ""
 			}
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 0230fbbdd..b5b966b94 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2625,6 +2625,7 @@
 				"timetickets_summary": "",
 				"unclaimed_hrs": "",
 				"void_ros": "",
+				"work_in_progress_jobs": "",
 				"work_in_progress_labour": "",
 				"work_in_progress_payables": ""
 			}
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index 558af08bc..1cdc24bd7 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -1547,6 +1547,19 @@ export const TemplateList = (type, context) => {
             },
             group: "payroll",
           },
+          work_in_progress_jobs_excel: {
+            title: i18n.t("reportcenter.templates.work_in_progress_jobs"),
+            subject: i18n.t("reportcenter.templates.work_in_progress_jobs"),
+            key: "work_in_progress_jobs_excel",
+            //idtype: "vendor",
+            reporttype: "excel",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open"),
+            },
+            group: "jobs",
+          },
           work_in_progress_labour: {
             title: i18n.t("reportcenter.templates.work_in_progress_labour"),
             description: "",

From 1a5c74dc79f4fc5ae7ee3b2d325006ada35f68da Mon Sep 17 00:00:00 2001
From: Allan Carr <allan.carr@thinkimex.com>
Date: Fri, 4 Aug 2023 09:05:03 -0700
Subject: [PATCH 2/6] IO-2371 Closing Period

---
 .../bill-form/bill-form.component.jsx         | 32 ++++++++++--
 .../shop-info/shop-info.container.jsx         | 43 +++++++++++-----
 .../shop-info/shop-info.general.component.jsx | 41 +++++++++++++--
 .../pages/jobs-close/jobs-close.component.jsx | 51 +++++++++++++++----
 client/src/translations/en_us/common.json     |  3 ++
 client/src/translations/es/common.json        |  3 ++
 client/src/translations/fr/common.json        |  3 ++
 7 files changed, 146 insertions(+), 30 deletions(-)

diff --git a/client/src/components/bill-form/bill-form.component.jsx b/client/src/components/bill-form/bill-form.component.jsx
index 3ff123743..eb0d3a789 100644
--- a/client/src/components/bill-form/bill-form.component.jsx
+++ b/client/src/components/bill-form/bill-form.component.jsx
@@ -1,6 +1,6 @@
 import Icon, { UploadOutlined } from "@ant-design/icons";
 import { useApolloClient } from "@apollo/client";
-import { MdOpenInNew } from "react-icons/md";
+import { useTreatments } from "@splitsoftware/splitio-react";
 import {
   Alert,
   Divider,
@@ -14,12 +14,14 @@ import {
 } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
+import { MdOpenInNew } from "react-icons/md";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { CHECK_BILL_INVOICE_NUMBER } from "../../graphql/bills.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
+import BillFormLinesExtended from "../bill-form-lines-extended/bill-form-lines-extended.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
@@ -28,8 +30,6 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import BillFormLines from "./bill-form.lines.component";
 import { CalculateBillTotal } from "./bill-form.totals.utility";
-import { useTreatments } from "@splitsoftware/splitio-react";
-import BillFormLinesExtended from "../bill-form-lines-extended/bill-form-lines-extended.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -58,6 +58,11 @@ export function BillFormComponent({
     {},
     bodyshop.imexshopid
   );
+  const { ClosingPeriod } = useTreatments(
+    ["ClosingPeriod"],
+    {},
+    bodyshop.imexshopid
+  );
 
   const handleVendorSelect = (props, opt) => {
     setDiscount(opt.discount);
@@ -259,6 +264,27 @@ export function BillFormComponent({
               required: true,
               //message: t("general.validation.required"),
             },
+            ({ getFieldValue }) => ({
+              validator(rule, value) {
+                if (
+                  ClosingPeriod.treatment === "on" &&
+                  bodyshop.accountingconfig.ClosingPeriod
+                ) {
+                  if (
+                    Date.parse(value).valueOf() >=
+                      Date.parse(bodyshop.accountingconfig.ClosingPeriod[0]).valueOf() &&
+                    Date.parse(value).valueOf() <=
+                      Date.parse(bodyshop.accountingconfig.ClosingPeriod[1]).valueOf()
+                  ) {
+                    return Promise.resolve();
+                  } else {
+                    return Promise.reject(t("bills.validation.closingperiod"));
+                  }
+                } else {
+                  return Promise.resolve();
+                }
+              },
+            }),
           ]}
         >
           <FormDatePicker disabled={disabled} />
diff --git a/client/src/components/shop-info/shop-info.container.jsx b/client/src/components/shop-info/shop-info.container.jsx
index fec10877c..dd254a4cb 100644
--- a/client/src/components/shop-info/shop-info.container.jsx
+++ b/client/src/components/shop-info/shop-info.container.jsx
@@ -1,14 +1,14 @@
-import React, { useEffect, useState } from "react";
-import ShopInfoComponent from "./shop-info.component";
+import { useMutation, useQuery } from "@apollo/client";
 import { Form, notification } from "antd";
-import { useQuery, useMutation } from "@apollo/client";
-import { QUERY_BODYSHOP, UPDATE_SHOP } from "../../graphql/bodyshop.queries";
-import LoadingSpinner from "../loading-spinner/loading-spinner.component";
-import AlertComponent from "../alert/alert.component";
+import moment from "moment";
+import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { QUERY_BODYSHOP, UPDATE_SHOP } from "../../graphql/bodyshop.queries";
+import AlertComponent from "../alert/alert.component";
 import FormsFieldChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
-import moment from "moment";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
+import ShopInfoComponent from "./shop-info.component";
 export default function ShopInfoContainer() {
   const [form] = Form.useForm();
   const { t } = useTranslation();
@@ -52,13 +52,28 @@ export default function ShopInfoContainer() {
       onFinish={handleFinish}
       initialValues={
         data
-          ? {
-              ...data.bodyshops[0],
-              schedule_start_time: moment(
-                data.bodyshops[0].schedule_start_time
-              ),
-              schedule_end_time: moment(data.bodyshops[0].schedule_end_time),
-            }
+          ? data.bodyshops[0].accountingconfig.ClosingPeriod
+            ? {
+                ...data.bodyshops[0],
+                accountingconfig: {
+                  ...data.bodyshops[0].accountingconfig,
+                  ClosingPeriod: [
+                    moment(data.bodyshops[0].accountingconfig.ClosingPeriod[0]),
+                    moment(data.bodyshops[0].accountingconfig.ClosingPeriod[1]),
+                  ],
+                },
+                schedule_start_time: moment(
+                  data.bodyshops[0].schedule_start_time
+                ),
+                schedule_end_time: moment(data.bodyshops[0].schedule_end_time),
+              }
+            : {
+                ...data.bodyshops[0],
+                schedule_start_time: moment(
+                  data.bodyshops[0].schedule_start_time
+                ),
+                schedule_end_time: moment(data.bodyshops[0].schedule_end_time),
+              }
           : null
       }
     >
diff --git a/client/src/components/shop-info/shop-info.general.component.jsx b/client/src/components/shop-info/shop-info.general.component.jsx
index 99245c76e..ebf2accaf 100644
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -1,6 +1,8 @@
 import { DeleteFilled } from "@ant-design/icons";
+import { useTreatments } from "@splitsoftware/splitio-react";
 import {
   Button,
+  DatePicker,
   Form,
   Input,
   InputNumber,
@@ -9,8 +11,13 @@ import {
   Space,
   Switch,
 } from "antd";
+import momentTZ from "moment-timezone";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import DatePickerRanges from "../../utils/DatePickerRanges";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import PhoneFormItem, {
@@ -18,12 +25,22 @@ import PhoneFormItem, {
 } from "../form-items-formatted/phone-form-item.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
-
-import momentTZ from "moment-timezone";
 const timeZonesList = momentTZ.tz.names();
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoGeneral);
 
-export default function ShopInfoGeneral({ form }) {
+export function ShopInfoGeneral({ form, bodyshop }) {
   const { t } = useTranslation();
+  const { ClosingPeriod } = useTreatments(
+    ["ClosingPeriod"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
 
   return (
     <div>
@@ -392,6 +409,20 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Select mode="tags" />
         </Form.Item>
+        {ClosingPeriod.treatment === "on" && (
+          <>
+            <Form.Item
+              allowClear
+              name={["accountingconfig", "ClosingPeriod"]}
+              label={t("bodyshop.fields.closingperiod")} //{t("reportcenter.labels.dates")}
+            >
+              <DatePicker.RangePicker
+                format="MM/DD/YYYY"
+                ranges={DatePickerRanges}
+              />
+            </Form.Item>
+          </>
+        )}
       </LayoutFormRow>
       <LayoutFormRow
         header={t("bodyshop.labels.scoreboardsetup")}
@@ -604,7 +635,9 @@ export default function ShopInfoGeneral({ form }) {
         </Form.Item>
         <Form.Item
           name={["md_email_cc", "parts_return_slip"]}
-          label={t("bodyshop.fields.md_email_cc", { template: "parts_return_slip" })}
+          label={t("bodyshop.fields.md_email_cc", {
+            template: "parts_return_slip",
+          })}
           rules={[
             {
               //message: t("general.validation.required"),
diff --git a/client/src/pages/jobs-close/jobs-close.component.jsx b/client/src/pages/jobs-close/jobs-close.component.jsx
index f7fcbfe1a..840bc8102 100644
--- a/client/src/pages/jobs-close/jobs-close.component.jsx
+++ b/client/src/pages/jobs-close/jobs-close.component.jsx
@@ -8,7 +8,6 @@ import {
   Form,
   Input,
   InputNumber,
-  notification,
   PageHeader,
   Popconfirm,
   Row,
@@ -17,12 +16,14 @@ import {
   Statistic,
   Switch,
   Typography,
+  notification,
 } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 //import { useHistory } from "react-router-dom";
 import { useTreatments } from "@splitsoftware/splitio-react";
+import Dinero from "dinero.js";
 import moment from "moment";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
@@ -37,7 +38,6 @@ import { generateJobLinesUpdatesForInvoicing } from "../../graphql/jobs-lines.qu
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import Dinero from "dinero.js";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   jobRO: selectJobReadOnly,
@@ -55,6 +55,11 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
     {},
     bodyshop && bodyshop.imexshopid
   );
+  const { ClosingPeriod } = useTreatments(
+    ["ClosingPeriod"],
+    {},
+    bodyshop && bodyshop.imexshopid
+  );
 
   const handleFinish = async ({ removefromproduction, ...values }) => {
     setLoading(true);
@@ -250,14 +255,42 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
               },
               ({ getFieldValue }) => ({
                 validator(_, value) {
-                  if (!bodyshop.cdk_dealerid) return Promise.resolve();
-                  if (!value || moment(value).isSameOrAfter(moment(), "day")) {
-                    return Promise.resolve();
+                  if (!bodyshop.cdk_dealerid) {
+                    if (
+                      ClosingPeriod.treatment === "on" &&
+                      bodyshop.accountingconfig.ClosingPeriod
+                    ) {
+                      if (
+                        Date.parse(value).valueOf() >=
+                          Date.parse(
+                            bodyshop.accountingconfig.ClosingPeriod[0]
+                          ).valueOf() &&
+                        Date.parse(value).valueOf() <=
+                          Date.parse(
+                            bodyshop.accountingconfig.ClosingPeriod[1]
+                          ).valueOf()
+                      ) {
+                        return Promise.resolve();
+                      } else {
+                        return Promise.reject(
+                          new Error(t("jobs.labels.closingperiod"))
+                        );
+                      }
+                    } else {
+                      return Promise.resolve();
+                    }
+                  } else {
+                    if (
+                      !value ||
+                      moment(value).isSameOrAfter(moment(), "day")
+                    ) {
+                      return Promise.resolve();
+                    } else {
+                      return Promise.reject(
+                        new Error(t("jobs.labels.dms.invoicedatefuture"))
+                      );
+                    }
                   }
-
-                  return Promise.reject(
-                    new Error(t("jobs.labels.dms.invoicedatefuture"))
-                  );
                 },
               }),
             ]}
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index f28b5c3c0..866eba157 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -223,6 +223,7 @@
 				"reexport": "Bill marked for re-export."
 			},
 			"validation": {
+				"closingperiod": "This Bill Date is outside of the Closing Period.",
 				"inventoryquantity": "Quantity must be greater than or equal to what has been added to inventory ({{number}}).",
 				"manualinhouse": "Manual posting to the in house vendor is restricted. ",
 				"unique_invoice_number": "This invoice number has already been entered for this vendor."
@@ -262,6 +263,7 @@
 				"bill_local_tax_rate": "Bill - Provincial/State Tax Rate %",
 				"bill_state_tax_rate": "Bill - Provincial/State Tax Rate %",
 				"city": "City",
+				"closingperiod": "Closing Period",
 				"country": "Country",
 				"dailybodytarget": "Scoreboard - Daily Body Target",
 				"dailypainttarget": "Scoreboard - Daily Paint Target",
@@ -1688,6 +1690,7 @@
 				"checklists": "Checklists",
 				"closeconfirm": "Are you sure you want to close this job? This cannot be easily undone.",
 				"closejob": "Close Job {{ro_number}}",
+				"closingperiod": "This Invoice Date is outside of the Closing Period.",
 				"contracts": "CC Contracts",
 				"convertedtolabor": "Lines Converted to Labor",
 				"cost": "Cost",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 1987de28a..7c419a5f2 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -223,6 +223,7 @@
 				"reexport": ""
 			},
 			"validation": {
+				"closingperiod": "",
 				"inventoryquantity": "",
 				"manualinhouse": "",
 				"unique_invoice_number": ""
@@ -262,6 +263,7 @@
 				"bill_local_tax_rate": "",
 				"bill_state_tax_rate": "",
 				"city": "",
+				"closingperiod": "",
 				"country": "",
 				"dailybodytarget": "",
 				"dailypainttarget": "",
@@ -1688,6 +1690,7 @@
 				"checklists": "",
 				"closeconfirm": "",
 				"closejob": "",
+				"closingperiod": "",
 				"contracts": "",
 				"convertedtolabor": "",
 				"cost": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 0230fbbdd..5e390aaa4 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -223,6 +223,7 @@
 				"reexport": ""
 			},
 			"validation": {
+				"closingperiod": "",
 				"inventoryquantity": "",
 				"manualinhouse": "",
 				"unique_invoice_number": ""
@@ -262,6 +263,7 @@
 				"bill_local_tax_rate": "",
 				"bill_state_tax_rate": "",
 				"city": "",
+				"closingperiod": "",
 				"country": "",
 				"dailybodytarget": "",
 				"dailypainttarget": "",
@@ -1688,6 +1690,7 @@
 				"checklists": "",
 				"closeconfirm": "",
 				"closejob": "",
+				"closingperiod": "",
 				"contracts": "",
 				"convertedtolabor": "",
 				"cost": "",

From eebe7edba8b2be8fb0442be65f377297908846fb Mon Sep 17 00:00:00 2001
From: Allan Carr <allan.carr@thinkimex.com>
Date: Fri, 4 Aug 2023 10:36:01 -0700
Subject: [PATCH 3/6] IO-2371 Closing period timezone adjustments

---
 .../bill-form/bill-form.component.jsx         | 19 +++++--
 .../pages/jobs-close/jobs-close.component.jsx | 56 +++++++++----------
 2 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/client/src/components/bill-form/bill-form.component.jsx b/client/src/components/bill-form/bill-form.component.jsx
index eb0d3a789..0fa28359a 100644
--- a/client/src/components/bill-form/bill-form.component.jsx
+++ b/client/src/components/bill-form/bill-form.component.jsx
@@ -12,6 +12,7 @@ import {
   Switch,
   Upload,
 } from "antd";
+import moment from "moment";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { MdOpenInNew } from "react-icons/md";
@@ -271,10 +272,20 @@ export function BillFormComponent({
                   bodyshop.accountingconfig.ClosingPeriod
                 ) {
                   if (
-                    Date.parse(value).valueOf() >=
-                      Date.parse(bodyshop.accountingconfig.ClosingPeriod[0]).valueOf() &&
-                    Date.parse(value).valueOf() <=
-                      Date.parse(bodyshop.accountingconfig.ClosingPeriod[1]).valueOf()
+                    moment(value)
+                      .startOf("day")
+                      .isSameOrAfter(
+                        moment(
+                          bodyshop.accountingconfig.ClosingPeriod[0]
+                        ).startOf("day")
+                      ) &&
+                    moment(value)
+                      .startOf("day")
+                      .isSameOrBefore(
+                        moment(
+                          bodyshop.accountingconfig.ClosingPeriod[1]
+                        ).endOf("day")
+                      )
                   ) {
                     return Promise.resolve();
                   } else {
diff --git a/client/src/pages/jobs-close/jobs-close.component.jsx b/client/src/pages/jobs-close/jobs-close.component.jsx
index 840bc8102..91c8c7385 100644
--- a/client/src/pages/jobs-close/jobs-close.component.jsx
+++ b/client/src/pages/jobs-close/jobs-close.component.jsx
@@ -255,41 +255,41 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
               },
               ({ getFieldValue }) => ({
                 validator(_, value) {
-                  if (!bodyshop.cdk_dealerid) {
+                  if (!bodyshop.cdk_dealerid) return Promise.resolve();
+                  if (!value || moment(value).isSameOrAfter(moment(), "day")) {
+                    return Promise.resolve();
+                  }
+                  return Promise.reject(
+                    new Error(t("jobs.labels.dms.invoicedatefuture"))
+                  );
+                },
+              }),
+              ({ getFieldValue }) => ({
+                validator(_, value) {
+                  if (
+                    ClosingPeriod.treatment === "on" &&
+                    bodyshop.accountingconfig.ClosingPeriod
+                  ) {
                     if (
-                      ClosingPeriod.treatment === "on" &&
-                      bodyshop.accountingconfig.ClosingPeriod
-                    ) {
-                      if (
-                        Date.parse(value).valueOf() >=
-                          Date.parse(
-                            bodyshop.accountingconfig.ClosingPeriod[0]
-                          ).valueOf() &&
-                        Date.parse(value).valueOf() <=
-                          Date.parse(
-                            bodyshop.accountingconfig.ClosingPeriod[1]
-                          ).valueOf()
-                      ) {
-                        return Promise.resolve();
-                      } else {
-                        return Promise.reject(
-                          new Error(t("jobs.labels.closingperiod"))
-                        );
-                      }
-                    } else {
-                      return Promise.resolve();
-                    }
-                  } else {
-                    if (
-                      !value ||
-                      moment(value).isSameOrAfter(moment(), "day")
+                      moment(value).isSameOrAfter(
+                        moment(
+                          bodyshop.accountingconfig.ClosingPeriod[0]
+                        ).startOf("day")
+                      ) &&
+                      moment(value).isSameOrBefore(
+                        moment(
+                          bodyshop.accountingconfig.ClosingPeriod[1]
+                        ).endOf("day")
+                      )
                     ) {
                       return Promise.resolve();
                     } else {
                       return Promise.reject(
-                        new Error(t("jobs.labels.dms.invoicedatefuture"))
+                        new Error(t("jobs.labels.closingperiod"))
                       );
                     }
+                  } else {
+                    return Promise.resolve();
                   }
                 },
               }),

From 786c7903073e4ed3fb0bcab4af46a82d20f13923 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Fri, 4 Aug 2023 12:28:08 -0700
Subject: [PATCH 4/6] WIP Tech Claiming Ability

---
 bodyshop_translations.babel                   |  47 ++++++
 .../job-line-dispatch-button.component.jsx    |  13 +-
 .../parts-dispatch-expander.component.jsx     |  13 +-
 .../tech-sider/tech-sider.component.jsx       |  15 +-
 client/src/graphql/parts-dispatch.queries.js  |  49 ++++++
 .../tech-dispatched-parts.page.jsx            | 139 ++++++++++++++++++
 client/src/pages/tech/tech.page.component.jsx |   8 +
 client/src/translations/en_us/common.json     |   4 +
 client/src/translations/es/common.json        |   4 +
 client/src/translations/fr/common.json        |   4 +
 10 files changed, 286 insertions(+), 10 deletions(-)
 create mode 100644 client/src/pages/tech-dispatched-parts/tech-dispatched-parts.page.jsx

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index bbf89d093..f5a1d8e48 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -33786,6 +33786,27 @@
                             <folder_node>
                                 <name>tech</name>
                                 <children>
+                                    <concept_node>
+                                        <name>dispatchedparts</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>home</name>
                                         <definition_loaded>false</definition_loaded>
@@ -35877,6 +35898,32 @@
                     <folder_node>
                         <name>parts_dispatch</name>
                         <children>
+                            <folder_node>
+                                <name>actions</name>
+                                <children>
+                                    <concept_node>
+                                        <name>accept</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>
                                 <name>errors</name>
                                 <children>
diff --git a/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx b/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx
index 04b808932..50fdfee05 100644
--- a/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx
+++ b/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx
@@ -70,7 +70,7 @@ export function JobLineDispatchButton({
         notification.open({
           type: "error",
           message: t("parts_dispatch.errors.creating", {
-            error: JSON.stringify(result.errors),
+            error: result.errors,
           }),
         });
       } else {
@@ -79,7 +79,7 @@ export function JobLineDispatchButton({
           {
             name: Templates.parts_dispatch.key,
             variables: {
-              id: result.data.insert_part_dispatch_one.id,
+              id: result.data.insert_parts_dispatch_one.id,
             },
           },
           {},
@@ -91,7 +91,7 @@ export function JobLineDispatchButton({
       notification.open({
         type: "error",
         message: t("parts_dispatch.errors.creating", {
-          error: JSON.stringify(error),
+          error: error,
         }),
       });
     } finally {
@@ -137,7 +137,12 @@ export function JobLineDispatchButton({
         </Form.Item>
 
         <Space wrap>
-          <Button type="danger" onClick={() => form.submit()} loading={loading}>
+          <Button
+            type="danger"
+            onClick={() => form.submit()}
+            loading={loading}
+            disabled={selectedLines.length === 0}
+          >
             {t("general.actions.save")}
           </Button>
           <Button onClick={() => setVisible(false)}>
diff --git a/client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx b/client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx
index ccbb3a02b..131fd7802 100644
--- a/client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx
+++ b/client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx
@@ -1,4 +1,4 @@
-import { Card, Col, Row, Table } from "antd";
+import { Button, Card, Col, Row, Table } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
@@ -28,9 +28,12 @@ export default function PartsDispatchExpander({ dispatch, job }) {
       width: "20%",
 
       //sorter: (a, b) => alphaSort(a.number, b.number),
-      render: (text, record) => (
-        <DateTimeFormatter>{record.accepted_at}</DateTimeFormatter>
-      ),
+      render: (text, record) =>
+        record.accepted_at ? (
+          <DateTimeFormatter>{record.accepted_at}</DateTimeFormatter>
+        ) : (
+          <Button>{t("parts_dispatch.actions.accept")}</Button>
+        ),
     },
   ];
   return (
@@ -38,7 +41,7 @@ export default function PartsDispatchExpander({ dispatch, job }) {
       <Row gutter={[16, 16]}>
         <Col span={24}>
           <Table
-            pagination={false}
+            rowKey={"id"}
             dataSource={dispatch.parts_dispatch_lines}
             columns={columns}
           />
diff --git a/client/src/components/tech-sider/tech-sider.component.jsx b/client/src/components/tech-sider/tech-sider.component.jsx
index c6ea4f67f..3cb3c261c 100644
--- a/client/src/components/tech-sider/tech-sider.component.jsx
+++ b/client/src/components/tech-sider/tech-sider.component.jsx
@@ -1,4 +1,8 @@
-import Icon, { SearchOutlined, ScheduleOutlined } from "@ant-design/icons";
+import Icon, {
+  SearchOutlined,
+  ScheduleOutlined,
+  CarOutlined,
+} from "@ant-design/icons";
 import { Layout, Menu } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -68,6 +72,15 @@ export function TechSider({ technician, techLogout }) {
         <Menu.Item key="5" disabled={!!!technician} icon={<ScheduleOutlined />}>
           <Link to={`/tech/list`}>{t("menus.tech.productionlist")}</Link>
         </Menu.Item>
+        <Menu.Item
+          key="dispatchedparts"
+          disabled={!!!technician}
+          icon={<CarOutlined />}
+        >
+          <Link to={`/tech/dispatchedparts`}>
+            {t("menus.tech.dispatchedparts")}
+          </Link>
+        </Menu.Item>
         <Menu.Item
           key="6"
           disabled={!!!technician}
diff --git a/client/src/graphql/parts-dispatch.queries.js b/client/src/graphql/parts-dispatch.queries.js
index da5584ee0..d4f5e940b 100644
--- a/client/src/graphql/parts-dispatch.queries.js
+++ b/client/src/graphql/parts-dispatch.queries.js
@@ -15,3 +15,52 @@ export const INSERT_PARTS_DISPATCH = gql`
     }
   }
 `;
+
+export const GET_UNACCEPTED_PARTS_DISPATCH = gql`
+  query GET_UNACCEPTED_PARTS_DISPATCH(
+    $techId: uuid!
+    $offset: Int
+    $limit: Int
+  ) {
+    parts_dispatch_aggregate(
+      where: {
+        employeeid: { _eq: $techId }
+        parts_dispatch_lines: { accepted_at: { _is_null: true } }
+      }
+    ) {
+      aggregate {
+        count(distinct: true)
+      }
+    }
+    parts_dispatch(
+      offset: $offset
+      limit: $limit
+      where: {
+        employeeid: { _eq: $techId }
+        parts_dispatch_lines: { accepted_at: { _is_null: true } }
+      }
+    ) {
+      id
+      job {
+        id
+        ro_number
+        status
+        v_make_desc
+        v_model_desc
+        v_model_yr
+        v_color
+      }
+      dispatched_at
+      dispatched_by
+      parts_dispatch_lines {
+        id
+        jobline {
+          line_desc
+          id
+        }
+        quantity
+        joblineid
+      }
+    }
+  }
+`;
diff --git a/client/src/pages/tech-dispatched-parts/tech-dispatched-parts.page.jsx b/client/src/pages/tech-dispatched-parts/tech-dispatched-parts.page.jsx
new file mode 100644
index 000000000..d87b5a9ad
--- /dev/null
+++ b/client/src/pages/tech-dispatched-parts/tech-dispatched-parts.page.jsx
@@ -0,0 +1,139 @@
+import {
+  MinusCircleTwoTone,
+  PlusCircleTwoTone,
+  SyncOutlined,
+} from "@ant-design/icons";
+import { useQuery } from "@apollo/client";
+import { Button, Card, Input, Space, Table } from "antd";
+import queryString from "query-string";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { useHistory, useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import AlertComponent from "../../components/alert/alert.component";
+import PartsDispatchExpander from "../../components/parts-dispatch-expander/parts-dispatch-expander.component";
+import { GET_UNACCEPTED_PARTS_DISPATCH } from "../../graphql/parts-dispatch.queries";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { alphaSort } from "../../utils/sorters";
+
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  technician: selectTechnician,
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({});
+
+export function TechDispatchedParts({ technician, bodyshop }) {
+  const searchParams = queryString.parse(useLocation().search);
+  const { page } = searchParams;
+
+  const { loading, error, data, refetch } = useQuery(
+    GET_UNACCEPTED_PARTS_DISPATCH,
+    {
+      variables: {
+        techId: technician.id,
+        offset: page ? (page - 1) * 25 : 0,
+        limit: 25,
+      },
+    }
+  );
+
+  const { t } = useTranslation();
+  const history = useHistory();
+
+  if (error) return <AlertComponent message={error.message} type="error" />;
+
+  const parts_dispatch = data?.parts_dispatch;
+
+  const columns = [
+    {
+      title: t("jobs.fields.ro_number"),
+      dataIndex: "job.ro_number",
+      key: "ro_number",
+      sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
+
+      render: (text, record) => record.job.ro_number || t("general.labels.na"),
+    },
+    {
+      title: t("jobs.fields.status"),
+      dataIndex: "status",
+      key: "status",
+      sorter: (a, b) => alphaSort(a.status, b.status),
+      render: (text, record) => {
+        return record.job.status || t("general.labels.na");
+      },
+    },
+
+    {
+      title: t("jobs.fields.vehicle"),
+      dataIndex: "vehicle",
+      key: "vehicle",
+      ellipsis: true,
+      render: (text, record) => (
+        <span>{`${record.job.v_model_yr || ""} ${
+          record.job.v_make_desc || ""
+        } ${record.job.v_model_desc || ""}`}</span>
+      ),
+    },
+    {
+      title: t("general.labels.actions"),
+      dataIndex: "actions",
+      key: "actions",
+      render: (text, record) => (
+        <Button onClick={() => {}}>
+          {t("timetickets.actions.claimtasks")}
+        </Button>
+      ),
+    },
+  ];
+  const handleTableChange = (pagination, filters, sorter) => {
+    searchParams.page = pagination.current;
+    history.push({ search: queryString.stringify(searchParams) });
+  };
+
+  return (
+    <Card
+      extra={
+        <Space wrap>
+          <Button onClick={() => refetch()}>
+            <SyncOutlined />
+          </Button>
+        </Space>
+      }
+    >
+      <Table
+        loading={loading}
+        pagination={{
+          pageSize: 25,
+          current: parseInt(page || 1),
+          total: data ? data.parts_dispatch_aggregate.aggregate.count : 0,
+          showSizeChanger: false,
+        }}
+        columns={columns}
+        rowKey="id"
+        dataSource={parts_dispatch}
+        scroll={{ x: true }}
+        onChange={handleTableChange}
+        expandable={{
+          expandedRowRender: (record) => (
+            <PartsDispatchExpander dispatch={record} />
+          ),
+          rowExpandable: (record) => true,
+          //expandRowByClick: true,
+          expandIcon: ({ expanded, onExpand, record }) =>
+            expanded ? (
+              <MinusCircleTwoTone onClick={(e) => onExpand(record, e)} />
+            ) : (
+              <PlusCircleTwoTone onClick={(e) => onExpand(record, e)} />
+            ),
+        }}
+      />
+    </Card>
+  );
+}
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(TechDispatchedParts);
diff --git a/client/src/pages/tech/tech.page.component.jsx b/client/src/pages/tech/tech.page.component.jsx
index f7639a473..d56ce6e09 100644
--- a/client/src/pages/tech/tech.page.component.jsx
+++ b/client/src/pages/tech/tech.page.component.jsx
@@ -34,6 +34,9 @@ const TechJobClock = lazy(() =>
 const TechShiftClock = lazy(() =>
   import("../tech-shift-clock/tech-shift-clock.component")
 );
+const TechDispatchedParts = lazy(() =>
+  import("../tech-dispatched-parts/tech-dispatched-parts.page")
+);
 
 const { Content } = Layout;
 
@@ -98,6 +101,11 @@ export function TechPage({ technician, match }) {
                     path={`${match.path}/board`}
                     component={ProductionBoardPage}
                   />
+                  <Route
+                    exact
+                    path={`${match.path}/dispatchedparts`}
+                    component={TechDispatchedParts}
+                  />
                 </Switch>
               </FeatureWrapper>
             </Suspense>
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index cd518d134..07533cf11 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1985,6 +1985,7 @@
 				"shops": "My Shops"
 			},
 			"tech": {
+				"dispatchedparts": "Dispatched Parts",
 				"home": "Home",
 				"jobclockin": "Job Clock In",
 				"jobclockout": "Job Clock Out",
@@ -2126,6 +2127,9 @@
 			}
 		},
 		"parts_dispatch": {
+			"actions": {
+				"accept": "Accept"
+			},
 			"errors": {
 				"creating": "Error dispatching parts. {{error}}"
 			},
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index a95c8511f..0e38e3c01 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1985,6 +1985,7 @@
 				"shops": "Mis tiendas"
 			},
 			"tech": {
+				"dispatchedparts": "",
 				"home": "",
 				"jobclockin": "",
 				"jobclockout": "",
@@ -2126,6 +2127,9 @@
 			}
 		},
 		"parts_dispatch": {
+			"actions": {
+				"accept": ""
+			},
 			"errors": {
 				"creating": ""
 			},
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index ded54b294..8c69db593 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1985,6 +1985,7 @@
 				"shops": "Mes boutiques"
 			},
 			"tech": {
+				"dispatchedparts": "",
 				"home": "",
 				"jobclockin": "",
 				"jobclockout": "",
@@ -2126,6 +2127,9 @@
 			}
 		},
 		"parts_dispatch": {
+			"actions": {
+				"accept": ""
+			},
 			"errors": {
 				"creating": ""
 			},

From bf18e687da674a89d203e3f44239980429526836 Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Fri, 4 Aug 2023 12:36:08 -0700
Subject: [PATCH 5/6] Schema updates for parts dispatch.

---
 hasura/metadata/tables.yaml                                     | 2 ++
 .../down.sql                                                    | 1 +
 .../1691177401095_create_index_parts_dispatch_employeeid/up.sql | 2 ++
 .../down.sql                                                    | 1 +
 .../1691177452060_create_index_parts_dispatch_dispatchid/up.sql | 2 ++
 .../down.sql                                                    | 1 +
 .../up.sql                                                      | 2 ++
 7 files changed, 11 insertions(+)
 create mode 100644 hasura/migrations/1691177401095_create_index_parts_dispatch_employeeid/down.sql
 create mode 100644 hasura/migrations/1691177401095_create_index_parts_dispatch_employeeid/up.sql
 create mode 100644 hasura/migrations/1691177452060_create_index_parts_dispatch_dispatchid/down.sql
 create mode 100644 hasura/migrations/1691177452060_create_index_parts_dispatch_dispatchid/up.sql
 create mode 100644 hasura/migrations/1691177467690_create_index_parts_dispatch_line_accepted_at/down.sql
 create mode 100644 hasura/migrations/1691177467690_create_index_parts_dispatch_line_accepted_at/up.sql

diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index cf189ea3f..a24db9297 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -4649,6 +4649,7 @@
                         _eq: X-Hasura-User-Id
                   - active:
                       _eq: true
+        allow_aggregations: true
   update_permissions:
     - role: user
       permission:
@@ -4726,6 +4727,7 @@
                           _eq: X-Hasura-User-Id
                     - active:
                         _eq: true
+        allow_aggregations: true
   update_permissions:
     - role: user
       permission:
diff --git a/hasura/migrations/1691177401095_create_index_parts_dispatch_employeeid/down.sql b/hasura/migrations/1691177401095_create_index_parts_dispatch_employeeid/down.sql
new file mode 100644
index 000000000..d49495dbb
--- /dev/null
+++ b/hasura/migrations/1691177401095_create_index_parts_dispatch_employeeid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."parts_dispatch_employeeid";
diff --git a/hasura/migrations/1691177401095_create_index_parts_dispatch_employeeid/up.sql b/hasura/migrations/1691177401095_create_index_parts_dispatch_employeeid/up.sql
new file mode 100644
index 000000000..cfeb1460e
--- /dev/null
+++ b/hasura/migrations/1691177401095_create_index_parts_dispatch_employeeid/up.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "parts_dispatch_employeeid" on
+  "public"."parts_dispatch" using btree ("employeeid");
diff --git a/hasura/migrations/1691177452060_create_index_parts_dispatch_dispatchid/down.sql b/hasura/migrations/1691177452060_create_index_parts_dispatch_dispatchid/down.sql
new file mode 100644
index 000000000..edc36c9f2
--- /dev/null
+++ b/hasura/migrations/1691177452060_create_index_parts_dispatch_dispatchid/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."parts_dispatch_dispatchid";
diff --git a/hasura/migrations/1691177452060_create_index_parts_dispatch_dispatchid/up.sql b/hasura/migrations/1691177452060_create_index_parts_dispatch_dispatchid/up.sql
new file mode 100644
index 000000000..643325a9f
--- /dev/null
+++ b/hasura/migrations/1691177452060_create_index_parts_dispatch_dispatchid/up.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "parts_dispatch_dispatchid" on
+  "public"."parts_dispatch_lines" using btree ("partsdispatchid");
diff --git a/hasura/migrations/1691177467690_create_index_parts_dispatch_line_accepted_at/down.sql b/hasura/migrations/1691177467690_create_index_parts_dispatch_line_accepted_at/down.sql
new file mode 100644
index 000000000..5268f9914
--- /dev/null
+++ b/hasura/migrations/1691177467690_create_index_parts_dispatch_line_accepted_at/down.sql
@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."parts_dispatch_line_accepted_at";
diff --git a/hasura/migrations/1691177467690_create_index_parts_dispatch_line_accepted_at/up.sql b/hasura/migrations/1691177467690_create_index_parts_dispatch_line_accepted_at/up.sql
new file mode 100644
index 000000000..9d88ca6cc
--- /dev/null
+++ b/hasura/migrations/1691177467690_create_index_parts_dispatch_line_accepted_at/up.sql
@@ -0,0 +1,2 @@
+CREATE  INDEX "parts_dispatch_line_accepted_at" on
+  "public"."parts_dispatch_lines" using btree ("accepted_at");

From 26dc720929c5099dab5bc0e1938310b22bbe3d8d Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Fri, 4 Aug 2023 13:24:41 -0700
Subject: [PATCH 6/6] Add technician side to part dispatching.

---
 bodyshop_translations.babel                   | 168 ++++++++++++++++++
 .../job-lines-expander.component.jsx          |  50 +++++-
 .../job-line-location-popup.component.jsx     |   7 +-
 .../parts-dispatch-expander.component.jsx     |  33 +++-
 client/src/graphql/jobs.queries.js            |  12 ++
 client/src/graphql/parts-dispatch.queries.js  |  13 ++
 .../tech-dispatched-parts.page.jsx            |   4 +-
 client/src/translations/en_us/common.json     |   3 +-
 client/src/translations/es/common.json        |   1 +
 client/src/translations/fr/common.json        |   1 +
 10 files changed, 281 insertions(+), 11 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 207a52a84..eb4440d6e 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1474,6 +1474,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>admin_jobuninvoice</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>admin_jobunvoid</name>
                                         <definition_loaded>false</definition_loaded>
@@ -3571,6 +3592,27 @@
                             <folder_node>
                                 <name>validation</name>
                                 <children>
+                                    <concept_node>
+                                        <name>closingperiod</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>inventoryquantity</name>
                                         <definition_loaded>false</definition_loaded>
@@ -4205,6 +4247,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>closingperiod</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>country</name>
                                         <definition_loaded>false</definition_loaded>
@@ -23710,6 +23773,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>date_void</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>ded_amt</name>
                                         <definition_loaded>false</definition_loaded>
@@ -28490,6 +28574,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>closingperiod</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>contracts</name>
                                         <definition_loaded>false</definition_loaded>
@@ -36032,6 +36137,27 @@
                             <folder_node>
                                 <name>errors</name>
                                 <children>
+                                    <concept_node>
+                                        <name>accepting</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>creating</name>
                                         <definition_loaded>false</definition_loaded>
@@ -40888,6 +41014,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>parts_return_slip</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>sublet_order</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -44739,6 +44886,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>work_in_progress_jobs</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>work_in_progress_labour</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/job-detail-lines/job-lines-expander.component.jsx b/client/src/components/job-detail-lines/job-lines-expander.component.jsx
index 06e00c729..b64924210 100644
--- a/client/src/components/job-detail-lines/job-lines-expander.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines-expander.component.jsx
@@ -8,7 +8,18 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.component";
 
-export default function JobLinesExpander({ jobline, jobid }) {
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobLinesExpander);
+
+export function JobLinesExpander({ jobline, jobid, bodyshop }) {
   const { t } = useTranslation();
   const { loading, error, data } = useQuery(GET_JOB_LINE_ORDERS, {
     fetchPolicy: "network-only",
@@ -23,7 +34,7 @@ export default function JobLinesExpander({ jobline, jobid }) {
 
   return (
     <Row>
-      <Col md={24} lg={12}>
+      <Col md={24} lg={8}>
         <Typography.Title level={4}>
           {t("parts_orders.labels.parts_orders")}
         </Typography.Title>
@@ -49,7 +60,7 @@ export default function JobLinesExpander({ jobline, jobid }) {
           )}
         </Timeline>
       </Col>
-      <Col md={24} lg={12}>
+      <Col md={24} lg={8}>
         <Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
         <Timeline>
           {data.billlines.length > 0 ? (
@@ -71,7 +82,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>
@@ -89,6 +100,37 @@ export default function JobLinesExpander({ jobline, jobid }) {
           )}
         </Timeline>
       </Col>
+      <Col md={24} lg={8}>
+        <Typography.Title level={4}>
+          {t("parts_dispatch.labels.parts_dispatch")}
+        </Typography.Title>
+        <Timeline>
+          {data.parts_dispatch_lines.length > 0 ? (
+            data.parts_dispatch_lines.map((line) => (
+              <Timeline.Item key={line.id}>
+                <Space split={<Divider type="vertical" />} wrap>
+                  <Link to={`/manage/jobs/${jobid}?partsorderid=${line.id}`}>
+                    {line.parts_dispatch.number}
+                  </Link>
+                  {
+                    bodyshop.employees.find(
+                      (e) => e.id === line.parts_dispatch.employeeid
+                    )?.first_name
+                  }
+                  <Space>
+                    {t("parts_dispatch_lines.fields.accepted_at")}
+                    <DateFormatter>{line.accepted_at}</DateFormatter>
+                  </Space>
+                </Space>
+              </Timeline.Item>
+            ))
+          ) : (
+            <Timeline.Item>
+              {t("parts_orders.labels.notyetordered")}
+            </Timeline.Item>
+          )}
+        </Timeline>
+      </Col>
     </Row>
   );
 }
diff --git a/client/src/components/job-line-location-popup/job-line-location-popup.component.jsx b/client/src/components/job-line-location-popup/job-line-location-popup.component.jsx
index 16bb32fed..312506511 100644
--- a/client/src/components/job-line-location-popup/job-line-location-popup.component.jsx
+++ b/client/src/components/job-line-location-popup/job-line-location-popup.component.jsx
@@ -1,4 +1,4 @@
-import { notification, Select } from "antd";
+import { notification, Select, Space } from "antd";
 import React, { useEffect, useState } from "react";
 import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
@@ -75,7 +75,10 @@ export function JobLineLocationPopup({ bodyshop, jobline, disabled }) {
       style={{ width: "100%", minHeight: "2rem", cursor: "pointer" }}
       onClick={() => !disabled && setEditing(true)}
     >
-      {jobline.location}
+      <Space wrap>
+        {jobline.location}
+        {jobline.parts_dispatch_lines.length > 0 && "-Disp"}
+      </Space>
     </div>
   );
 }
diff --git a/client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx b/client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx
index 131fd7802..26130bf50 100644
--- a/client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx
+++ b/client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx
@@ -1,10 +1,35 @@
-import { Button, Card, Col, Row, Table } from "antd";
+import { useMutation } from "@apollo/client";
+import { Button, Card, Col, Row, Table, notification } from "antd";
+import moment from "moment-business-days";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { UPDATE_PARTS_DISPATCH_LINE } from "../../graphql/parts-dispatch.queries";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 
 export default function PartsDispatchExpander({ dispatch, job }) {
   const { t } = useTranslation();
+  const [updateDispatchLine] = useMutation(UPDATE_PARTS_DISPATCH_LINE);
+
+  const handleAccept = async ({ partsDispatchLineId }) => {
+    const accepted_at = moment();
+    const result = await updateDispatchLine({
+      variables: { id: partsDispatchLineId, line: { accepted_at } },
+      optimisticResponse: {
+        update_parts_dispatch_lines_by_pk: {
+          accepted_at,
+          id: partsDispatchLineId,
+        },
+      },
+    });
+    if (result.errors) {
+      notification.open({
+        type: "error",
+        message: t("parts_dispatch.errors.accepting", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+  };
 
   const columns = [
     {
@@ -32,7 +57,11 @@ export default function PartsDispatchExpander({ dispatch, job }) {
         record.accepted_at ? (
           <DateTimeFormatter>{record.accepted_at}</DateTimeFormatter>
         ) : (
-          <Button>{t("parts_dispatch.actions.accept")}</Button>
+          <Button
+            onClick={() => handleAccept({ partsDispatchLineId: record.id })}
+          >
+            {t("parts_dispatch.actions.accept")}
+          </Button>
         ),
     },
   ];
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index 7bb943162..00ec87252 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -2149,6 +2149,18 @@ export const GET_JOB_LINE_ORDERS = gql`
         }
       }
     }
+    parts_dispatch_lines(where: { joblineid: { _eq: $joblineid } }) {
+      id
+      accepted_at
+      quantity
+      parts_dispatch {
+        id
+        employeeid
+        dispatched_at
+        dispatched_by
+        number
+      }
+    }
     parts_order_lines(where: { job_line_id: { _eq: $joblineid } }) {
       id
       act_price
diff --git a/client/src/graphql/parts-dispatch.queries.js b/client/src/graphql/parts-dispatch.queries.js
index d4f5e940b..eafb1d7c0 100644
--- a/client/src/graphql/parts-dispatch.queries.js
+++ b/client/src/graphql/parts-dispatch.queries.js
@@ -54,6 +54,7 @@ export const GET_UNACCEPTED_PARTS_DISPATCH = gql`
       dispatched_by
       parts_dispatch_lines {
         id
+        accepted_at
         jobline {
           line_desc
           id
@@ -64,3 +65,15 @@ export const GET_UNACCEPTED_PARTS_DISPATCH = gql`
     }
   }
 `;
+
+export const UPDATE_PARTS_DISPATCH_LINE = gql`
+  mutation UPDATE_PARTS_DISPATCH_LINE(
+    $id: uuid!
+    $line: parts_dispatch_lines_set_input!
+  ) {
+    update_parts_dispatch_lines_by_pk(pk_columns: { id: $id }, _set: $line) {
+      accepted_at
+      id
+    }
+  }
+`;
diff --git a/client/src/pages/tech-dispatched-parts/tech-dispatched-parts.page.jsx b/client/src/pages/tech-dispatched-parts/tech-dispatched-parts.page.jsx
index d87b5a9ad..9508b8bad 100644
--- a/client/src/pages/tech-dispatched-parts/tech-dispatched-parts.page.jsx
+++ b/client/src/pages/tech-dispatched-parts/tech-dispatched-parts.page.jsx
@@ -4,9 +4,9 @@ import {
   SyncOutlined,
 } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
-import { Button, Card, Input, Space, Table } from "antd";
+import { Button, Card, Space, Table } from "antd";
 import queryString from "query-string";
-import React, { useState } from "react";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useHistory, useLocation } from "react-router-dom";
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 55ac3b850..1649a7387 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2141,6 +2141,7 @@
 				"accept": "Accept"
 			},
 			"errors": {
+				"accepting": "Error accepting parts dispatch. {{error}}",
 				"creating": "Error dispatching parts. {{error}}"
 			},
 			"fields": {
@@ -2433,7 +2434,7 @@
 				"jobs": {
 					"individual_job_note": "Job Note RO: {{ro_number}}",
 					"parts_order": "Parts Order PO: {{ro_number}} - {{name}}",
-					"parts_return_slip":"Parts Return PO: {{ro_number}} - {{name}}",
+					"parts_return_slip": "Parts Return PO: {{ro_number}} - {{name}}",
 					"sublet_order": "Sublet Order PO: {{ro_number}} - {{name}}"
 				}
 			},
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 03b36ef94..b42056762 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2141,6 +2141,7 @@
 				"accept": ""
 			},
 			"errors": {
+				"accepting": "",
 				"creating": ""
 			},
 			"fields": {
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 0d16c4e16..a7a45d1a4 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2141,6 +2141,7 @@
 				"accept": ""
 			},
 			"errors": {
+				"accepting": "",
 				"creating": ""
 			},
 			"fields": {