Add create user.

Updated task scheduler.

Approved-by: Patrick Fic

bodyshop_translations.babel

@@ -25204,6 +25204,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>cost_sublet</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>costs</name>
                                         <definition_loaded>false</definition_loaded>
@@ -27119,6 +27140,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>sale_sublet</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>sales</name>
                                         <definition_loaded>false</definition_loaded>
@@ -35691,6 +35733,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>exported_payroll</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                 </children>
                             </folder_node>
                             <folder_node>

client/src/components/bill-detail-edit/bill-detail-edit.container.jsx

@@ -108,7 +108,7 @@ export function BillDetailEditcontainer({
     );
 
     billlines.forEach((billline) => {
-      const { deductedfromlbr, ...il } = billline;
+      const { deductedfromlbr, jobline, ...il } = billline;
       delete il.__typename;
 
       if (il.id) {

client/src/components/courtesy-car-form/courtesy-car-form.component.jsx

@@ -9,7 +9,7 @@ import { DateFormatter } from "../../utils/DateFormatter";
 import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel-select.component";
 import CourtesyCarStatus from "../courtesy-car-status-select/courtesy-car-status-select.component";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
-import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
+//import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
@@ -32,7 +32,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
         }
       />
 
-      <FormFieldsChanged form={form} />
+      {/* <FormFieldsChanged form={form} /> */}
       <LayoutFormRow header={t("courtesycars.labels.vehicle")}>
         <Form.Item
           label={t("courtesycars.fields.make")}

client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx

@@ -97,7 +97,9 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       render: (text, record) =>
         record.cccontracts.length === 1 ? (
           <Link to={`/manage/jobs/${record.cccontracts[0].job.id}`}>
-            {record.cccontracts[0].job.ro_number}
+            {`${record.cccontracts[0].job.ro_number} - ${
+              record.cccontracts[0].job.ownr_fn || ""
+            } ${record.cccontracts[0].job.ownr_ln || ""} ${record.cccontracts[0].job.ownr_co_nm || ""}`}
           </Link>
         ) : null,
     },

client/src/components/form-date-picker/form-date-picker.component.jsx

@@ -23,20 +23,21 @@ export function FormDatePicker({
   onChange,
   onBlur,
   onlyFuture,
+  isDateOnly = true,
   ...restProps
 }) {
   const ref = useRef();
 
   const handleChange = (newDate) => {
     if (value !== newDate && onChange) {
-      onChange(newDate);
+      onChange(isDateOnly ? newDate && newDate.format("YYYY-MM-DD") : newDate);
     }
   };
 
   const handleKeyDown = (e) => {
     if (e.key.toLowerCase() === "t") {
       if (onChange) {
-        onChange(moment());
+        onChange(isDateOnly ? moment().format("YYYY-MM-DD") : moment());
         // if (ref.current && ref.current.blur) ref.current.blur();
       }
     } else if (e.key.toLowerCase() === "enter") {
@@ -64,7 +65,8 @@ export function FormDatePicker({
       });
     }
 
-    if (_a.isValid() && onChange) onChange(_a);
+    if (_a.isValid() && onChange)
+      onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
   };
 
   return (

client/src/components/form-date-time-picker/form-date-time-picker.component.jsx

@@ -26,19 +26,20 @@ const DateTimePicker = (
         value={value}
         onBlur={onBlur}
         onChange={onChange}
+        isDateOnly={false}
       />
 
       <TimePicker
-        {...restProps}
-        value={value ? moment(value) : null}
-        {...(onlyFuture && {
-          disabledDate: (d) => moment().isAfter(d),
-        })}
-        onChange={onChange}
-        showSecond={false}
-        minuteStep={15}
-        onBlur={onBlur}
-        format="hh:mm a"
+      value={value ? moment(value) : null}
+      {...(onlyFuture && {
+        disabledDate: (d) => moment().isAfter(d),
+      })}
+      onChange={onChange}
+      showSecond={false}
+      minuteStep={15}
+      onBlur={onBlur}
+      format="hh:mm a"
+      {...restProps}
       />
     </div>
   );

client/src/components/job-costing-statistics/job-costing-statistics.component.jsx

@@ -16,6 +16,10 @@ export default function JobCostingStatistics({ summaryData }) {
           value={Dinero(summaryData.totalPartsSales).toFormat()}
           title={t("jobs.labels.sale_parts")}
         />
+        <Statistic
+          value={Dinero(summaryData.totalSubletSales).toFormat()}
+          title={t("jobs.labels.sale_sublet")}
+        />
         <Statistic
           value={Dinero(summaryData.totalAdditionalSales).toFormat()}
           title={t("jobs.labels.sale_additional")}
@@ -32,6 +36,10 @@ export default function JobCostingStatistics({ summaryData }) {
           value={Dinero(summaryData.totalPartsCost).toFormat()}
           title={t("jobs.labels.cost_parts")}
         />
+        <Statistic
+          value={Dinero(summaryData.totalSubletCost).toFormat()}
+          title={t("jobs.labels.cost_sublet")}
+        />
         <Statistic
           value={Dinero(summaryData.totalAdditionalCost).toFormat()}
           title={t("jobs.labels.cost_Additional")}

client/src/components/job-employee-assignments/job-employee-assignments.component.jsx

@@ -55,15 +55,17 @@ export function JobEmployeeAssignments({
             0
           }
         >
-          {bodyshop.employees.map((emp) => (
-            <Select.Option
-              value={emp.id}
-              key={emp.id}
-              name={`${emp.first_name} ${emp.last_name}`}
-            >
-              {`${emp.first_name} ${emp.last_name}`}
-            </Select.Option>
-          ))}
+          {bodyshop.employees
+            .filter((emp) => emp.active)
+            .map((emp) => (
+              <Select.Option
+                value={emp.id}
+                key={emp.id}
+                name={`${emp.first_name} ${emp.last_name}`}
+              >
+                {`${emp.first_name} ${emp.last_name}`}
+              </Select.Option>
+            ))}
         </Select>
       </Col>
       <Col span={24}>

client/src/components/job-lines-bill-reference/job-lines-bill-reference.component.jsx

@@ -10,7 +10,7 @@ export default function JobLinesBillRefernece({ jobline }) {
       {subletRequired && <WarningFilled />}
       {`${(billLine.actual_price * billLine.quantity).toFixed(2)} (${
         billLine.bill.vendor.name
-      })`}
+      } #${billLine.bill.invoice_number})`}
     </div>
   );
 }

client/src/components/job-totals-table/job-totals.table.other.component.jsx

@@ -33,10 +33,10 @@ export default function JobTotalsTableOther({ job }) {
         key: t("jobs.fields.storage_payable"),
         total: job.job_totals.additional.storage,
       },
-      {
-        key: t("jobs.fields.ca_bc_pvrt"),
-        total: job.job_totals.additional.pvrt,
-      },
+      // {
+      //   key: t("jobs.fields.ca_bc_pvrt"),
+      //   total: job.job_totals.additional.pvrt,
+      // },
     ];
   }, [job.job_totals, t]);
 

client/src/components/job-totals-table/job-totals.table.totals.component.jsx

@@ -3,7 +3,22 @@ import Dinero from "dinero.js";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 
-export default function JobTotalsTableTotals({ job }) {
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobTotalsTableTotals);
+
+export function JobTotalsTableTotals({ bodyshop, job }) {
   const { t } = useTranslation();
 
   const data = useMemo(() => {
@@ -21,6 +36,14 @@ export default function JobTotalsTableTotals({ job }) {
         key: t("jobs.labels.state_tax_amt"),
         total: job.job_totals.totals.state_tax,
       },
+      ...(bodyshop.region_config === "CA_BC"
+        ? [
+            {
+              key: t("jobs.fields.ca_bc_pvrt"),
+              total: job.job_totals.additional.pvrt,
+            },
+          ]
+        : []),
       {
         key: t("jobs.labels.federal_tax_amt"),
         total: job.job_totals.totals.federal_tax,
@@ -58,7 +81,7 @@ export default function JobTotalsTableTotals({ job }) {
         bold: true,
       },
     ];
-  }, [job.job_totals, t]);
+  }, [job.job_totals, t, bodyshop.region_config]);
 
   const columns = [
     {

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

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

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

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

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

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

client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx

@@ -22,7 +22,7 @@ export default function ProductionBoardCard(
 ) {
   const { t } = useTranslation();
 
-  let employee_body, employee_prep, employee_refinish; //employee_csr;
+  let employee_body, employee_prep, employee_refinish, employee_csr;
   if (card.employee_body) {
     employee_body = bodyshop.employees.find((e) => e.id === card.employee_body);
   }
@@ -34,6 +34,9 @@ export default function ProductionBoardCard(
       (e) => e.id === card.employee_refinish
     );
   }
+  if (card.employee_csr) {
+    employee_csr = bodyshop.employees.find((e) => e.id === card.employee_csr);
+  }
   // if (card.employee_csr) {
   //   employee_csr = bodyshop.employees.find((e) => e.id === card.employee_csr);
   // }
@@ -131,11 +134,11 @@ export default function ProductionBoardCard(
                     )} ${employee_refinish.last_name.charAt(0)}`
                   : ""
               } ${card.larhrs.aggregate.sum.mod_lb_hrs || "?"}h`}</Col>
-              {/* <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`C: ${
+              <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`C: ${
                 employee_csr
                   ? `${employee_csr.first_name} ${employee_csr.last_name}`
                   : ""
-              }`}</Col> */}
+              }`}</Col>
             </Row>
           </Col>
         )}

client/src/components/production-board-kanban/production-board-kanban.utils.js

@@ -66,6 +66,7 @@ export const createBoardData = (AllStatuses, Jobs, filter) => {
               include ||
               j.employee_body === employeeId ||
               j.employee_prep === employeeId ||
+              j.employee_csr === employeeId ||
               j.employee_refinish === employeeId;
           }
 
@@ -76,9 +77,8 @@ export const createBoardData = (AllStatuses, Jobs, filter) => {
 
   Object.keys(DataGroupedByStatus).map((statusGroupKey) => {
     try {
-      boardLanes.columns.find(
-        (l) => l.id === statusGroupKey
-      ).cards = sortByParentId(DataGroupedByStatus[statusGroupKey]);
+      boardLanes.columns.find((l) => l.id === statusGroupKey).cards =
+        sortByParentId(DataGroupedByStatus[statusGroupKey]);
     } catch (error) {
       console.log("Error while creating board card", error);
     }

client/src/components/production-list-columns/production-list-columns.data.js

@@ -96,7 +96,7 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
       sortOrder:
         state.sortedInfo.columnKey === "actual_in" && state.sortedInfo.order,
       render: (text, record) => (
-        <ProductionListDate record={record} field="actual_in" />
+        <ProductionListDate record={record} field="actual_in" time/>
       ),
     },
     {
@@ -114,6 +114,7 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
           record={record}
           field="scheduled_completion"
           pastIndicator
+          time
         />
       ),
     },
@@ -165,6 +166,7 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => {
           record={record}
           field="scheduled_delivery"
           pastIndicator
+          time
         />
       ),
     },

client/src/components/production-list-columns/production-list-columns.date.component.jsx

@@ -20,9 +20,9 @@ export default function ProductionListDate({
 
   const handleChange = (date) => {
     logImEXEvent("product_toggle_date", { field });
-    if (date.isSame(record[field] && moment(record[field]))) {
-      return;
-    }
+    // if (date.isSame(record[field] && moment(record[field]))) {
+    //   return;
+    // }
 
     //e.stopPropagation();
     updateAlert({
@@ -67,12 +67,14 @@ export default function ProductionListDate({
               value={(record[field] && moment(record[field])) || null}
               onChange={handleChange}
               format="MM/DD/YYYY"
+              isDateOnly={!time}
             />
             {time && (
               <TimePicker
                 onClick={(e) => e.stopPropagation()}
                 value={(record[field] && moment(record[field])) || null}
                 onChange={handleChange}
+                minuteStep={15}
                 format="hh:mm a"
               />
             )}

client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx

@@ -116,15 +116,17 @@ export function ProductionListEmpAssignment({
             0
           }
         >
-          {bodyshop.employees.map((emp) => (
-            <Select.Option
-              value={emp.id}
-              key={emp.id}
-              name={`${emp.first_name} ${emp.last_name}`}
-            >
-              {`${emp.first_name} ${emp.last_name}`}
-            </Select.Option>
-          ))}
+          {bodyshop.employees
+            .filter((emp) => emp.active)
+            .map((emp) => (
+              <Select.Option
+                value={emp.id}
+                key={emp.id}
+                name={`${emp.first_name} ${emp.last_name}`}
+              >
+                {`${emp.first_name} ${emp.last_name}`}
+              </Select.Option>
+            ))}
         </Select>
       </Col>
       <Col span={24}>

client/src/components/production-list-detail/production-list-detail.component.jsx

@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client";
-import { Descriptions, Drawer, Space } from "antd";
+import { Descriptions, Drawer, Space, PageHeader, Button } from "antd";
 import queryString from "query-string";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -16,8 +16,25 @@ import JobEmployeeAssignments from "../job-employee-assignments/job-employee-ass
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import ProductionRemoveButton from "../production-remove-button/production-remove-button.component";
 import JobAtChange from "../job-at-change/job-at-change.component";
+import { PrinterFilled } from "@ant-design/icons";
 
-export default function ProductionListDetail({ jobs }) {
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { setModalContext } from "../../redux/modals/modals.actions";
+
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+});
+const mapDispatchToProps = (dispatch) => ({
+  setPrintCenterContext: (context) =>
+    dispatch(setModalContext({ context: context, modal: "printCenter" })),
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ProductionListDetail);
+
+export function ProductionListDetail({ jobs, setPrintCenterContext }) {
   const search = queryString.parse(useLocation().search);
   const history = useHistory();
   const { selected } = search;
@@ -39,11 +56,29 @@ export default function ProductionListDetail({ jobs }) {
   return (
     <Drawer
       title={
-        <Space>
-          <span>{t("production.labels.jobdetail")}</span>
-          <span>{theJob.ro_number}</span>
-          <ProductionRemoveButton jobId={theJob.id} />
-        </Space>
+        <PageHeader
+          title={theJob.ro_number}
+          extra={
+            <Space>
+              <ProductionRemoveButton jobId={theJob.id} />{" "}
+              <Button
+                onClick={() => {
+                  setPrintCenterContext({
+                    actions: { refetch: refetch },
+                    context: {
+                      id: theJob.id,
+                      job: theJob,
+                      type: "job",
+                    },
+                  });
+                }}
+              >
+                <PrinterFilled />
+                {t("jobs.actions.printCenter")}
+              </Button>
+            </Space>
+          }
+        />
       }
       placement="right"
       width={"33%"}

client/src/components/scoreboard-targets-table/scoreboard-targets-table.component.jsx

@@ -101,7 +101,7 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
             <Col {...statSpans}>
               <Statistic
                 title={t("scoreboard.labels.dailyactual")}
-                value={values.todayBody}
+                value={values.todayBody.toFixed(1)}
               />
             </Col>
             <Col {...statSpans}>
@@ -116,7 +116,7 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
             <Col {...statSpans}>
               <Statistic
                 title={t("scoreboard.labels.weeklyactual")}
-                value={values.weeklyBody}
+                value={values.weeklyBody.toFixed(1)}
               />
             </Col>
             <Col {...statSpans}>
@@ -140,7 +140,7 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
             <Col {...statSpans}>
               <Statistic
                 title={t("scoreboard.labels.todateactual")}
-                value={values.toDateBody}
+                value={values.toDateBody.toFixed(1)}
               />
             </Col>
           </Row>
@@ -152,7 +152,7 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
               />
             </Col>
             <Col {...statSpans}>
-              <Statistic value={values.todayPaint} />
+              <Statistic value={values.todayPaint.toFixed(1)} />
             </Col>
             <Col {...statSpans}>
               <Statistic
@@ -163,7 +163,7 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
               />
             </Col>
             <Col {...statSpans}>
-              <Statistic value={values.weeklyPaint} />
+              <Statistic value={values.weeklyPaint.toFixed(1)} />
             </Col>
             <Col {...statSpans}>
               <Statistic
@@ -182,7 +182,7 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
               />
             </Col>
             <Col {...statSpans}>
-              <Statistic value={values.toDatePaint} />
+              <Statistic value={values.toDatePaint.toFixed(1)} />
             </Col>
           </Row>
         </Col>

client/src/components/time-ticket-list/time-ticket-list.component.jsx

@@ -76,6 +76,21 @@ export function TimeTicketList({
         state.sortedInfo.columnKey === "employee" && state.sortedInfo.order,
       render: (text, record) =>
         `${record.employee.first_name} ${record.employee.last_name}`,
+      filters:
+        timetickets
+          .map((l) => l.employeeid)
+          .filter(onlyUnique)
+          .map((s) => {
+            return {
+              text: (() => {
+                const emp = bodyshop.employees.find((e) => e.id === s);
+
+                return `${emp.first_name} ${emp.last_name}`;
+              })(), //
+              value: [s],
+            };
+          }) || [],
+      onFilter: (value, record) => value.includes(record.employeeid),
     },
     {
       title: t("timetickets.fields.cost_center"),

client/src/components/time-ticket-modal/time-ticket-modal.component.jsx

@@ -159,8 +159,10 @@ export function TimeTicketModalComponent({
           name="flat_rate"
           label={t("timetickets.fields.flat_rate")}
           valuePropName="checked"
+          noStyle
+          style={{ display: "none" }}
         >
-          <Switch />
+          <Switch style={{ display: "none" }} />
         </Form.Item>
       </LayoutFormRow>
 
@@ -212,6 +214,7 @@ export function TimeTicketModalComponent({
           <>
             <Form.Item label={t("timetickets.fields.clockon")} name="clockon">
               <FormDateTimePicker
+                minuteStep={5}
                 disabled={
                   !HasRbacAccess({
                     bodyshop,
@@ -245,6 +248,7 @@ export function TimeTicketModalComponent({
               ]}
             >
               <FormDateTimePicker
+                minuteStep={5}
                 disabled={
                   !HasRbacAccess({
                     bodyshop,

client/src/components/time-tickets-payroll-table/time-tickets-payroll-table.component.jsx

@@ -0,0 +1,41 @@
+import { Button } from "antd";
+import queryString from "query-string";
+import React, { useState } from "react";
+import { useLocation } from "react-router-dom";
+import { GenerateDocument } from "../../utils/RenderTemplate";
+import { TemplateList } from "../../utils/TemplateConstants";
+import { useTranslation } from "react-i18next";
+import moment from "moment";
+const PayrollTemplate = TemplateList("special").exported_payroll;
+export default function TimeTicketsPayrollTable() {
+  const searchParams = queryString.parse(useLocation().search);
+  const { start, end } = searchParams;
+  const { t } = useTranslation();
+  const [loading, setLoading] = useState(false);
+
+  const handleClick = async () => {
+    setLoading(true);
+
+    await GenerateDocument(
+      {
+        name: PayrollTemplate.key,
+        variables: {
+          start: start
+            ? start
+            : moment().startOf("week").subtract(7, "days").format("YYYY-MM-DD"),
+          end: end ? end : moment().endOf("week").format("YYYY-MM-DD"),
+        },
+      },
+      {},
+      "x"
+    );
+
+    setLoading(false);
+  };
+
+  return (
+    <Button loading={loading} onClick={handleClick}>
+      {t("printcenter.payments.exported_payroll")}
+    </Button>
+  );
+}

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

@@ -1,12 +1,13 @@
 import { HeartOutlined } from "@ant-design/icons";
-import { Select, Tag } from "antd";
+import { Select, Space, Tag } from "antd";
 import React, { forwardRef, useEffect, useState } from "react";
+import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 const { Option } = Select;
 
 //To be used as a form element only.
 
 const VendorSearchSelect = (
-  { value, onChange, options, onSelect, disabled, preferredMake },
+  { value, onChange, options, onSelect, disabled, preferredMake, showPhone },
   ref
 ) => {
   const [option, setOption] = useState(value);
@@ -35,6 +36,7 @@ const VendorSearchSelect = (
       style={{
         width: "100%",
       }}
+      dropdownMatchSelectWidth={false}
       onChange={setOption}
       optionFilterProp="name"
       onSelect={onSelect}
@@ -50,10 +52,15 @@ const VendorSearchSelect = (
             >
               <div className="imex-flex-row">
                 <div style={{ flex: 1 }}>{o.name}</div>
-                <HeartOutlined />
-                {o.discount && o.discount !== 0 ? (
-                  <Tag color="green">{`${o.discount * 100}%`}</Tag>
-                ) : null}
+                <Space style={{ marginLeft: "1rem" }}>
+                  <HeartOutlined style={{ color: "red" }} />
+                  {o.phone && showPhone && (
+                    <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>
+                  )}
+                  {o.discount && o.discount !== 0 ? (
+                    <Tag color="green">{`${o.discount * 100}%`}</Tag>
+                  ) : null}
+                </Space>
               </div>
             </Option>
           ))
@@ -64,9 +71,14 @@ const VendorSearchSelect = (
               <div className="imex-flex-row" style={{ width: "100%" }}>
                 <div style={{ flex: 1 }}>{o.name}</div>
 
-                {o.discount && o.discount !== 0 ? (
-                  <Tag color="green">{`${o.discount * 100}%`}</Tag>
-                ) : null}
+                <Space style={{ marginLeft: "1rem" }}>
+                  {o.phone && showPhone && (
+                    <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>
+                  )}
+                  {o.discount && o.discount !== 0 ? (
+                    <Tag color="green">{`${o.discount * 100}%`}</Tag>
+                  ) : null}
+                </Space>
               </div>
             </Option>
           ))

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

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

client/src/graphql/courtesy-car.queries.js

@@ -89,6 +89,9 @@ export const QUERY_ALL_CC = gql`
         job {
           id
           ro_number
+          ownr_fn
+          ownr_ln
+          ownr_co_nm
         }
       }
     }

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

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

client/src/graphql/jobs.queries.js

@@ -696,6 +696,7 @@ export const GET_JOB_BY_PK = gql`
           joblineid
           bill {
             id
+            invoice_number
             vendor {
               id
               name

client/src/graphql/vendors.queries.js

@@ -87,6 +87,7 @@ export const QUERY_ALL_VENDORS_FOR_ORDER = gql`
       discount
       email
       active
+      phone
     }
     jobs(where: { id: { _eq: $jobId } }) {
       v_make_desc

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

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

client/src/pages/time-tickets/time-tickets.container.jsx

@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client";
-import { Col, Row } from "antd";
+import { Col, Row, Space } from "antd";
 import moment from "moment";
 import queryString from "query-string";
 import React, { useEffect } from "react";
@@ -11,6 +11,7 @@ import AlertComponent from "../../components/alert/alert.component";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import TimeTicketsDatesSelector from "../../components/ticket-tickets-dates-selector/time-tickets-dates-selector.component";
 import TimeTicketList from "../../components/time-ticket-list/time-ticket-list.component";
+import TimeTicketsPayrollTable from "../../components/time-tickets-payroll-table/time-tickets-payroll-table.component";
 import TimeTicketsSummaryEmployees from "../../components/time-tickets-summary-employees/time-tickets-summary-employees.component";
 import { QUERY_TIME_TICKETS_IN_RANGE } from "../../graphql/timetickets.queries";
 import {
@@ -68,7 +69,12 @@ export function TimeTicketsContainer({
           <TimeTicketList
             loading={loading}
             timetickets={data ? data.timetickets : []}
-            extra={<TimeTicketsDatesSelector />}
+            extra={
+              <Space wrap>
+                <TimeTicketsPayrollTable />
+                <TimeTicketsDatesSelector />
+              </Space>
+            }
           />
         </Col>
         <Col span={24}>

client/src/translations/en_us/common.json

@@ -21,7 +21,7 @@
 			"actions": {
 				"block": "Block Day",
 				"calculate": "Calculate SMART Dates",
-				"cancel": "Cancel",
+				"cancel": "Cancel Appointment",
 				"intake": "Intake",
 				"new": "New Appointment",
 				"preview": "Preview",
@@ -1490,6 +1490,7 @@
 				"cost_Additional": "Cost - Additional",
 				"cost_labor": "Cost - Labor",
 				"cost_parts": "Cost - Parts",
+				"cost_sublet": "Cost - Sublet",
 				"costs": "Costs",
 				"create": {
 					"jobinfo": "Job Info",
@@ -1589,7 +1590,8 @@
 				"rosaletotal": "RO  Parts Total",
 				"sale_additional": "Sales - Additional",
 				"sale_labor": "Sales - Labor",
-				"sale_parts": "Sales - Parts & Sublet",
+				"sale_parts": "Sales - Parts",
+				"sale_sublet": "Sales - Sublet",
 				"sales": "Sales",
 				"savebeforeconversion": "You have unsaved changes on the job.  Please save them before converting it. ",
 				"scheduledinchange": "The scheduled in is based off the latest appointment. To change this date,  please schedule or reschedule the job. ",
@@ -2117,7 +2119,8 @@
 				"title": "Print Center"
 			},
 			"payments": {
-				"ca_bc_etf_table": "ICBC ETF Table"
+				"ca_bc_etf_table": "ICBC ETF Table",
+				"exported_payroll": "Payroll Table"
 			},
 			"subjects": {
 				"jobs": {

client/src/translations/es/common.json

@@ -1490,6 +1490,7 @@
 				"cost_Additional": "",
 				"cost_labor": "",
 				"cost_parts": "",
+				"cost_sublet": "",
 				"costs": "",
 				"create": {
 					"jobinfo": "",
@@ -1590,6 +1591,7 @@
 				"sale_additional": "",
 				"sale_labor": "",
 				"sale_parts": "",
+				"sale_sublet": "",
 				"sales": "",
 				"savebeforeconversion": "",
 				"scheduledinchange": "",
@@ -2117,7 +2119,8 @@
 				"title": ""
 			},
 			"payments": {
-				"ca_bc_etf_table": ""
+				"ca_bc_etf_table": "",
+				"exported_payroll": ""
 			},
 			"subjects": {
 				"jobs": {

client/src/translations/fr/common.json

@@ -1490,6 +1490,7 @@
 				"cost_Additional": "",
 				"cost_labor": "",
 				"cost_parts": "",
+				"cost_sublet": "",
 				"costs": "",
 				"create": {
 					"jobinfo": "",
@@ -1590,6 +1591,7 @@
 				"sale_additional": "",
 				"sale_labor": "",
 				"sale_parts": "",
+				"sale_sublet": "",
 				"sales": "",
 				"savebeforeconversion": "",
 				"scheduledinchange": "",
@@ -2117,7 +2119,8 @@
 				"title": ""
 			},
 			"payments": {
-				"ca_bc_etf_table": ""
+				"ca_bc_etf_table": "",
+				"exported_payroll": ""
 			},
 			"subjects": {
 				"jobs": {

client/src/utils/RenderTemplate.js

@@ -17,7 +17,8 @@ const Templates = TemplateList();
 export default async function RenderTemplate(
   templateObject,
   bodyshop,
-  renderAsHtml = false
+  renderAsHtml = false,
+  renderAsExcel = false
 ) {
   //Query assets that match the template name. Must be in format <<templateName>>.query
   let { contextData, useShopSpecificTemplate } = await fetchContextData(
@@ -30,6 +31,7 @@ export default async function RenderTemplate(
         ? `/${bodyshop.imexshopid}/${templateObject.name}`
         : `/${templateObject.name}`,
       ...(renderAsHtml ? {} : { recipe: "chrome-pdf" }),
+      ...(renderAsExcel ? { recipe: "html-to-xlsx" } : {}),
     },
     data: {
       ...contextData,
@@ -37,7 +39,7 @@ export default async function RenderTemplate(
       ...templateObject.context,
       headerpath: `/${bodyshop.imexshopid}/header.html`,
       bodyshop: bodyshop,
-      offset: moment().utcOffset(),
+      offset: bodyshop.timezone, //moment().utcOffset(),
     },
   };
 
@@ -182,6 +184,9 @@ export const GenerateDocument = async (
         template,
       })
     );
+  } else if (sendType === "x") {
+    console.log("excel");
+    await RenderTemplate(template, bodyshop, false, true);
   } else {
     await RenderTemplate(template, bodyshop);
   }

client/src/utils/TemplateConstants.js

@@ -1635,6 +1635,13 @@ export const TemplateList = (type, context) => {
             key: "ca_bc_etf_table",
             disabled: false,
           },
+          exported_payroll: {
+            title: i18n.t("printcenter.payments.exported_payroll"),
+            description: "Est Detail",
+            subject: i18n.t("printcenter.payments.exported_payroll"),
+            key: "exported_payroll",
+            disabled: false,
+          },
           production_by_technician_one: {
             title: i18n.t(
               "reportcenter.templates.production_by_technician_one"

server.js

@@ -149,6 +149,7 @@ app.post(
   fb.unsubscribe
 );
 app.post("/adm/updateuser", fb.validateFirebaseIdToken, fb.updateUser);
+app.post("/adm/createuser", fb.validateFirebaseIdToken, fb.createUser);
 
 //Stripe Processing
 var stripe = require("./server/stripe/payment");
@@ -180,7 +181,6 @@ app.post("/data/arms", data.arms);
 var taskHandler = require("./server/tasks/tasks");
 app.post("/taskHandler", taskHandler.taskHandler);
 
-
 var ioevent = require("./server/ioevent/ioevent");
 app.post("/ioevent", ioevent.default);
 app.post("/newlog", (req, res) => {
@@ -188,7 +188,6 @@ app.post("/newlog", (req, res) => {
   logger.log(message, type, user, record, object);
 });
 
-
 var cdkGetMake = require("./server/cdk/cdk-get-makes");
 app.post("/cdk/getvehicles", fb.validateFirebaseIdToken, cdkGetMake.default);
 

server/accounting/qbo/qbo-payables.js

@@ -181,12 +181,13 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor) {
     TxnDate: moment(bill.date)
       //.tz(bill.job.bodyshop.timezone)
       .format("YYYY-MM-DD"),
-    ...(bill.vendor.due_date && {
-      DueDate: moment(bill.date)
-        //.tz(bill.job.bodyshop.timezone)
-        .add(bill.vendor.due_date, "days")
-        .format("YYYY-MM-DD"),
-    }),
+    ...(!bill.is_credit_memo &&
+      bill.vendor.due_date && {
+        DueDate: moment(bill.date)
+          //.tz(bill.job.bodyshop.timezone)
+          .add(bill.vendor.due_date, "days")
+          .format("YYYY-MM-DD"),
+      }),
     DocNumber: bill.invoice_number,
     //...(bill.job.class ? { ClassRef: { Id: classes[bill.job.class] } } : {}),
 

server/accounting/qbxml/qbxml-payables.js

@@ -75,12 +75,13 @@ const generateBill = (bill) => {
             TxnDate: moment(bill.date)
               //.tz(bill.job.bodyshop.timezone)
               .format("YYYY-MM-DD"),
-            ...(bill.vendor.due_date && {
-              DueDate: moment(bill.date)
-               // .tz(bill.job.bodyshop.timezone)
-                .add(bill.vendor.due_date, "days")
-                .format("YYYY-MM-DD"),
-            }),
+            ...(!bill.is_credit_memo &&
+              bill.vendor.due_date && {
+                DueDate: moment(bill.date)
+                  // .tz(bill.job.bodyshop.timezone)
+                  .add(bill.vendor.due_date, "days")
+                  .format("YYYY-MM-DD"),
+              }),
             RefNumber: bill.invoice_number,
             Memo: `RO ${bill.job.ro_number || ""}`,
             ExpenseLineAdd: bill.billlines.map((il) =>

server/data/autohouse.js

@@ -214,7 +214,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         Street: job.ownr_addr1 || "",
         City: job.ownr_city || "",
         State: job.ownr_st || "",
-        Zip: job.ownr_zip || "",
+        Zip: (job.ownr_zip && job.ownr_zip.substring(0, 3)) || "",
         Phone1: job.ownr_ph1 || "",
         Phone2: null,
         Phone2Extension: null,
@@ -488,8 +488,8 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         PartsReconditionedCost:
           repairCosts.PartsReconditionedCost.toFormat(AHDineroFormat),
         PartsRecycled: Dinero(
-          job.job_totals.parts.parts.list.PAR &&
-            job.job_totals.parts.parts.list.PAR.total
+          job.job_totals.parts.parts.list.PAL &&
+            job.job_totals.parts.parts.list.PAL.total
         ).toFormat(AHDineroFormat),
         PartsRecycledCost:
           repairCosts.PartsRecycledCost.toFormat(AHDineroFormat),
@@ -555,7 +555,9 @@ const CreateRepairOrderTag = (job, errorCallback) => {
           AHDineroFormat
         ),
         BMTotalCost: repairCosts.BMTotalCost.toFormat(AHDineroFormat),
-        MiscTotal: 0,
+        MiscTotal: Dinero(job.job_totals.additional.additionalCosts).toFormat(
+          AHDineroFormat
+        ),
         MiscTotalCost: 0,
         TowingTotal: Dinero(job.job_totals.additional.towing).toFormat(
           AHDineroFormat
@@ -673,7 +675,7 @@ const CreateCosts = (job) => {
     });
     return bill_acc;
   }, {});
-  const materialsHours = { mapaHrs: 0, mashHrs: 0 };
+
   //If the hourly rates for job costing are set, add them in.
   if (job.bodyshop.jc_hourly_rates && job.bodyshop.jc_hourly_rates.mapa) {
     if (
@@ -694,9 +696,32 @@ const CreateCosts = (job) => {
           (job.bodyshop.jc_hourly_rates &&
             job.bodyshop.jc_hourly_rates.mapa * 100) ||
           0,
-      }).multiply(materialsHours.mapaHrs)
+      }).multiply(job.job_totals.rates.mapa.hours)
     );
   }
+  if (job.bodyshop.jc_hourly_rates && job.bodyshop.jc_hourly_rates.mash) {
+    if (
+      !billTotalsByCostCenters[
+        job.bodyshop.md_responsibility_centers.defaults.costs.MASH
+      ]
+    )
+      billTotalsByCostCenters[
+        job.bodyshop.md_responsibility_centers.defaults.costs.MASH
+      ] = Dinero();
+    billTotalsByCostCenters[
+      job.bodyshop.md_responsibility_centers.defaults.costs.MASH
+    ] = billTotalsByCostCenters[
+      job.bodyshop.md_responsibility_centers.defaults.costs.MASH
+    ].add(
+      Dinero({
+        amount:
+          (job.bodyshop.jc_hourly_rates &&
+            job.bodyshop.jc_hourly_rates.mash * 100) ||
+          0,
+      }).multiply(job.job_totals.rates.mash.hours)
+    );
+  }
+
   const ticketTotalsByCostCenter = job.timetickets.reduce(
     (ticket_acc, ticket_val) => {
       //At the invoice level.

server/firebase/firebase-handler.js

@@ -25,6 +25,43 @@ const adminEmail = [
   "patrick@thinkimex.com",
 ];
 
+exports.createUser = (req, res) => {
+  logger.log("admin-create-user", "WARN", req.user.email, null, {
+    request: req.body,
+  });
+  if (!adminEmail.includes(req.user.email)) {
+    logger.log(
+      "admin-create-user-unauthorized",
+      "ERROR",
+      req.user.email,
+      null,
+      {
+        request: req.body,
+        user: req.user,
+      }
+    );
+    res.sendStatus(404);
+  }
+  const { email, displayName, password } = req.body;
+  admin
+    .auth()
+    .createUser({ email, displayName, password })
+    .then((userRecord) => {
+      // See the UserRecord reference doc for the contents of userRecord.
+
+      logger.log("admin-update-user-success", "DEBUG", req.user.email, null, {
+        userRecord,
+      });
+      res.json(userRecord);
+    })
+    .catch((error) => {
+      logger.log("admin-update-user-error", "ERROR", req.user.email, null, {
+        error,
+      });
+      res.status(500).json(error);
+    });
+};
+
 exports.updateUser = (req, res) => {
   logger.log("admin-update-user", "WARN", req.user.email, null, {
     request: req.body,

server/job/job-costing.js

@@ -31,8 +31,8 @@ async function JobCosting(req, res) {
     res.status(200).json(ret);
   } catch (error) {
     logger.log("job-costing-error", "ERROR", req.user.email, jobid, {
-      jobid,
-      error,
+      message: error.message,
+      stack: error.stack,
     });
 
     res.status(400).send(JSON.stringify(error));
@@ -63,10 +63,12 @@ async function JobCostingMulti(req, res) {
         totalLaborSales: Dinero({ amount: 0 }),
         totalPartsSales: Dinero({ amount: 0 }),
         totalAdditionalSales: Dinero({ amount: 0 }),
+        totalSubletSales: Dinero({ amount: 0 }),
         totalSales: Dinero({ amount: 0 }),
         totalLaborCost: Dinero({ amount: 0 }),
         totalPartsCost: Dinero({ amount: 0 }),
         totalAdditionalCost: Dinero({ amount: 0 }),
+        totalSubletCost: Dinero({ amount: 0 }),
         totalCost: Dinero({ amount: 0 }),
         gpdollars: Dinero({ amount: 0 }),
         gppercent: null,
@@ -74,12 +76,15 @@ async function JobCostingMulti(req, res) {
         totalLaborGp: Dinero({ amount: 0 }),
         totalPartsGp: Dinero({ amount: 0 }),
         totalAdditionalGp: Dinero({ amount: 0 }),
+        totalSubletGp: Dinero({ amount: 0 }),
         totalLaborGppercent: null,
         totalLaborGppercentFormatted: null,
         totalPartsGppercent: null,
         totalPartsGppercentFormatted: null,
         totalAdditionalGppercent: null,
         totalAdditionalGppercentFormatted: null,
+        totalSubletGppercent: null,
+        totalSubletGppercentFormatted: null,
       },
     };
 
@@ -110,6 +115,9 @@ async function JobCostingMulti(req, res) {
             sale_additional_dinero: multiSummary.costCenterData[
               CostCenterIndex
             ].sale_additional_dinero.add(c.sale_additional_dinero),
+            sale_sublet_dinero: multiSummary.costCenterData[
+              CostCenterIndex
+            ].sale_sublet_dinero.add(c.sale_sublet_dinero),
             cost_labor_dinero: multiSummary.costCenterData[
               CostCenterIndex
             ].cost_labor_dinero.add(c.cost_labor_dinero),
@@ -119,6 +127,9 @@ async function JobCostingMulti(req, res) {
             cost_additional_dinero: multiSummary.costCenterData[
               CostCenterIndex
             ].cost_additional_dinero.add(c.cost_additional_dinero),
+            cost_sublet_dinero: multiSummary.costCenterData[
+              CostCenterIndex
+            ].cost_sublet_dinero.add(c.cost_sublet_dinero),
             gpdollars_dinero: multiSummary.costCenterData[
               CostCenterIndex
             ].gpdollars_dinero.add(c.gpdollars_dinero),
@@ -144,6 +155,10 @@ async function JobCostingMulti(req, res) {
         multiSummary.summaryData.totalAdditionalSales.add(
           costingData.summaryData.totalAdditionalSales
         );
+      multiSummary.summaryData.totalSubletSales =
+        multiSummary.summaryData.totalSubletSales.add(
+          costingData.summaryData.totalSubletSales
+        );
       multiSummary.summaryData.totalSales =
         multiSummary.summaryData.totalSales.add(
           costingData.summaryData.totalSales
@@ -164,6 +179,10 @@ async function JobCostingMulti(req, res) {
         multiSummary.summaryData.totalAdditionalCost.add(
           costingData.summaryData.totalAdditionalCost
         );
+      multiSummary.summaryData.totalSubletCost =
+        multiSummary.summaryData.totalSubletCost.add(
+          costingData.summaryData.totalSubletCost
+        );
       multiSummary.summaryData.totalCost =
         multiSummary.summaryData.totalCost.add(
           costingData.summaryData.totalCost
@@ -185,6 +204,10 @@ async function JobCostingMulti(req, res) {
         multiSummary.summaryData.totalAdditionalGp.add(
           costingData.summaryData.totalAdditionalGp
         );
+      multiSummary.summaryData.totalSubletGp =
+        multiSummary.summaryData.totalSubletGp.add(
+          costingData.summaryData.totalSubletGp
+        );
 
       //Take the summary data & add it to total summary data.
     });
@@ -219,6 +242,16 @@ async function JobCostingMulti(req, res) {
     multiSummary.summaryData.totalAdditionalGppercentFormatted =
       formatGpPercent(multiSummary.summaryData.totalAdditionalGppercent);
 
+    multiSummary.summaryData.totalSubletGppercent = (
+      (multiSummary.summaryData.totalSubletGp.getAmount() /
+        multiSummary.summaryData.totalSubletSales.getAmount()) *
+      100
+    ).toFixed(2);
+
+    multiSummary.summaryData.totalSubletGppercentFormatted = formatGpPercent(
+      multiSummary.summaryData.totalSubletGppercent
+    );
+
     multiSummary.summaryData.gppercent = (
       (multiSummary.summaryData.gpdollars.getAmount() /
         multiSummary.summaryData.totalSales.getAmount()) *
@@ -236,11 +269,13 @@ async function JobCostingMulti(req, res) {
         sale_parts: c.sale_parts_dinero && c.sale_parts_dinero.toFormat(),
         sale_additional:
           c.sale_additional_dinero && c.sale_additional_dinero.toFormat(),
+        sale_sublet: c.sale_sublet_dinero && c.sale_sublet_dinero.toFormat(),
         sales: c.sales_dinero.toFormat(),
         cost_parts: c.cost_parts_dinero && c.cost_parts_dinero.toFormat(),
         cost_labor: c.cost_labor_dinero && c.cost_labor_dinero.toFormat(),
         cost_additional:
           c.cost_additional_dinero && c.cost_additional_dinero.toFormat(),
+        cost_sublet: c.cost_sublet_dinero && c.cost_sublet_dinero.toFormat(),
         costs: c.costs_dinero.toFormat(),
         gpdollars: c.gpdollars_dinero.toFormat(),
         gppercent: formatGpPercent(
@@ -261,10 +296,10 @@ async function JobCostingMulti(req, res) {
     });
   } catch (error) {
     logger.log("job-costing-multi-error", "ERROR", req.user.email, [jobids], {
-      jobids,
-      error,
+      message: error.message,
+      stack: error.stack,
     });
-    res.status(400).send(JSON.stringify(error));
+    res.status(400).send(error);
   }
 }
 
@@ -317,7 +352,12 @@ function GenerateCostingData(job) {
           }
         }
 
-        if (val.part_type && val.part_type !== "PAE") {
+        if (
+          val.part_type &&
+          val.part_type !== "PAE" &&
+          val.part_type !== "PAS" &&
+          val.part_type !== "PASL"
+        ) {
           const partsProfitCenter =
             val.profitcenter_part || defaultProfits[val.part_type] || "?";
 
@@ -349,6 +389,42 @@ function GenerateCostingData(job) {
           acc.parts[partsProfitCenter] =
             acc.parts[partsProfitCenter].add(partsAmount);
         }
+        if (
+          val.part_type &&
+          val.part_type !== "PAE" &&
+          (val.part_type === "PAS" || val.part_type === "PASL")
+        ) {
+          const partsProfitCenter =
+            val.profitcenter_part || defaultProfits[val.part_type] || "?";
+
+          if (partsProfitCenter === "?")
+            console.log("Unknown type", val.line_desc, val.part_type);
+
+          if (!partsProfitCenter)
+            console.log(
+              "Unknown cost/profit center mapping for sublet.",
+              val.line_desc,
+              val.part_type
+            );
+          const partsAmount = Dinero({
+            amount: Math.round((val.act_price || 0) * 100),
+          })
+            .multiply(val.part_qty || 1)
+            .add(
+              val.prt_dsmk_m && val.prt_dsmk_m !== 0
+                ? Dinero({ amount: Math.round(val.prt_dsmk_m * 100) })
+                : Dinero({
+                    amount: Math.round(val.act_price * 100),
+                  })
+                    .multiply(val.part_qty || 0)
+                    .percentage(Math.abs(val.prt_dsmk_p || 0))
+                    .multiply(val.prt_dsmk_p > 0 ? 1 : -1)
+            );
+          if (!acc.sublet[partsProfitCenter])
+            acc.sublet[partsProfitCenter] = Dinero();
+          acc.sublet[partsProfitCenter] =
+            acc.sublet[partsProfitCenter].add(partsAmount);
+        }
 
         //To deal with additional costs.
         if (!val.part_type && !val.mod_lbr_ty) {
@@ -386,7 +462,7 @@ function GenerateCostingData(job) {
 
         return acc;
       },
-      { parts: {}, labor: {}, additional: {} }
+      { parts: {}, labor: {}, additional: {}, sublet: {} }
     );
 
   if (!hasMapaLine) {
@@ -441,6 +517,12 @@ function GenerateCostingData(job) {
                 .multiply(bill_val.is_credit_memo ? -1 : 1)
             );
         } else {
+          const isSubletCostCenter =
+            line_val.cost_center ===
+              job.bodyshop.md_responsibility_centers.defaults.costs.PAS ||
+            line_val.cost_center ===
+              job.bodyshop.md_responsibility_centers.defaults.costs.PASL;
+
           const isAdditionalCostCenter =
             // line_val.cost_center ===
             //   job.bodyshop.md_responsibility_centers.defaults.costs.PAS ||
@@ -465,6 +547,19 @@ function GenerateCostingData(job) {
                   .multiply(line_val.quantity)
                   .multiply(bill_val.is_credit_memo ? -1 : 1)
               );
+          } else if (isSubletCostCenter) {
+            if (!bill_acc.subletCosts[line_val.cost_center])
+              bill_acc.subletCosts[line_val.cost_center] = Dinero();
+
+            bill_acc.subletCosts[line_val.cost_center] = bill_acc.subletCosts[
+              line_val.cost_center
+            ].add(
+              Dinero({
+                amount: Math.round((line_val.actual_cost || 0) * 100),
+              })
+                .multiply(line_val.quantity)
+                .multiply(bill_val.is_credit_memo ? -1 : 1)
+            );
           } else {
             if (!bill_acc[line_val.cost_center])
               bill_acc[line_val.cost_center] = Dinero();
@@ -483,7 +578,7 @@ function GenerateCostingData(job) {
       });
       return bill_acc;
     },
-    { additionalCosts: {} }
+    { additionalCosts: {}, subletCosts: {} }
   );
 
   //If the hourly rates for job costing are set, add them in.
@@ -583,14 +678,17 @@ function GenerateCostingData(job) {
     totalLaborSales: Dinero({ amount: 0 }),
     totalPartsSales: Dinero({ amount: 0 }),
     totalAdditionalSales: Dinero({ amount: 0 }),
+    totalSubletSales: Dinero({ amount: 0 }),
     totalSales: Dinero({ amount: 0 }),
     totalLaborCost: Dinero({ amount: 0 }),
     totalPartsCost: Dinero({ amount: 0 }),
     totalAdditionalCost: Dinero({ amount: 0 }),
+    totalSubletCost: Dinero({ amount: 0 }),
     totalCost: Dinero({ amount: 0 }),
     totalLaborGp: Dinero({ amount: 0 }),
     totalPartsGp: Dinero({ amount: 0 }),
     totalAdditionalGp: Dinero({ amount: 0 }),
+    totalSubletGp: Dinero({ amount: 0 }),
     gpdollars: Dinero({ amount: 0 }),
     totalLaborGppercent: null,
     totalLaborGppercentFormatted: null,
@@ -598,6 +696,8 @@ function GenerateCostingData(job) {
     totalPartsGppercentFormatted: null,
     totalAdditionalGppercent: null,
     totalAdditionalGppercentFormatted: null,
+    totalSubletGppercent: null,
+    totalSubletGppercentFormatted: null,
     gppercent: null,
     gppercentFormatted: null,
   };
@@ -610,14 +710,24 @@ function GenerateCostingData(job) {
       jobLineTotalsByProfitCenter.parts[ccVal] || Dinero({ amount: 0 });
     const sale_additional =
       jobLineTotalsByProfitCenter.additional[ccVal] || Dinero({ amount: 0 });
+    const sale_sublet =
+      jobLineTotalsByProfitCenter.sublet[ccVal] || Dinero({ amount: 0 });
 
     const cost_labor = ticketTotalsByCostCenter[ccVal] || Dinero({ amount: 0 });
     const cost_parts = billTotalsByCostCenters[ccVal] || Dinero({ amount: 0 });
     const cost_additional =
       billTotalsByCostCenters.additionalCosts[ccVal] || Dinero({ amount: 0 });
+    const cost_sublet =
+      billTotalsByCostCenters.subletCosts[ccVal] || Dinero({ amount: 0 });
 
-    const costs = cost_labor.add(cost_parts).add(cost_additional);
-    const totalSales = sale_labor.add(sale_parts).add(sale_additional);
+    const costs = cost_labor
+      .add(cost_parts)
+      .add(cost_additional)
+      .add(cost_sublet);
+    const totalSales = sale_labor
+      .add(sale_parts)
+      .add(sale_additional)
+      .add(sale_sublet);
     const gpdollars = totalSales.subtract(costs);
     const gppercent = (
       (gpdollars.getAmount() / totalSales.getAmount()) *
@@ -629,11 +739,14 @@ function GenerateCostingData(job) {
     summaryData.totalPartsSales = summaryData.totalPartsSales.add(sale_parts);
     summaryData.totalAdditionalSales =
       summaryData.totalAdditionalSales.add(sale_additional);
+    summaryData.totalSubletSales =
+      summaryData.totalSubletSales.add(sale_sublet);
     summaryData.totalSales = summaryData.totalSales.add(totalSales);
     summaryData.totalLaborCost = summaryData.totalLaborCost.add(cost_labor);
     summaryData.totalPartsCost = summaryData.totalPartsCost.add(cost_parts);
     summaryData.totalAdditionalCost =
       summaryData.totalAdditionalCost.add(cost_additional);
+    summaryData.totalSubletCost = summaryData.totalSubletCost.add(cost_sublet);
     summaryData.totalCost = summaryData.totalCost.add(costs);
 
     return {
@@ -645,6 +758,8 @@ function GenerateCostingData(job) {
       sale_parts_dinero: sale_parts,
       sale_additional: sale_additional && sale_additional.toFormat(),
       sale_additional_dinero: sale_additional,
+      sale_sublet: sale_sublet && sale_sublet.toFormat(),
+      sale_sublet_dinero: sale_sublet,
       sales: totalSales.toFormat(),
       sales_dinero: totalSales,
       cost_parts: cost_parts && cost_parts.toFormat(),
@@ -653,6 +768,8 @@ function GenerateCostingData(job) {
       cost_labor_dinero: cost_labor,
       cost_additional: cost_additional && cost_additional.toFormat(),
       cost_additional_dinero: cost_additional,
+      cost_sublet: cost_sublet && cost_sublet.toFormat(),
+      cost_sublet_dinero: cost_sublet,
       costs: costs.toFormat(),
       costs_dinero: costs,
       gpdollars_dinero: gpdollars,
@@ -675,12 +792,20 @@ function GenerateCostingData(job) {
       sale_labor_dinero: Dinero(),
       sale_parts: Dinero().toFormat(),
       sale_parts_dinero: Dinero(),
+      sale_additional: Dinero(),
+      sale_additional_dinero: Dinero(),
+      sale_sublet: Dinero(),
+      sale_sublet_dinero: Dinero(),
       sales: Dinero().toFormat(),
       sales_dinero: Dinero(),
       cost_parts: Dinero().toFormat(),
       cost_parts_dinero: Dinero(),
       cost_labor: Adjustment.toFormat(),
       cost_labor_dinero: Adjustment,
+      cost_additional: Dinero(),
+      cost_additional_dinero: Dinero(),
+      cost_sublet: Dinero(),
+      cost_sublet_dinero: Dinero(),
       costs: Adjustment.toFormat(),
       costs_dinero: Adjustment,
       gpdollars_dinero: Dinero(),
@@ -725,6 +850,17 @@ function GenerateCostingData(job) {
   summaryData.totalAdditionalGppercentFormatted = formatGpPercent(
     summaryData.totalAdditionalGppercent
   );
+  summaryData.totalSubletGp = summaryData.totalSubletSales.subtract(
+    summaryData.totalSubletCost
+  );
+  summaryData.totalSubletGppercent = (
+    (summaryData.totalSubletGp.getAmount() /
+      summaryData.totalSubletSales.getAmount()) *
+    100
+  ).toFixed(2);
+  summaryData.totalSubletGppercentFormatted = formatGpPercent(
+    summaryData.totalSubletGppercent
+  );
 
   summaryData.gpdollars = summaryData.totalSales.subtract(
     summaryData.totalCost

server/job/job-totals.js

@@ -442,8 +442,8 @@ function CalculateAdditional(job) {
   ret.total = ret.additionalCosts
     .add(ret.adjustments) //IO-813 Adjustment takes care of GST & PST at labor rate.
     .add(ret.towing)
-    .add(ret.storage)
-    .add(ret.pvrt);
+    .add(ret.storage);
+  //.add(ret.pvrt);
 
   return ret;
 }
@@ -453,6 +453,7 @@ function CalculateTaxesTotals(job, otherTotals) {
     .add(otherTotals.parts.sublets.subtotal)
     .add(otherTotals.rates.subtotal) //No longer using just rates subtotal to include mapa/mash.
     .add(otherTotals.additional.total);
+
   // .add(Dinero({ amount: (job.towing_payable || 0) * 100 }))
   // .add(Dinero({ amount: (job.storage_payable || 0) * 100 }));
 
@@ -522,7 +523,13 @@ function CalculateTaxesTotals(job, otherTotals) {
 
   let ret = {
     subtotal: subtotal,
-    federal_tax: subtotal.percentage((job.federal_tax_rate || 0) * 100),
+    federal_tax: subtotal
+      .percentage((job.federal_tax_rate || 0) * 100)
+      .add(
+        otherTotals.additional.pvrt.percentage(
+          (job.federal_tax_rate || 0) * 100
+        )
+      ),
     statePartsTax,
     state_tax: statePartsTax
       .add(
@@ -540,12 +547,14 @@ function CalculateTaxesTotals(job, otherTotals) {
         otherTotals.additional.storage.percentage((job.tax_str_rt || 0) * 100)
       )
       .add(additionalItemsTax),
+    // .add(otherTotals.additional.pvrt),
     local_tax: subtotal.percentage((job.local_tax_rate || 0) * 100),
   };
   ret.total_repairs = ret.subtotal
     .add(ret.federal_tax)
     .add(ret.state_tax)
-    .add(ret.local_tax);
+    .add(ret.local_tax)
+    .add(otherTotals.additional.pvrt);
 
   ret.custPayable = {
     deductible: Dinero({ amount: Math.round((job.ded_amt || 0) * 100) }) || 0,

server/scheduling/scheduling-job.js

@@ -111,10 +111,9 @@ exports.job = async (req, res) => {
         }
 
         if (
-          moment(item.actual_completion || item.scheduled_completion).tz(timezone).isBefore(
-            moment().tz(timezone),
-            "day"
-          )
+          moment(item.actual_completion || item.scheduled_completion)
+            .tz(timezone)
+            .isBefore(moment().tz(timezone), "day")
         ) {
           console.log("Job should have already gone. Ignoring it.", item);
           return;
@@ -128,7 +127,9 @@ exports.job = async (req, res) => {
       } else {
         const itemDate = moment(
           item.actual_completion || item.scheduled_completion
-        ).tz(timezone).format("yyyy-MM-DD");
+        )
+          .tz(timezone)
+          .format("yyyy-MM-DD");
         if (!!load[itemDate]) {
           load[itemDate].hoursOut =
             (load[itemDate].hoursOut || 0) +
@@ -153,14 +154,20 @@ exports.job = async (req, res) => {
     const end = moment.max([
       ...filteredArrJobs.map((a) => moment(a.scheduled_in).tz(timezone)),
       ...filteredCompJobs
-        .map((p) => moment(p.actual_completion || p.scheduled_completion).tz(timezone))
+        .map((p) =>
+          moment(p.actual_completion || p.scheduled_completion).tz(timezone)
+        )
         .filter((p) => p.isValid() && p.isAfter(yesterday)),
       moment().tz(timezone).add(15, "days"),
     ]);
     const range = Math.round(moment.duration(end.diff(today)).asDays());
     for (var day = 0; day < range; day++) {
-      const current = moment(today).tz(timezone).add(day, "days").format("yyyy-MM-DD");
-      const prev = moment(today).tz(timezone)
+      const current = moment(today)
+        .tz(timezone)
+        .add(day, "days")
+        .format("yyyy-MM-DD");
+      const prev = moment(today)
+        .tz(timezone)
         .add(day - 1, "days")
         .format("yyyy-MM-DD");
       if (!!!load[current]) {
@@ -194,7 +201,7 @@ exports.job = async (req, res) => {
         load[startIsoFormat] = { blocked: true };
       }
     });
-    // //Propose the first 5 dates where we are below target.
+    // //Propose the first 10 dates where we are below target.
 
     const possibleDates = [];
     delete load.productionTotal;
@@ -204,7 +211,7 @@ exports.job = async (req, res) => {
 
     loadKeys.forEach((loadKey) => {
       const isShopOpen =
-        (workingdays[dayOfWeekMapper(moment(loadKey).tz(timezone).day())] || false) &&
+        (workingdays[dayOfWeekMapper(moment(loadKey).day())] || false) &&
         !load[loadKey].blocked;
 
       if (
@@ -216,10 +223,10 @@ exports.job = async (req, res) => {
         possibleDates.push(new Date(loadKey).toISOString().substr(0, 10));
     });
 
-    if (possibleDates.length < 6) {
+    if (possibleDates.length < 11) {
       res.json(possibleDates);
     } else {
-      res.json(possibleDates.slice(0, 5));
+      res.json(possibleDates.slice(0, 10));
     }
   } catch (error) {
     logger.log("smart-scheduling-error", "ERROR", req.user.email, jobId, {

server/tasks/tasks.js

@@ -9,30 +9,84 @@ const axios = require("axios");
 const client = require("../graphql-client/graphql-client").client;
 const emailer = require("../email/sendemail");
 const logger = require("../utils/logger");
-
+const moment = require("moment-timezone");
 exports.taskHandler = async (req, res) => {
   try {
-    const { bodyshopid, query, variables, text, to, subject } = req.body;
+    const { bodyshopid, query, variables, text, to, subject, timezone } =
+      req.body;
     //Run the query
+
+    //Check the variables to see if they are an object.
+    Object.keys(variables).forEach((key) => {
+      if (typeof variables[key] === "object") {
+        if (variables[key].function) {
+          variables[key] = functionMapper(variables[key].function, timezone);
+        }
+      }
+    });
+
     const response = await client.request(query, variables);
     //Massage the data
     //Send the email
     const rootElement = response[Object.keys(response)[0]]; //This element shoudl always be an array.
     let converter = require("json-2-csv");
-    converter.json2csv(rootElement, (err, csv) => {
-      if (err) {
-        res.status(500).json(err);
-      }
+    converter.json2csv(
+      rootElement,
+      (err, csv) => {
+        if (err) {
+          res.status(500).json(err);
+        }
 
-      emailer.sendTaskEmail({
-        to,
-        subject,
-        text,
-        attachments: [{ filename: "query.csv", content: csv }],
-      });
-      res.status(200).send(csv);
-    });
+        emailer.sendTaskEmail({
+          to,
+          subject,
+          text,
+          attachments: [{ filename: "query.csv", content: csv }],
+        });
+        res.status(200).send(csv);
+      },
+      { emptyFieldValue: "" }
+    );
   } catch (error) {
-    res.status(500).json({ error });
+    res.status(500).json({ error: error.message, stack: error.stackTrace });
   }
 };
+
+const isoformat = "YYYY-MM-DD";
+function functionMapper(f, timezone) {
+  switch (f) {
+    case "date.today":
+      return moment().tz(timezone).format(isoformat);
+    case "date.now":
+      return moment().tz(timezone);
+    case "date.yesterday":
+      return moment().tz(timezone).subtract(1, "day").format(isoformat);
+    case "date.3daysago":
+      return moment().tz(timezone).subtract(3, "days").format(isoformat);
+    case "date.7daysago":
+      return moment().tz(timezone).subtract(7, "days").format(isoformat);
+    case "date.tomorrow":
+      return moment().tz(timezone).add(1, "day").format(isoformat);
+    case "date.3daysfromnow":
+      return moment().tz(timezone).add(3, "days").format(isoformat);
+    case "date.7daysfromnow":
+      return moment().tz(timezone).add(7, "days").format(isoformat);
+    case "date.yesterdaytz":
+      return moment().tz(timezone).subtract(1, "day");
+    case "date.3daysagotz":
+      return moment().tz(timezone).subtract(3, "days");
+    case "date.7daysagotz":
+      return moment().tz(timezone).subtract(7, "days");
+    case "date.tomorrowtz":
+      return moment().tz(timezone).add(1, "day");
+    case "date.3daysfromnowtz":
+      return moment().tz(timezone).add(3, "days");
+    case "date.7daysfromnowtz":
+      return moment().tz(timezone).add(7, "days");
+
+    case "date.now":
+      return moment().tz(timezone);
+    default:
+      return f;
+  }
+}