Merged in release/2023-12-15 (pull request #1110)

Release/2023 12 15

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

@@ -79,6 +79,18 @@ export function BillFormComponent({
       });
   };
 
+  const handleFederalTaxExemptSwitchToggle = (checked) => {
+    if (checked) {
+      const values = form.getFieldsValue("billlines");
+      if (values && values.billlines && values.billlines.length > 0) {
+        values.billlines.forEach((b) => {
+          b.applicable_taxes.federal = false;
+        });
+      }
+      form.setFieldsValue({ billlines: values.billlines });
+    }
+  };
+
   useEffect(() => {
     if (job) form.validateFields(["is_credit_memo"]);
   }, [job, form]);
@@ -387,7 +399,16 @@ export function BillFormComponent({
         >
           <CurrencyInput min={0} />
         </Form.Item>
-        <Form.Item shouldUpdate span={15}>
+        {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
+          <Form.Item
+            span={2}
+            label={t("bills.labels.federal_tax_exempt")}
+            name="federal_tax_exempt"
+          >
+            <Switch onChange={handleFederalTaxExemptSwitchToggle} />
+          </Form.Item>
+        ) : null}
+        <Form.Item shouldUpdate span={13}>
           {() => {
             const values = form.getFieldsValue([
               "billlines",
@@ -405,7 +426,7 @@ export function BillFormComponent({
               totals = CalculateBillTotal(values);
             if (!!totals)
               return (
-                <div>
+                <div align="right">
                   <Space wrap>
                     <Statistic
                       title={t("bills.labels.subtotal")}

client/src/components/bill-form/bill-form.lines.component.jsx

@@ -1,14 +1,15 @@
 import { DeleteFilled, DollarCircleFilled } from "@ant-design/icons";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import {
-  Button, Form,
+  Button,
+  Form,
   Input,
   InputNumber,
   Select,
   Space,
   Switch,
   Table,
-  Tooltip
+  Tooltip,
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -466,7 +467,8 @@ export function BillEnterModalLinesComponent({
           return {
             key: `${field.index}fedtax`,
             valuePropName: "checked",
-            initialValue: true,
+            initialValue:
+              form.getFieldValue("federal_tax_exempt") === true ? false : true,
             name: [field.name, "applicable_taxes", "federal"],
           };
         },

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

@@ -1,120 +1,105 @@
-import {BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, SyncOutlined,} from "@ant-design/icons";
+import {
-import {useQuery} from "@apollo/client";
+    SyncOutlined,
-import {Button, Card, Grid, Input, Space, Table, Tooltip, Typography} from "antd";
+    ExclamationCircleFilled,
+    PauseCircleOutlined,
+    BranchesOutlined,
+} from "@ant-design/icons";
+import { useQuery } from "@apollo/client";
+import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd";
 import queryString from "query-string";
-import React, {useEffect, useState} from "react";
+import React, { useState } from "react";
-import {useTranslation} from "react-i18next";
+import { useTranslation } from "react-i18next";
-import {connect} from "react-redux";
+import { connect } from "react-redux";
-import {Link, useHistory, useLocation} from "react-router-dom";
+import { Link, useHistory, useLocation } from "react-router-dom";
-import {createStructuredSelector} from "reselect";
+import { createStructuredSelector } from "reselect";
-import {QUERY_ALL_ACTIVE_JOBS_PAGINATED} from "../../graphql/jobs.queries";
+import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
-import {selectBodyshop} from "../../redux/user/user.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
-import {onlyUnique} from "../../utils/arrayHelper";
+import { onlyUnique } from "../../utils/arrayHelper";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { alphaSort } from "../../utils/sorters";
 import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import {flattenDeep} from "lodash";
-import { pageLimit } from '../../utils/config';
-import axios from "axios";
 
 const mapStateToProps = createStructuredSelector({
     bodyshop: selectBodyshop,
 });
 
-const mapDispatchToProps = () => ({
+export function JobsList({ bodyshop }) {
-});
+    const searchParams = queryString.parse(useLocation().search);
-
+    const { selected } = searchParams;
-export function JobsList({bodyshop,}) {
-    const search = queryString.parse(useLocation().search);
-    const [openSearchResults, setOpenSearchResults] = useState([]);
-    const [searchLoading, setSearchLoading] = useState(false);
-    const {page, selected, sortorder, sortcolumn} = search;
-
     const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
         .filter((screen) => !!screen[1])
         .slice(-1)[0];
-
+    const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
-    const {loading, error, data, refetch} = useQuery(QUERY_ALL_ACTIVE_JOBS_PAGINATED, {
         variables: {
-            offset: page ? (page - 1) * pageLimit : 0,
-            limit: pageLimit,
             statuses: bodyshop.md_ro_statuses.active_statuses || ["Open", "Open*"],
-            order: [
-                {
-                    [sortcolumn || "ro_number"]:
-                        sortorder && sortorder !== "false"
-                            ? (sortorder === "descend"
-                                ? "desc"
-                                : "asc")
-                            : "desc",
-                },
-            ],
         },
         fetchPolicy: "network-only",
         nextFetchPolicy: "network-only",
     });
 
-    const total = data?.jobs_aggregate?.aggregate?.count || 0;
-
     const [state, setState] = useState({
-        filteredInfo: {text: ""},
+        sortedInfo: {},
+        filteredInfo: { text: "" },
     });
 
-    const {t} = useTranslation();
+    const { t } = useTranslation();
     const history = useHistory();
+    const [searchText, setSearchText] = useState("");
 
-    const jobs = data?.jobs || [];
+    if (error) return <AlertComponent message={error.message} type="error" />;
+
+    const jobs = data
+        ? searchText === ""
+            ? data.jobs
+            : data.jobs.filter(
+                (j) =>
+                    (j.ro_number || "")
+                        .toString()
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase()) ||
+                    (j.ownr_co_nm || "")
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase()) ||
+                    (j.comments || "")
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase()) ||
+                    (j.ownr_fn || "")
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase()) ||
+                    (j.ownr_ln || "")
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase()) ||
+                    (j.clm_no || "").toLowerCase().includes(searchText.toLowerCase()) ||
+                    (j.plate_no || "")
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase()) ||
+                    (j.v_model_desc || "")
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase()) ||
+                    (j.est_ct_fn || "")
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase()) ||
+                    (j.est_ct_ln || "")
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase()) ||
+                    (j.v_make_desc || "")
+                        .toLowerCase()
+                        .includes(searchText.toLowerCase())
+            )
+        : [];
 
     const handleTableChange = (pagination, filters, sorter) => {
-        // TODO: Is this needed?
+        setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
-        setState({...state, filteredInfo: filters});
-
-        search.page = pagination.current;
-        search.sortcolumn = sorter.column && sorter.column.key;
-        search.sortorder = sorter.order;
-
-        if (filters.status) {
-            search.statusFilters = JSON.stringify(flattenDeep(filters.status));
-        } else {
-            delete search.statusFilters;
-        }
-
-        history.push({search: queryString.stringify(search)});
     };
 
-    useEffect(() => {
-        if (search.search && search.search.trim() !== "") {
-            searchJobs().catch(e => {
-                console.error('Something went wrong searching for jobs in the job-list component', e);
-            });
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
-
-    if (error) return <AlertComponent message={error.message} type="error"/>;
-
-    async function searchJobs(value) {
-        try {
-            setSearchLoading(true);
-            const searchData = await axios.post("/search", {
-                search: value || search.search,
-                index: "jobs",
-            });
-            setOpenSearchResults(searchData.data.hits.hits.map((s) => s._source));
-        } catch (error) {
-            console.log("Error while fetching search results", error);
-        } finally {
-            setSearchLoading(false);
-        }
-    }
-
     const handleOnRowClick = (record) => {
         if (record) {
             if (record.id) {
                 history.push({
                     search: queryString.stringify({
-                        ...search,
+                        ...searchParams,
                         selected: record.id,
                     }),
                 });
@@ -127,9 +112,11 @@ export function JobsList({bodyshop,}) {
             title: t("jobs.fields.ro_number"),
             dataIndex: "ro_number",
             key: "ro_number",
-            sorter: true,
+            sorter: (a, b) =>
+                parseInt((a.ro_number || "0").replace(/\D/g, "")) -
+                parseInt((b.ro_number || "0").replace(/\D/g, "")),
             sortOrder:
-                sortcolumn === "ro_number" && sortorder,
+                state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
 
             render: (text, record) => (
                 <Link
@@ -139,14 +126,14 @@ export function JobsList({bodyshop,}) {
                     <Space>
                         {record.ro_number || t("general.labels.na")}
                         {record.production_vars && record.production_vars.alert ? (
-                            <ExclamationCircleFilled className="production-alert"/>
+                            <ExclamationCircleFilled className="production-alert" />
                         ) : null}
                         {record.suspended && (
-                            <PauseCircleOutlined style={{color: "orangered"}}/>
+                            <PauseCircleOutlined style={{ color: "orangered" }} />
                         )}
                         {record.iouparent && (
                             <Tooltip title={t("jobs.labels.iou")}>
-                                <BranchesOutlined style={{color: "orangered"}}/>
+                                <BranchesOutlined style={{ color: "orangered" }} />
                             </Tooltip>
                         )}
                     </Space>
@@ -158,20 +145,22 @@ export function JobsList({bodyshop,}) {
             dataIndex: "owner",
             key: "owner",
             ellipsis: true,
+
             responsive: ["md"],
-            sorter: false,
+            sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
-            sortOrder: sortcolumn === "owner" && sortorder,
+            sortOrder:
+                state.sortedInfo.columnKey === "owner" && state.sortedInfo.order,
             render: (text, record) => {
                 return record.ownerid ? (
                     <Link
                         to={"/manage/owners/" + record.ownerid}
                         onClick={(e) => e.stopPropagation()}
                     >
-                        <OwnerNameDisplay ownerObject={record}/>
+                        <OwnerNameDisplay ownerObject={record} />
                     </Link>
                 ) : (
                     <span>
-            <OwnerNameDisplay ownerObject={record}/>
+            <OwnerNameDisplay ownerObject={record} />
           </span>
                 );
             },
@@ -183,7 +172,7 @@ export function JobsList({bodyshop,}) {
             ellipsis: true,
             responsive: ["md"],
             render: (text, record) => (
-                <ChatOpenButton phone={record.ownr_ph1} jobid={record.id}/>
+                <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
             ),
         },
         {
@@ -193,7 +182,7 @@ export function JobsList({bodyshop,}) {
             ellipsis: true,
             responsive: ["md"],
             render: (text, record) => (
-                <ChatOpenButton phone={record.ownr_ph2} jobid={record.id}/>
+                <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
             ),
         },
 
@@ -202,9 +191,10 @@ export function JobsList({bodyshop,}) {
             dataIndex: "status",
             key: "status",
             ellipsis: true,
-            sorter: true,
+
+            sorter: (a, b) => alphaSort(a.status, b.status),
             sortOrder:
-                sortcolumn === "status" && sortorder,
+                state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
             filters:
                 (jobs &&
                     jobs
@@ -219,6 +209,7 @@ export function JobsList({bodyshop,}) {
                 [],
             onFilter: (value, record) => value.includes(record.status),
         },
+
         {
             title: t("jobs.fields.vehicle"),
             dataIndex: "vehicle",
@@ -246,10 +237,11 @@ export function JobsList({bodyshop,}) {
             dataIndex: "plate_no",
             key: "plate_no",
             ellipsis: true,
+
             responsive: ["md"],
-            sorter: true,
+            sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
             sortOrder:
-                sortcolumn === "plate_no" && sortorder,
+                state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
         },
         {
             title: t("jobs.fields.clm_no"),
@@ -257,9 +249,9 @@ export function JobsList({bodyshop,}) {
             key: "clm_no",
             ellipsis: true,
             responsive: ["md"],
-            sorter: true,
+            sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
             sortOrder:
-                sortcolumn === "clm_no" && sortorder,
+                state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
             render: (text, record) =>
                 `${record.clm_no || ""}${
                     record.po_number ? ` (PO: ${record.po_number})` : ""
@@ -291,9 +283,10 @@ export function JobsList({bodyshop,}) {
             key: "clm_total",
             responsive: ["md"],
             ellipsis: true,
-            sorter: true,
+
+            sorter: (a, b) => a.clm_total - b.clm_total,
             sortOrder:
-                sortcolumn === "clm_total" && sortorder,
+                state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
             render: (text, record) => (
                 <CurrencyFormatter>{record.clm_total}</CurrencyFormatter>
             ),
@@ -356,57 +349,26 @@ export function JobsList({bodyshop,}) {
             title={t("titles.bc.jobs-active")}
             extra={
                 <Space wrap>
-                    {search.search && (
-                        <>
-                            <Typography.Title level={4}>
-                                {t("general.labels.searchresults", { search: search.search })}
-                            </Typography.Title>
-                            <Button
-                                onClick={() => {
-                                    delete search.search;
-                                    delete search.page;
-                                    history.push({ search: queryString.stringify(search) });
-                                }}
-                            >
-                                {t("general.actions.clear")}
-                            </Button>
-                        </>
-                    )}
                     <Button onClick={() => refetch()}>
                         <SyncOutlined />
                     </Button>
                     <Input.Search
-                        placeholder={search.search || t("general.labels.search")}
+                        placeholder={t("general.labels.search")}
-                        onSearch={(value) => {
+                        onChange={(e) => {
-                            search.search = value;
+                            setSearchText(e.target.value);
-                            history.push({ search: queryString.stringify(search) });
-                            searchJobs(value);
                         }}
-                        loading={loading || searchLoading}
+                        value={searchText}
                         enterButton
                     />
                 </Space>
             }
         >
             <Table
-                loading={loading || searchLoading }
+                loading={loading}
-                pagination={
+                pagination={{ defaultPageSize: 50 }}
-                    search?.search
-                        ? {
-                            pageSize: pageLimit,
-                            showSizeChanger: false,
-
-                        }
-                        : {
-                            pageSize: pageLimit,
-                            current: parseInt(page || 1),
-                            total: total,
-                            showSizeChanger: false,
-                        }
-                }
                 columns={columns}
                 rowKey="id"
-                dataSource={search?.search ? openSearchResults : jobs}
+                dataSource={jobs}
                 scroll={{
                     x: selectedBreakpoint ? scrollMapper[selectedBreakpoint[0]] : "100%",
                 }}
@@ -418,9 +380,9 @@ export function JobsList({bodyshop,}) {
                     type: "radio",
                 }}
                 onChange={handleTableChange}
-                onRow={(record) => {
+                onRow={(record, rowIndex) => {
                     return {
-                        onClick: () => {
+                        onClick: (event) => {
                             handleOnRowClick(record);
                         },
                     };
@@ -430,4 +392,4 @@ export function JobsList({bodyshop,}) {
     );
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(JobsList);
+export default connect(mapStateToProps, null)(JobsList);

client/src/components/rbac-wrapper/rbac-defaults.js

@@ -55,10 +55,11 @@ const ret = {
   "shiftclock:view": 2,
 
   "shop:config": 4,
-  "shop:rbac": 5,
-  "shop:vendors": 2,
   "shop:dashboard": 3,
+  "shop:rbac": 5,
+  "shop:reportcenter": 2,
   "shop:templates": 4,
+  "shop:vendors": 2,
 
   "temporarydocs:view": 2,
 

client/src/components/report-center-modal/report-center-modal.container.jsx

@@ -5,6 +5,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectReportCenter } from "../../redux/modals/modals.selectors";
+import RbacWrapperComponent from "../rbac-wrapper/rbac-wrapper.component";
 import ReportCenterModalComponent from "./report-center-modal.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -33,7 +34,9 @@ export function ReportCenterModalContainer({
       destroyOnClose
       width="80%"
     >
-      <ReportCenterModalComponent />
+      <RbacWrapperComponent action="shop:reportcenter">
+        <ReportCenterModalComponent />
+      </RbacWrapperComponent>
     </Modal>
   );
 }

client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.component.jsx

@@ -29,7 +29,7 @@ export default connect(
 
 export function ScoreboardTimeTicketsStats({ bodyshop }) {
   const { t } = useTranslation();
-  const startDate = moment().startOf("month")
+  const startDate = moment().startOf("month");
   const endDate = moment().endOf("month");
 
   const fixedPeriods = useMemo(() => {
@@ -84,6 +84,8 @@ export function ScoreboardTimeTicketsStats({ bodyshop }) {
       end: endDate.format("YYYY-MM-DD"),
       fixedStart: fixedPeriods.start.format("YYYY-MM-DD"),
       fixedEnd: fixedPeriods.end.format("YYYY-MM-DD"),
+      jobStart: startDate,
+      jobEnd: endDate,
     },
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
@@ -340,11 +342,21 @@ export function ScoreboardTimeTicketsStats({ bodyshop }) {
       larData.push({ ...r, ...lar });
     });
 
+    const jobData = {};
+    data.jobs.forEach((job) => {
+      job.tthrs = job.joblines.reduce((acc, val) => acc + val.mod_lb_hrs, 0);
+    });
+    jobData.tthrs = data.jobs
+      .reduce((acc, val) => acc + val.tthrs, 0)
+      .toFixed(1);
+    jobData.count = data.jobs.length.toFixed(0);
+
     return {
       fixed: ret,
       combinedData: combinedData,
       labData: labData,
       larData: larData,
+      jobData: jobData,
     };
   }, [fixedPeriods, data, bodyshop]);
 
@@ -356,7 +368,10 @@ export function ScoreboardTimeTicketsStats({ bodyshop }) {
         <ScoreboardTimeticketsTargetsTable />
       </Col>
       <Col span={24}>
-        <ScoreboardTicketsStats data={calculatedData.fixed} />
+        <ScoreboardTicketsStats
+          data={calculatedData.fixed}
+          jobData={calculatedData.jobData}
+        />
       </Col>
       <Col span={24}>
         <ScoreboardTimeTicketsChart

client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.stats.component.jsx

@@ -41,7 +41,7 @@ function useLocalStorage(key, initialValue) {
   return [storedValue, setStoredValue];
 }
 
-export function ScoreboardTicketsStats({ data, bodyshop }) {
+export function ScoreboardTicketsStats({ data, jobData, bodyshop }) {
   const { t } = useTranslation();
   const [isLarge, setIsLarge] = useLocalStorage("isLargeStatistic", false);
 
@@ -408,7 +408,7 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
             {/* Monthly Stats */}
             <Row gutter={[16, 16]}>
               {/* This Month */}
-              <Col span={8} align="center">
+              <Col span={7} align="center">
                 <Card size="small" title={t("scoreboard.labels.thismonth")}>
                   <Row gutter={[16, 16]}>
                     <Col span={24}>
@@ -482,7 +482,7 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
                 </Card>
               </Col>
               {/* Last Month */}
-              <Col span={8} align="center">
+              <Col span={7} align="center">
                 <Card size="small" title={t("scoreboard.labels.lastmonth")}>
                   <Row gutter={[16, 16]}>
                     <Col span={24}>
@@ -556,7 +556,7 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
                 </Card>
               </Col>
               {/* Efficiency Over Period */}
-              <Col span={8} align="center">
+              <Col span={7} align="center">
                 <Card
                   size="small"
                   title={t("scoreboard.labels.efficiencyoverperiod")}
@@ -604,6 +604,40 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
                   </Row>
                 </Card>
               </Col>
+              <Col span={3} align="center">
+                <Card
+                  size="small"
+                  title={t("scoreboard.labels.jobscompletednotinvoiced")}
+                >
+                  <Row gutter={[16, 16]}>
+                    <Col span={24}>
+                      <Statistic
+                        value={jobData.count}
+                        valueStyle={{
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                  </Row>
+                  <Row gutter={[16, 16]}>
+                    <Col span={24}>
+                      <Statistic
+                        title={
+                          <Typography.Text strong>
+                            {t("scoreboard.labels.totalhrs")}
+                          </Typography.Text>
+                        }
+                        value={jobData.tthrs}
+                        valueStyle={{
+                          fontSize: statisticSize,
+                          fontWeight: statisticWeight,
+                        }}
+                      />
+                    </Col>
+                  </Row>
+                </Card>
+              </Col>
             </Row>
           </Space>
           {/* Disclaimer */}

client/src/components/shop-info/shop-info.rbac.component.jsx

@@ -28,18 +28,6 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
   return (
     <RbacWrapper action="shop:rbac">
       <LayoutFormRow>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.accounting.payables")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "accounting:payables"]}
-        >
-          <InputNumber />
-        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.accounting.exportlog")}
           rules={[
@@ -52,6 +40,18 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.accounting.payables")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "accounting:payables"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.accounting.payments")}
           rules={[
@@ -77,26 +77,62 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
           <InputNumber />
         </Form.Item>
         <Form.Item
-          label={t("bodyshop.fields.rbac.csi.page")}
+          label={t("bodyshop.fields.rbac.bills.delete")}
           rules={[
             {
               required: true,
               //message: t("general.validation.required"),
             },
           ]}
-          name={["md_rbac", "csi:page"]}
+          name={["md_rbac", "bills:delete"]}
         >
           <InputNumber />
         </Form.Item>
         <Form.Item
-          label={t("bodyshop.fields.rbac.csi.export")}
+          label={t("bodyshop.fields.rbac.bills.enter")}
           rules={[
             {
               required: true,
               //message: t("general.validation.required"),
             },
           ]}
-          name={["md_rbac", "csi:export"]}
+          name={["md_rbac", "bills:enter"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.bills.list")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "bills:list"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.bills.reexport")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "bills:reexport"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.bills.view")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "bills:view"]}
         >
           <InputNumber />
         </Form.Item>
@@ -173,26 +209,38 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
           <InputNumber />
         </Form.Item>
         <Form.Item
-          label={t("bodyshop.fields.rbac.jobs.list-active")}
+          label={t("bodyshop.fields.rbac.csi.export")}
           rules={[
             {
               required: true,
               //message: t("general.validation.required"),
             },
           ]}
-          name={["md_rbac", "jobs:list-active"]}
+          name={["md_rbac", "csi:export"]}
         >
           <InputNumber />
         </Form.Item>
         <Form.Item
-          label={t("bodyshop.fields.rbac.jobs.list-ready")}
+          label={t("bodyshop.fields.rbac.csi.page")}
           rules={[
             {
               required: true,
               //message: t("general.validation.required"),
             },
           ]}
-          name={["md_rbac", "jobs:list-ready"]}
+          name={["md_rbac", "csi:page"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.employees.page")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "employees:page"]}
         >
           <InputNumber />
         </Form.Item>
@@ -208,30 +256,6 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.jobs.partsqueue")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "jobs:partsqueue"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.jobs.list-all")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "jobs:list-all"]}
-        >
-          <InputNumber />
-        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.jobs.available-list")}
           rules={[
@@ -245,26 +269,14 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
           <InputNumber />
         </Form.Item>
         <Form.Item
-          label={t("bodyshop.fields.rbac.jobs.create")}
+          label={t("bodyshop.fields.rbac.jobs.checklist-view")}
           rules={[
             {
               required: true,
               //message: t("general.validation.required"),
             },
           ]}
-          name={["md_rbac", "jobs:create"]}
+          name={["md_rbac", "jobs:checklist-view"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.jobs.intake")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "jobs:intake"]}
         >
           <InputNumber />
         </Form.Item>
@@ -280,6 +292,18 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.jobs.create")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "jobs:create"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.jobs.deliver")}
           rules={[
@@ -305,14 +329,62 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
           <InputNumber />
         </Form.Item>
         <Form.Item
-          label={t("bodyshop.fields.rbac.jobs.checklist-view")}
+          label={t("bodyshop.fields.rbac.jobs.intake")}
           rules={[
             {
               required: true,
               //message: t("general.validation.required"),
             },
           ]}
-          name={["md_rbac", "jobs:checklist-view"]}
+          name={["md_rbac", "jobs:intake"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.jobs.list-active")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "jobs:list-active"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.jobs.list-all")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "jobs:list-all"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.jobs.list-ready")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "jobs:list-ready"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.jobs.partsqueue")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "jobs:partsqueue"]}
         >
           <InputNumber />
         </Form.Item>
@@ -329,74 +401,14 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
           <InputNumber />
         </Form.Item>
         <Form.Item
-          label={t("bodyshop.fields.rbac.bills.enter")}
+          label={t("bodyshop.fields.rbac.owners.detail")}
           rules={[
             {
               required: true,
               //message: t("general.validation.required"),
             },
           ]}
-          name={["md_rbac", "bills:enter"]}
+          name={["md_rbac", "owners:detail"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.bills.delete")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "bills:delete"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.bills.reexport")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "bills:reexport"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.bills.view")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "bills:view"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.bills.list")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "bills:list"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.employees.page")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "employees:page"]}
         >
           <InputNumber />
         </Form.Item>
@@ -412,18 +424,6 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.owners.detail")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "owners:detail"]}
-        >
-          <InputNumber />
-        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.payments.enter")}
           rules={[
@@ -448,6 +448,30 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.phonebook.edit")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "phonebook:edit"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.phonebook.view")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "phonebook:view"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.production.board")}
           rules={[
@@ -509,38 +533,14 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
           <InputNumber />
         </Form.Item>
         <Form.Item
-          label={t("bodyshop.fields.rbac.timetickets.edit")}
+          label={t("bodyshop.fields.rbac.shop.config")}
           rules={[
             {
               required: true,
               //message: t("general.validation.required"),
             },
           ]}
-          name={["md_rbac", "timetickets:edit"]}
+          name={["md_rbac", "shop:config"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.timetickets.shiftedit")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "timetickets:shiftedit"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.shop.vendors")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "shop:vendors"]}
         >
           <InputNumber />
         </Form.Item>
@@ -556,18 +556,6 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.shop.config")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "shop:config"]}
-        >
-          <InputNumber />
-        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.shop.rbac")}
           rules={[
@@ -580,6 +568,18 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.shop.reportcenter")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "shop:reportcenter"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.shop.templates")}
           rules={[
@@ -592,6 +592,42 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.shop.vendors")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "shop:vendors"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.temporarydocs.view")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "temporarydocs:view"]}
+        >
+          <InputNumber />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.timetickets.edit")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "timetickets:edit"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.timetickets.enter")}
           rules={[
@@ -616,6 +652,18 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.timetickets.shiftedit")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "timetickets:shiftedit"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.users.editaccess")}
           rules={[
@@ -628,42 +676,6 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.temporarydocs.view")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "temporarydocs:view"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.phonebook.view")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "phonebook:view"]}
-        >
-          <InputNumber />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.rbac.phonebook.edit")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_rbac", "phonebook:edit"]}
-        >
-          <InputNumber />
-        </Form.Item>
         {Simple_Inventory.treatment === "on" && (
           <>
             <Form.Item

client/src/graphql/timetickets.queries.js

@@ -143,9 +143,14 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
     $end: date!
     $fixedStart: date!
     $fixedEnd: date!
+    $jobStart: timestamptz!
+    $jobEnd: timestamptz!
   ) {
     timetickets(
-      where: { date: { _gte: $start, _lte: $end }, cost_center: {_neq: "timetickets.labels.shift"} }
+      where: {
+        date: { _gte: $start, _lte: $end }
+        cost_center: { _neq: "timetickets.labels.shift" }
+      }
       order_by: { date: desc_nulls_first }
     ) {
       actualhrs
@@ -176,7 +181,10 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
       }
     }
     fixedperiod: timetickets(
-      where: { date: { _gte: $fixedStart, _lte: $fixedEnd }, cost_center: {_neq: "timetickets.labels.shift"} }
+      where: {
+        date: { _gte: $fixedStart, _lte: $fixedEnd }
+        cost_center: { _neq: "timetickets.labels.shift" }
+      }
       order_by: { date: desc_nulls_first }
     ) {
       actualhrs
@@ -205,6 +213,25 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
         last_name
       }
     }
+    jobs(
+      where: {
+        date_invoiced: { _is_null: true }
+        ro_number: { _is_null: false }
+        voided: { _eq: false }
+        _or: [
+          { actual_completion: { _gte: $jobStart, _lte: $jobEnd } }
+          { actual_delivery: { _gte: $jobStart, _lte: $jobEnd } }
+        ]
+      }
+    ) {
+      id
+      joblines(order_by: { line_no: asc }, where: { removed: { _eq: false } }) {
+        convertedtolbr
+        convertedtolbr_data
+        mod_lb_hrs
+        mod_lbr_ty
+      }
+    }
   }
 `;
 

client/src/translations/en_us/common.json

@@ -203,6 +203,7 @@
 				"entered_total": "Total of Entered Lines",
 				"enteringcreditmemo": "You are entering a credit memo. Please ensure you are also entering positive values.",
 				"federal_tax": "Federal Tax",
+				"federal_tax_exempt": "Federal Tax Exempt?",
 				"generatepartslabel": "Generate Parts Labels after Saving?",
 				"iouexists": "An IOU exists that is associated to this RO.",
 				"local_tax": "Local Tax",
@@ -447,6 +448,7 @@
 						"config": "Shop -> Config",
 						"dashboard": "Shop -> Dashboard",
 						"rbac": "Shop -> RBAC",
+						"reportcenter": "Shop -> Report Center",
 						"templates": "Shop -> Templates",
 						"vendors": "Shop -> Vendors"
 					},
@@ -2695,6 +2697,7 @@
 				"efficiencyoverperiod": "Efficiency over Selected Dates",
 				"entries": "Scoreboard Entries",
 				"jobs": "Jobs",
+				"jobscompletednotinvoiced": "Completed Not Invoiced",
 				"lastmonth": "Last Month",
 				"lastweek": "Last Week",
 				"monthlytarget": "Monthly",
@@ -2709,6 +2712,7 @@
 				"timetickets": "Time Tickets",
 				"timeticketsemployee": "Time Tickets by Employee",
 				"todateactual": "Actual (MTD)",
+				"totalhrs": "Total Hours",
 				"totaloverperiod": "Total over Selected Dates",
 				"weeklyactual": "Actual (W)",
 				"weeklytarget": "Weekly",

client/src/translations/es/common.json

@@ -203,6 +203,7 @@
 				"entered_total": "",
 				"enteringcreditmemo": "",
 				"federal_tax": "",
+				"federal_tax_exempt": "",
 				"generatepartslabel": "",
 				"iouexists": "",
 				"local_tax": "",
@@ -447,6 +448,7 @@
 						"config": "",
 						"dashboard": "",
 						"rbac": "",
+						"reportcenter": "",
 						"templates": "",
 						"vendors": ""
 					},
@@ -2695,6 +2697,7 @@
 				"efficiencyoverperiod": "",
 				"entries": "",
 				"jobs": "",
+				"jobscompletednotinvoiced": "",
 				"lastmonth": "",
 				"lastweek": "",
 				"monthlytarget": "",
@@ -2709,6 +2712,7 @@
 				"timetickets": "",
 				"timeticketsemployee": "",
 				"todateactual": "",
+				"totalhrs": "",
 				"totaloverperiod": "",
 				"weeklyactual": "",
 				"weeklytarget": "",

client/src/translations/fr/common.json

@@ -203,6 +203,7 @@
 				"entered_total": "",
 				"enteringcreditmemo": "",
 				"federal_tax": "",
+				"federal_tax_exempt": "",
 				"generatepartslabel": "",
 				"iouexists": "",
 				"local_tax": "",
@@ -447,6 +448,7 @@
 						"config": "",
 						"dashboard": "",
 						"rbac": "",
+						"reportcenter": "",
 						"templates": "",
 						"vendors": ""
 					},
@@ -2695,6 +2697,7 @@
 				"efficiencyoverperiod": "",
 				"entries": "",
 				"jobs": "",
+				"jobscompletednotinvoiced": "",
 				"lastmonth": "",
 				"lastweek": "",
 				"monthlytarget": "",
@@ -2709,6 +2712,7 @@
 				"timetickets": "",
 				"timeticketsemployee": "",
 				"todateactual": "",
+				"totalhrs": "",
 				"totaloverperiod": "",
 				"weeklyactual": "",
 				"weeklytarget": "",

server/firebase/firebase-handler.js

@@ -50,7 +50,7 @@ exports.createUser = async (req, res) => {
       `,
       {
         user: {
-          email,
+          email: email.toLowerCase(),
           authid: userRecord.uid,
           associations: {
             data: [{ shopid, authlevel, active: true }],