IO-2280 added config anchors

Release/2023 05 19

client/src/components/job-payments/job-payments.component.jsx

@@ -99,7 +99,7 @@ export function JobPayments({
       render: (text, record) => (
         <Space wrap>
           <Button
-            disabled={record.exportedat}
+            // disabled={record.exportedat}
             onClick={() => {
               setPaymentContext({
                 actions: { refetch: refetch },

client/src/components/jobs-convert-button/jobs-convert-button.component.jsx

@@ -219,13 +219,15 @@ export function JobsConvertButton({
             </Select>
           </Form.Item>
         )}
-        <Form.Item
-          label={t("jobs.fields.ca_gst_registrant")}
-          name="ca_gst_registrant"
-          valuePropName="checked"
-        >
-          <Switch />
-        </Form.Item>
+        {bodyshop.region_config.toLowerCase().startsWith("ca") && (
+          <Form.Item
+            label={t("jobs.fields.ca_gst_registrant")}
+            name="ca_gst_registrant"
+            valuePropName="checked"
+          >
+            <Switch />
+          </Form.Item>
+        )}
         <Form.Item
           label={t("jobs.fields.driveable")}
           name="driveable"

client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx

@@ -224,13 +224,15 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
             >
               <CurrencyInput />
             </Form.Item>
-            <Form.Item
-              label={t("jobs.fields.ca_gst_registrant")}
-              name="ca_gst_registrant"
-              valuePropName="checked"
-            >
-              <Switch />
-            </Form.Item>
+            {bodyshop.region_config.toLowerCase().startsWith("ca") && (
+              <Form.Item
+                label={t("jobs.fields.ca_gst_registrant")}
+                name="ca_gst_registrant"
+                valuePropName="checked"
+              >
+                <Switch />
+              </Form.Item>
+            )}
             <Form.Item
               label={t("jobs.fields.other_amount_payable")}
               name="other_amount_payable"

client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx

@@ -40,24 +40,26 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
         >
           <CurrencyInput disabled={jobRO} min={0} />
         </Form.Item>
-        <Tooltip title={t("jobs.labels.ca_gst_all_if_null")}>
-          <Form.Item
-            label={t("jobs.fields.ca_customer_gst")}
-            name="ca_customer_gst"
-          >
-            <CurrencyInput
-              disabled={jobRO}
-              min={0}
-              max={
-                Math.round(
-                  (job.job_totals &&
-                    job.job_totals.totals.federal_tax.amount) ||
-                    0
-                ) / 100
-              }
-            />
-          </Form.Item>
-        </Tooltip>
+        {bodyshop.region_config.toLowerCase().startsWith("ca") && (
+          <Tooltip title={t("jobs.labels.ca_gst_all_if_null")}>
+            <Form.Item
+              label={t("jobs.fields.ca_customer_gst")}
+              name="ca_customer_gst"
+            >
+              <CurrencyInput
+                disabled={jobRO}
+                min={0}
+                max={
+                  Math.round(
+                    (job.job_totals &&
+                      job.job_totals.totals.federal_tax.amount) ||
+                      0
+                  ) / 100
+                }
+              />
+            </Form.Item>
+          </Tooltip>
+        )}
         <Form.Item
           label={t("jobs.fields.other_amount_payable")}
           name="other_amount_payable"
@@ -82,12 +84,14 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
         >
           <CurrencyInput disabled={jobRO || bodyshop.cdk_dealerid} />
         </Form.Item>
-        <Space align="center">
-          <Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
-            <CurrencyInput disabled={jobRO} min={0} />
-          </Form.Item>
-          <CABCpvrtCalculator form={form} disabled={jobRO} />
-        </Space>
+        {bodyshop.region_config === "CA_BC" && (
+          <Space align="center">
+            <Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
+              <CurrencyInput disabled={jobRO} min={0} />
+            </Form.Item>
+            <CABCpvrtCalculator form={form} disabled={jobRO} />
+          </Space>
+        )}
         <Form.Item
           label={t("jobs.fields.auto_add_ats")}
           name="auto_add_ats"
@@ -141,13 +145,15 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
         >
           <InputNumber min={0} max={1} precision={2} disabled={jobRO} />
         </Form.Item>
-        <Form.Item
-          label={t("jobs.fields.ca_gst_registrant")}
-          name="ca_gst_registrant"
-          valuePropName="checked"
-        >
-          <Switch disabled={jobRO} />
-        </Form.Item>
+        {bodyshop.region_config.toLowerCase().startsWith("ca") && (
+          <Form.Item
+            label={t("jobs.fields.ca_gst_registrant")}
+            name="ca_gst_registrant"
+            valuePropName="checked"
+          >
+            <Switch disabled={jobRO} />
+          </Form.Item>
+        )}
       </FormRow>
       <Divider
         orientation="left"

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

@@ -75,6 +75,27 @@ export function JobNotesComponent({
         </span>
       ),
     },
+    {
+      title: t("notes.fields.type"),
+      dataIndex: "type",
+      key: "type",
+      width: 120,
+      filteredValue: filter?.type || null,
+      filters: [
+        { value: "general", text: t("notes.fields.types.general") },
+        { value: "customer", text: t("notes.fields.types.customer") },
+        { value: "shop", text: t("notes.fields.types.shop") },
+        { value: "office", text: t("notes.fields.types.office") },
+        { value: "parts", text: t("notes.fields.types.parts") },
+        { value: "paint", text: t("notes.fields.types.paint") },
+        {
+          value: "supplement",
+          text: t("notes.fields.types.supplement"),
+        },
+      ],
+      onFilter: (value, record) => value.includes(record.type),
+      render: (text, record) => t(`notes.fields.types.${record.type}`),
+    },
     {
       title: t("notes.fields.text"),
       dataIndex: "text",
@@ -106,7 +127,7 @@ export function JobNotesComponent({
       title: t("notes.actions.actions"),
       dataIndex: "actions",
       key: "actions",
-      width: 150,
+      width: 200,
       render: (text, record) => (
         <Space wrap>
           <Button

client/src/components/labor-allocations-table/labor-allocations-table.component.jsx

@@ -207,7 +207,7 @@ export function LaborAllocationsTable({
         <Card title={t("jobs.labels.laborallocations")}>
           <Table
             columns={columns}
-            rowKey="cost_center"
+            rowKey={(record) => `${record.cost_center} ${record.mod_lbr_ty}`}
             pagination={false}
             onChange={handleTableChange}
             dataSource={totals}

client/src/components/note-upsert-modal/note-upsert-modal.component.jsx

@@ -1,4 +1,14 @@
-import { Checkbox, Col, Form, Input, Row, Space, Switch, Tag } from "antd";
+import {
+  Checkbox,
+  Col,
+  Form,
+  Input,
+  Row,
+  Select,
+  Space,
+  Switch,
+  Tag,
+} from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -46,6 +56,28 @@ export function NoteUpsertModalComponent({ form, noteUpsertModal }) {
             <Switch />
           </Form.Item>
         </Col>
+        <Col span={8}>
+          <Form.Item
+            label={t("notes.fields.type")}
+            name="type"
+            initialValue="general"
+          >
+            <Select
+              options={[
+                { value: "general", label: t("notes.fields.types.general") },
+                { value: "customer", label: t("notes.fields.types.customer") },
+                { value: "shop", label: t("notes.fields.types.shop") },
+                { value: "office", label: t("notes.fields.types.office") },
+                { value: "parts", label: t("notes.fields.types.parts") },
+                { value: "paint", label: t("notes.fields.types.paint") },
+                {
+                  value: "supplement",
+                  label: t("notes.fields.types.supplement"),
+                },
+              ]}
+            />
+          </Form.Item>
+        </Col>
         <Col span={8}>
           <NotesPresetButton form={form} />
         </Col>

client/src/components/payment-modal/payment-modal.container.jsx

@@ -1,6 +1,6 @@
 import { useMutation } from "@apollo/client";
 
-import { Button, Form, Modal, notification } from "antd";
+import { Button, Form, Modal, notification, Space } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -19,6 +19,8 @@ import {
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import PaymentForm from "../payment-form/payment-form.component";
+import { PaymentExportButton } from "../payment-export-button/payment-export-button.component";
+import PaymentReexportButton from "../payment-reexport-button/payment-reexport-button.component";
 
 const mapStateToProps = createStructuredSelector({
   paymentModal: selectPayment,
@@ -176,12 +178,33 @@ function PaymentModalContainer({
         </span>
       }
     >
+      <Space>
+        <PaymentReexportButton
+          payment={context}
+          refetch={() => {
+            toggleModalVisible();
+
+            return actions.refetch;
+          }}
+        />
+        <PaymentExportButton
+          bodyshop={bodyshop}
+          paymentId={context.id}
+          disabled={!!context.exportedat}
+          refetch={() => {
+            toggleModalVisible();
+
+            return actions.refetch;
+          }}
+        />
+      </Space>
       <Form
         onFinish={handleFinish}
         autoComplete={"off"}
         form={form}
         layout="vertical"
         initialValues={context || {}}
+        disabled={context.exportedat}
       >
         <PaymentForm form={form} />
       </Form>

client/src/components/payment-reexport-button/payment-reexport-button.component.jsx

@@ -0,0 +1,49 @@
+import React from "react";
+import { Button, notification } from "antd";
+import { useTranslation } from "react-i18next";
+import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
+import { useMutation } from "@apollo/client";
+
+const PaymentReexportButton = ({ payment, refetch }) => {
+  const { t } = useTranslation();
+  const [updatePayment, { loading }] = useMutation(UPDATE_PAYMENT);
+
+  const handleClick = async () => {
+    const paymentUpdateResponse = await updatePayment({
+      variables: {
+        paymentId: payment.id,
+        payment: {
+          exportedat: null,
+        },
+      },
+    });
+
+    if (!!!paymentUpdateResponse.errors) {
+      notification.open({
+        type: "success",
+        key: "paymentsuccessexport",
+        message: t("payments.successes.reexported"),
+      });
+
+      if (refetch) refetch();
+    } else {
+      notification["error"]({
+        message: t("payments.errors.exporting", {
+          error: JSON.stringify(paymentUpdateResponse.error),
+        }),
+      });
+    }
+  };
+
+  return (
+    <Button
+      onClick={handleClick}
+      loading={loading}
+      disabled={!payment.exportedat}
+    >
+      {t("bills.labels.markforreexport")}
+    </Button>
+  );
+};
+
+export default PaymentReexportButton;

client/src/components/payments-list-paginated/payment-list-paginated.component.jsx

@@ -156,7 +156,7 @@ export function PaymentsListPaginated({
       render: (text, record) => (
         <Space>
           <Button
-            disabled={record.exportedat}
+            // disabled={record.exportedat}
             onClick={async () => {
               let apolloResults;
               if (search.search) {

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

@@ -15,6 +15,8 @@ import ShopInfoResponsibilityCenterComponent from "./shop-info.responsibilitycen
 import ShopInfoROStatusComponent from "./shop-info.rostatus.component";
 import ShopInfoSchedulingComponent from "./shop-info.scheduling.component";
 import ShopInfoSpeedPrint from "./shop-info.speedprint.component";
+import { useHistory, useLocation } from "react-router-dom";
+import queryString from "query-string";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -31,6 +33,10 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
     bodyshop.imexshopid
   );
   const { t } = useTranslation();
+  const history = useHistory();
+  const location = useLocation();
+  const search = queryString.parse(location.search);
+
   return (
     <Card
       extra={
@@ -43,7 +49,12 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
         </Button>
       }
     >
-      <Tabs>
+      <Tabs
+        defaultActiveKey={search.subtab}
+        onChange={(key) =>
+          history.push({ search: `?tab=${search.tab}&subtab=${key}` })
+        }
+      >
         <Tabs.TabPane key="general" tab={t("bodyshop.labels.shopinfo")}>
           <ShopInfoGeneral form={form} />
         </Tabs.TabPane>

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

@@ -24,9 +24,13 @@ const timeZonesList = momentTZ.tz.names();
 
 export default function ShopInfoGeneral({ form }) {
   const { t } = useTranslation();
+
   return (
     <div>
-      <LayoutFormRow header={t("bodyshop.labels.businessinformation")}>
+      <LayoutFormRow
+        header={t("bodyshop.labels.businessinformation")}
+        id="businessinformation"
+      >
         <Form.Item
           label={t("bodyshop.fields.shopname")}
           name="shopname"
@@ -155,7 +159,10 @@ export default function ShopInfoGeneral({ form }) {
           <InputNumber min={0} />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow header={t("bodyshop.labels.accountingsetup")}>
+      <LayoutFormRow
+        header={t("bodyshop.labels.accountingsetup")}
+        id="accountingsetup"
+      >
         <Form.Item
           label={t("bodyshop.labels.qbo")}
           valuePropName="checked"
@@ -386,7 +393,10 @@ export default function ShopInfoGeneral({ form }) {
           <Select mode="tags" />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow header={t("bodyshop.labels.scoreboardsetup")}>
+      <LayoutFormRow
+        header={t("bodyshop.labels.scoreboardsetup")}
+        id="scoreboardsetup"
+      >
         <Form.Item
           label={t("bodyshop.fields.dailypainttarget")}
           name={["scoreboard_target", "dailyPaintTarget"]}
@@ -445,7 +455,10 @@ export default function ShopInfoGeneral({ form }) {
           <InputNumber min={1} precision={1} />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow header={t("bodyshop.labels.systemsettings")}>
+      <LayoutFormRow
+        header={t("bodyshop.labels.systemsettings")}
+        id="systemsettings"
+      >
         <Form.Item
           name={["md_referral_sources"]}
           label={t("bodyshop.fields.md_referral_sources")}
@@ -655,7 +668,11 @@ export default function ShopInfoGeneral({ form }) {
           <Input />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.labels.messagingpresets")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.labels.messagingpresets")}
+        id="messagingpresets"
+      >
         <Form.List name={["md_messaging_presets"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -720,7 +737,11 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.labels.notespresets")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.labels.notespresets")}
+        id="notespresets"
+      >
         <Form.List name={["md_notes_presets"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -785,7 +806,11 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.labels.partslocations")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.labels.partslocations")}
+        id="partslocations"
+      >
         <Form.List name={["md_parts_locations"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -839,7 +864,11 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.labels.insurancecos")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.labels.insurancecos")}
+        id="insurancecos"
+      >
         <Form.List name={["md_ins_cos"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -935,7 +964,11 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.labels.estimators")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.labels.estimators")}
+        id="estimators"
+      >
         <Form.List name={["md_estimators"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -1024,7 +1057,11 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.labels.filehandlers")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.labels.filehandlers")}
+        id="filehandlers"
+      >
         <Form.List name={["md_filehandlers"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -1106,7 +1143,11 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.fields.md_ccc_rates")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.fields.md_ccc_rates")}
+        id="md_ccc_rates"
+      >
         <Form.List name={["md_ccc_rates"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -1223,7 +1264,11 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.fields.md_jobline_presets")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.fields.md_jobline_presets")}
+        id="md_jobline_presets"
+      >
         <Form.List name={["md_jobline_presets"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -1404,7 +1449,11 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.fields.md_parts_order_comment")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.fields.md_parts_order_comment")}
+        id="md_parts_order_comment"
+      >
         <Form.List name={["md_parts_order_comment"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -1470,7 +1519,11 @@ export default function ShopInfoGeneral({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.labels.md_to_emails")}>
+      <LayoutFormRow
+        grow
+        header={t("bodyshop.labels.md_to_emails")}
+        id="md_to_emails"
+      >
         <Form.List name={["md_to_emails"]}>
           {(fields, { add, remove, move }) => {
             return (

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

@@ -20,7 +20,10 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
   const TemplateListGenerated = TemplateList();
   return (
     <div>
-      <LayoutFormRow header={t("bodyshop.labels.intakechecklist")}>
+      <LayoutFormRow
+        header={t("bodyshop.labels.intakechecklist")}
+        id="intakechecklist"
+      >
         <Form.List name={["intakechecklist", "form"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -188,7 +191,10 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
         </Form.Item>
       </SelectorDiv>
 
-      <LayoutFormRow header={t("bodyshop.labels.deliverchecklist")}>
+      <LayoutFormRow
+        header={t("bodyshop.labels.deliverchecklist")}
+        id="deliverchecklist"
+      >
         <Form.List name={["deliverchecklist", "form"]}>
           {(fields, { add, remove, move }) => {
             return (

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

@@ -95,7 +95,6 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
               {form.getFieldValue("pbs_serialnumber")}
             </DataLabel>
           )}
-
           <LayoutFormRow>
             <Form.Item
               label={t("bodyshop.fields.dms.default_journal")}
@@ -315,7 +314,10 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           </DataLabel>
         </>
       )}
-      <LayoutFormRow header={t("bodyshop.labels.responsibilitycenters.costs")}>
+      <LayoutFormRow
+        header={t("bodyshop.labels.responsibilitycenters.costs")}
+        id="costs"
+      >
         <Form.List name={["md_responsibility_centers", "costs"]}>
           {(fields, { add, remove }) => {
             return (
@@ -462,6 +464,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
 
       <LayoutFormRow
         header={t("bodyshop.labels.responsibilitycenters.profits")}
+        id="profits"
       >
         <Form.List name={["md_responsibility_centers", "profits"]}>
           {(fields, { add, remove }) => {
@@ -601,7 +604,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                     {fields.map((field, index) => (
                       <Form.Item key={field.key}>
                         <div>
-                          <LayoutFormRow>
+                          <LayoutFormRow id="mappingname">
                             <Form.Item
                               label={t("bodyshop.fields.dms.mappingname")}
                               key={`${index}name`}
@@ -631,6 +634,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                           </LayoutFormRow>
                           <LayoutFormRow
                             header={t("bodyshop.labels.defaultcostsmapping")}
+                            id="defaultcostsmapping"
                           >
                             <Form.Item
                               label={t(
@@ -4088,6 +4092,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
 
       <LayoutFormRow
         header={t("bodyshop.labels.responsibilitycenters.tax_accounts")}
+        id="tax_accounts"
       >
         <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.federal_tax")}
@@ -4202,7 +4207,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         </Form.Item>
       </LayoutFormRow>
       {DmsAp.treatment === "on" && (
-        <LayoutFormRow>
+        <LayoutFormRow id="federal_tax_itc">
           <Form.Item
             label={t("bodyshop.fields.responsibilitycenters.federal_tax_itc")}
             rules={[
@@ -4316,7 +4321,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           </Form.Item>
         </LayoutFormRow>
       )}
-      <LayoutFormRow>
+      <LayoutFormRow id="state_tax">
         <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.state_tax")}
           rules={[
@@ -4414,7 +4419,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           <InputNumber precision={2} />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow>
+      <LayoutFormRow id="local_tax">
         <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.local_tax")}
           rules={[
@@ -4512,7 +4517,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           <InputNumber precision={2} />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow header={<div>AR</div>}>
+      <LayoutFormRow header={<div>AR</div>} id="AR">
         {/* <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.ar")}
           rules={[
@@ -4576,7 +4581,10 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
       </LayoutFormRow>
 
       {DmsAp.treatment === "on" && (
-        <LayoutFormRow header={t("bodyshop.fields.responsibilitycenters.ap")}>
+        <LayoutFormRow
+          header={t("bodyshop.fields.responsibilitycenters.ap")}
+          id="ap"
+        >
           {/* <Form.Item
             label={t("bodyshop.fields.responsibilitycenters.ap")}
             rules={[
@@ -4639,7 +4647,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
           </Form.Item>
         </LayoutFormRow>
       )}
-      <LayoutFormRow header={<div>Refund</div>}>
+      <LayoutFormRow header={<div>Refund</div>} id="refund">
         {/* <Form.Item
           label={t("bodyshop.fields.responsibilitycenters.refund")}
           rules={[
@@ -4702,7 +4710,10 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         </Form.Item>
       </LayoutFormRow>
       {Qb_Multi_Ar.treatment === "on" && (
-        <LayoutFormRow header={<div>Multiple Payers Item</div>}>
+        <LayoutFormRow
+          header={<div>Multiple Payers Item</div>}
+          id="accountitem"
+        >
           <Form.Item
             label={t("bodyshop.fields.responsibilitycenter_accountitem")}
             rules={[
@@ -4730,7 +4741,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
             <div>
               {fields.map((field, index) => (
                 <Form.Item key={field.key}>
-                  <LayoutFormRow>
+                  <LayoutFormRow id="sales_tax_codes">
                     <Form.Item
                       label={t(
                         "bodyshop.fields.responsibilitycenters.sales_tax_codes.description"

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

@@ -44,7 +44,7 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
   };
 
   return (
-    <SelectorDiv>
+    <SelectorDiv id="jobstatus">
       <Form.Item
         name={["md_ro_statuses", "statuses"]}
         label={t("bodyshop.labels.alljobstatuses")}
@@ -322,6 +322,7 @@ export function ShopInfoROStatusComponent({ bodyshop, form }) {
         <LayoutFormRow
           grow
           header={t("bodyshop.fields.statuses.production_colors")}
+          id="production_colors"
         >
           <Form.List name={["md_ro_statuses", "production_colors"]}>
             {(fields, { add, remove, move }) => {

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

@@ -92,7 +92,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
         </Form.Item>
       </LayoutFormRow>
       <Divider orientation="left">{t("bodyshop.labels.workingdays")}</Divider>
-      <Space wrap size="large">
+      <Space wrap size="large" id="workingdays">
         <Form.Item
           label={t("general.labels.sunday")}
           name={["workingdays", "sunday"]}
@@ -143,7 +143,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
           <Switch />
         </Form.Item>
       </Space>
-      <LayoutFormRow header={t("bodyshop.labels.apptcolors")}>
+      <LayoutFormRow header={t("bodyshop.labels.apptcolors")} id="apptcolors">
         <Form.List name={["appt_colors"]}>
           {(fields, { add, remove, move }) => {
             return (
@@ -208,7 +208,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow header={t("bodyshop.labels.ssbuckets")}>
+      <LayoutFormRow header={t("bodyshop.labels.ssbuckets")} id="ssbuckets">
         <Form.List name={["ssbuckets"]}>
           {(fields, { add, remove, move }) => {
             return (

client/src/graphql/notes.queries.js

@@ -13,6 +13,7 @@ export const INSERT_NEW_NOTE = gql`
         text
         updated_at
         audit
+        type
       }
     }
   }
@@ -41,6 +42,7 @@ export const QUERY_NOTES_BY_JOB_PK = gql`
         text
         updated_at
         audit
+        type
       }
     }
   }
@@ -60,6 +62,7 @@ export const UPDATE_NOTE = gql`
         text
         updated_at
         audit
+        type
       }
     }
   }

client/src/pages/shop/shop.page.component.jsx

@@ -1,5 +1,7 @@
 import { Tabs } from "antd";
 import React, { useEffect } from "react";
+import { useHistory, useLocation } from "react-router-dom";
+import queryString from "query-string";
 import { useTranslation } from "react-i18next";
 import ShopEmployeesContainer from "../../components/shop-employees/shop-employees.container";
 import ShopInfoContainer from "../../components/shop-info/shop-info.container";
@@ -24,6 +26,9 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
   const { t } = useTranslation();
+  const history = useHistory();
+  const search = queryString.parse(useLocation().search);
+
   useEffect(() => {
     document.title = t("titles.shop");
     setSelectedHeader("shop");
@@ -37,7 +42,10 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
 
   return (
     <RbacWrapper action="shop:config">
-      <Tabs>
+      <Tabs
+        defaultActiveKey={search.tab}
+        onChange={(key) => history.push({ search: `?tab=${key}` })}
+      >
         <Tabs.TabPane tab={t("bodyshop.labels.shopinfo")} key="info">
           <ShopInfoContainer />
         </Tabs.TabPane>

client/src/translations/en_us/common.json

@@ -63,6 +63,7 @@
 				"scheduledfor": "Scheduled appointment for: ",
 				"severalerrorsfound": "Several jobs have issues which may prevent accurate smart scheduling. Click to expand.",
 				"smartscheduling": "Smart Scheduling",
+				"smspaymentreminder": "",
 				"suggesteddates": "Suggested Dates"
 			},
 			"successes": {
@@ -103,6 +104,7 @@
 				"admin_jobunvoid": "ADMIN: Job has been unvoided.",
 				"billposted": "Bill with invoice number {{invoice_number}} posted.",
 				"billupdated": "Bill with invoice number {{invoice_number}} updated.",
+				"failedpayment": "",
 				"jobassignmentchange": "Employee {{name}} assigned to {{operation}}",
 				"jobassignmentremoved": "Employee assignment removed for {{operation}}",
 				"jobchecklist": "Checklist type \"{{type}}\" completed.  In production set to {{inproduction}}.  Status set to {{status}}.",
@@ -227,6 +229,7 @@
 		},
 		"bodyshop": {
 			"actions": {
+				"add_task_preset": "",
 				"addapptcolor": "Add Appointment Color",
 				"addbucket": "Add Definition",
 				"addpartslocation": "Add Parts Location",
@@ -339,6 +342,12 @@
 				},
 				"md_payment_types": "Payment Types",
 				"md_referral_sources": "Referral Sources",
+				"md_tasks_presets": {
+					"hourstype": "",
+					"memo": "",
+					"name": "",
+					"percent": ""
+				},
 				"messaginglabel": "Messaging Preset Label",
 				"messagingtext": "Messaging Preset Text",
 				"noteslabel": "Note Label",
@@ -374,6 +383,9 @@
 						"export": "CSI -> Export",
 						"page": "CSI -> Page"
 					},
+					"employee_teams": {
+						"page": ""
+					},
 					"employees": {
 						"page": "Employees -> List"
 					},
@@ -432,10 +444,15 @@
 					},
 					"timetickets": {
 						"edit": "Time Tickets -> Edit",
+						"editcommitted": "",
 						"enter": "Time Tickets -> Enter",
 						"list": "Time Tickets -> List",
 						"shiftedit": "Time Tickets -> Shift Edit"
 					},
+					"ttapprovals": {
+						"approve": "",
+						"view": ""
+					},
 					"users": {
 						"editaccess": "Users -> Edit access"
 					}
@@ -453,6 +470,8 @@
 					"federal_tax": "Federal Tax",
 					"federal_tax_itc": "Federal Tax Credit",
 					"gst_override": "GST Override Account #",
+					"invoiceexemptcode": "",
+					"itemexemptcode": "",
 					"la1": "LA1",
 					"la2": "LA2",
 					"la3": "LA3",
@@ -504,12 +523,12 @@
 					"dailyhrslimit": "Daily Incoming Hours Limit"
 				},
 				"ssbuckets": {
+					"color": "Job Color",
 					"gte": "Greater Than/Equal to (hrs)",
 					"id": "ID",
 					"label": "Label",
 					"lt": "Less than (hrs)",
-					"target": "Target (count)",
-					"color": "Job Color"
+					"target": "Target (count)"
 				},
 				"state": "Province/State",
 				"state_tax_id": "Provincial/State Tax ID (PST,  QST)",
@@ -575,6 +594,7 @@
 					"title": "DMS"
 				},
 				"emaillater": "Email Later",
+				"employee_teams": "",
 				"employees": "Employees",
 				"estimators": "Estimators",
 				"filehandlers": "File Handlers",
@@ -583,6 +603,7 @@
 				"jobstatuses": "Job Statuses",
 				"laborrates": "Labor Rates",
 				"licensing": "Licensing",
+				"md_tasks_presets": "",
 				"md_to_emails": "Preset To Emails",
 				"md_to_emails_emails": "Emails",
 				"messagingpresets": "Messaging Presets",
@@ -609,6 +630,7 @@
 				"speedprint": "Speed Print Configuration",
 				"ssbuckets": "Job Size Definitions",
 				"systemsettings": "System Settings",
+				"task-presets": "",
 				"workingdays": "Working Days"
 			},
 			"successes": {
@@ -908,6 +930,18 @@
 				"sent": "Email sent successfully."
 			}
 		},
+		"employee_teams": {
+			"actions": {
+				"new": "",
+				"newmember": ""
+			},
+			"fields": {
+				"active": "",
+				"employeeid": "",
+				"name": "",
+				"percentage": ""
+			}
+		},
 		"employees": {
 			"actions": {
 				"addvacation": "Add Vacation",
@@ -1147,6 +1181,30 @@
 				"updated": "Inventory line updated."
 			}
 		},
+		"job_payments": {
+			"buttons": {
+				"goback": "",
+				"proceedtopayment": "",
+				"refundpayment": ""
+			},
+			"notifications": {
+				"error": {
+					"description": "",
+					"title": ""
+				}
+			},
+			"titles": {
+				"amount": "",
+				"dateOfPayment": "",
+				"descriptions": "",
+				"payer": "",
+				"payername": "",
+				"paymentid": "",
+				"paymenttype": "",
+				"refundamount": "",
+				"transactionid": ""
+			}
+		},
 		"joblines": {
 			"actions": {
 				"converttolabor": "Convert amount to Labor.",
@@ -1379,7 +1437,7 @@
 				"ded_amt": "Deductible",
 				"ded_note": "Deductible Note",
 				"ded_status": "Deductible Status",
-				"depreciation_taxes": "Depreciation/Taxes",
+				"depreciation_taxes": "Betterment/Depreciation/Taxes",
 				"dms": {
 					"address": "Customer Address",
 					"amount": "Amount",
@@ -1579,6 +1637,7 @@
 				"scheddates": "Schedule Dates"
 			},
 			"labels": {
+				"act_price_ppc": "",
 				"actual_completion_inferred": "$t(jobs.fields.actual_completion) inferred using $t(jobs.fields.scheduled_completion).",
 				"actual_delivery_inferred": "$t(jobs.fields.actual_delivery) inferred using $t(jobs.fields.scheduled_delivery).",
 				"actual_in_inferred": "$t(jobs.fields.actual_in) inferred using $t(jobs.fields.scheduled_in).",
@@ -1715,6 +1774,7 @@
 					"partstotal": "This is the total of all parts and sublet amounts on the vehicle (some of these may require an in-house invoice).<br/>\nItems such as shop and paint materials, labor online lines, etc. are not included in this total.",
 					"totalreturns": "The total <b>retail</b> amount of returns created for this job."
 				},
+				"ppc": "",
 				"profileadjustments": "",
 				"prt_dsmk_total": "Line Item Adjustment",
 				"rates": "Rates",
@@ -1855,6 +1915,7 @@
 				"customers": "Customers",
 				"dashboard": "Dashboard",
 				"enterbills": "Enter Bills",
+				"entercardpayment": "",
 				"enterpayment": "Enter Payments",
 				"entertimeticket": "Enter Time Tickets",
 				"export": "Export",
@@ -1866,6 +1927,7 @@
 				"newjob": "Create New Job",
 				"owners": "Owners",
 				"parts-queue": "Parts Queue",
+				"paymentremindersms": "",
 				"phonebook": "Phonebook",
 				"productionboard": "Production Board - Visual",
 				"productionlist": "Production Board - List",
@@ -1891,6 +1953,7 @@
 				"shop_vendors": "Vendors",
 				"temporarydocs": "Temporary Documents",
 				"timetickets": "Time Tickets",
+				"ttapprovals": "",
 				"vehicles": "Vehicles"
 			},
 			"jobsactions": {
@@ -1974,6 +2037,16 @@
 				"critical": "Critical",
 				"private": "Private",
 				"text": "Contents",
+				"type": "Type",
+				"types": {
+					"customer": "Customer",
+					"general": "General",
+					"office": "Office",
+					"paint": "Paint",
+					"parts": "Parts",
+					"shop": "Shop",
+					"supplement": "Supplement"
+				},
 				"updatedat": "Updated At"
 			},
 			"labels": {
@@ -2144,10 +2217,13 @@
 				"new": "New Payment",
 				"signup": "Please contact support to sign up for electronic payments.",
 				"title": "Payments",
-				"totalpayments": "Total Payments"
+				"totalpayments": "Total Payments",
+				"markforexport": "Mark for Export",
+				"markforreexport": "Mark for Reexport"
 			},
 			"successes": {
 				"exported": "Payment(s) exported successfully.",
+				"reexported": "Payment Re-exported successfully",
 				"markexported": "Payment(s) marked exported.",
 				"payment": "Payment created successfully. ",
 				"stripe": "Credit card transaction charged successfully."
@@ -2364,6 +2440,7 @@
 						"qbo_usa": "QBO USA"
 					}
 				},
+				"cardcolor": "Card Colors",
 				"cardsettings": "Card Settings",
 				"clm_no": "Claim Number",
 				"comment": "Comment",
@@ -2374,6 +2451,7 @@
 				"ins_co_nm": "Insurance Company Name",
 				"jobdetail": "Job Details",
 				"laborhrs": "Labor Hours",
+				"legend": "Legend:",
 				"note": "Production Note",
 				"ownr_nm": "Owner Name",
 				"paintpriority": "P/P",
@@ -2386,9 +2464,7 @@
 				"sublets": "Sublets",
 				"totalhours": "Total Hrs ",
 				"touchtime": "T/T",
-				"viewname": "View Name",
-				"legend": "Legend:",
-				"cardcolor": "Card Colors"
+				"viewname": "View Name"
 			},
 			"successes": {
 				"removed": "Job removed from production."
@@ -2614,6 +2690,7 @@
 		},
 		"timetickets": {
 			"actions": {
+				"claimtasks": "",
 				"clockin": "Clock In",
 				"clockout": "Clock Out",
 				"enter": "Enter New Time Ticket",
@@ -2634,10 +2711,12 @@
 				"clockhours": "Clock Hours",
 				"clockoff": "Clock Off",
 				"clockon": "Clocked In",
+				"committed": "",
 				"cost_center": "Cost Center",
 				"date": "Ticket Date",
 				"efficiency": "Efficiency",
 				"employee": "Employee",
+				"employee_team": "",
 				"flat_rate": "Flat Rate?",
 				"memo": "Memo",
 				"productivehrs": "Productive Hours",
@@ -2724,6 +2803,7 @@
 				"shop-vendors": "Vendors",
 				"temporarydocs": "Temporary Documents",
 				"timetickets": "Time Tickets",
+				"ttapprovals": "",
 				"vehicle-details": "Vehicle: {{vehicle}}",
 				"vehicles": "Vehicles"
 			},
@@ -2769,9 +2849,15 @@
 			"shop_vendors": "Vendors | $t(titles.app)",
 			"temporarydocs": "Temporary Documents | $t(titles.app)",
 			"timetickets": "Time Tickets | $t(titles.app)",
+			"ttapprovals": "",
 			"vehicledetail": "Vehicle Details {{vehicle}} | $t(titles.app)",
 			"vehicles": "All Vehicles | $t(titles.app)"
 		},
+		"tt_approvals": {
+			"actions": {
+				"approveselected": ""
+			}
+		},
 		"user": {
 			"actions": {
 				"changepassword": "Change Password",

client/src/translations/es/common.json

@@ -63,6 +63,7 @@
 				"scheduledfor": "Cita programada para:",
 				"severalerrorsfound": "",
 				"smartscheduling": "",
+				"smspaymentreminder": "",
 				"suggesteddates": ""
 			},
 			"successes": {
@@ -103,6 +104,7 @@
 				"admin_jobunvoid": "",
 				"billposted": "",
 				"billupdated": "",
+				"failedpayment": "",
 				"jobassignmentchange": "",
 				"jobassignmentremoved": "",
 				"jobchecklist": "",
@@ -227,6 +229,7 @@
 		},
 		"bodyshop": {
 			"actions": {
+				"add_task_preset": "",
 				"addapptcolor": "",
 				"addbucket": "",
 				"addpartslocation": "",
@@ -339,6 +342,12 @@
 				},
 				"md_payment_types": "",
 				"md_referral_sources": "",
+				"md_tasks_presets": {
+					"hourstype": "",
+					"memo": "",
+					"name": "",
+					"percent": ""
+				},
 				"messaginglabel": "",
 				"messagingtext": "",
 				"noteslabel": "",
@@ -374,6 +383,9 @@
 						"export": "",
 						"page": ""
 					},
+					"employee_teams": {
+						"page": ""
+					},
 					"employees": {
 						"page": ""
 					},
@@ -432,10 +444,15 @@
 					},
 					"timetickets": {
 						"edit": "",
+						"editcommitted": "",
 						"enter": "",
 						"list": "",
 						"shiftedit": ""
 					},
+					"ttapprovals": {
+						"approve": "",
+						"view": ""
+					},
 					"users": {
 						"editaccess": ""
 					}
@@ -453,6 +470,8 @@
 					"federal_tax": "",
 					"federal_tax_itc": "",
 					"gst_override": "",
+					"invoiceexemptcode": "",
+					"itemexemptcode": "",
 					"la1": "",
 					"la2": "",
 					"la3": "",
@@ -504,6 +523,7 @@
 					"dailyhrslimit": ""
 				},
 				"ssbuckets": {
+					"color": "",
 					"gte": "",
 					"id": "",
 					"label": "",
@@ -574,6 +594,7 @@
 					"title": ""
 				},
 				"emaillater": "",
+				"employee_teams": "",
 				"employees": "",
 				"estimators": "",
 				"filehandlers": "",
@@ -582,6 +603,7 @@
 				"jobstatuses": "",
 				"laborrates": "",
 				"licensing": "",
+				"md_tasks_presets": "",
 				"md_to_emails": "",
 				"md_to_emails_emails": "",
 				"messagingpresets": "",
@@ -608,6 +630,7 @@
 				"speedprint": "",
 				"ssbuckets": "",
 				"systemsettings": "",
+				"task-presets": "",
 				"workingdays": ""
 			},
 			"successes": {
@@ -907,6 +930,18 @@
 				"sent": "Correo electrónico enviado con éxito."
 			}
 		},
+		"employee_teams": {
+			"actions": {
+				"new": "",
+				"newmember": ""
+			},
+			"fields": {
+				"active": "",
+				"employeeid": "",
+				"name": "",
+				"percentage": ""
+			}
+		},
 		"employees": {
 			"actions": {
 				"addvacation": "",
@@ -1146,6 +1181,30 @@
 				"updated": ""
 			}
 		},
+		"job_payments": {
+			"buttons": {
+				"goback": "",
+				"proceedtopayment": "",
+				"refundpayment": ""
+			},
+			"notifications": {
+				"error": {
+					"description": "",
+					"title": ""
+				}
+			},
+			"titles": {
+				"amount": "",
+				"dateOfPayment": "",
+				"descriptions": "",
+				"payer": "",
+				"payername": "",
+				"paymentid": "",
+				"paymenttype": "",
+				"refundamount": "",
+				"transactionid": ""
+			}
+		},
 		"joblines": {
 			"actions": {
 				"converttolabor": "",
@@ -1578,6 +1637,7 @@
 				"scheddates": ""
 			},
 			"labels": {
+				"act_price_ppc": "",
 				"actual_completion_inferred": "",
 				"actual_delivery_inferred": "",
 				"actual_in_inferred": "",
@@ -1714,6 +1774,7 @@
 					"partstotal": "",
 					"totalreturns": ""
 				},
+				"ppc": "",
 				"profileadjustments": "",
 				"prt_dsmk_total": "",
 				"rates": "Tarifas",
@@ -1854,6 +1915,7 @@
 				"customers": "Clientes",
 				"dashboard": "",
 				"enterbills": "",
+				"entercardpayment": "",
 				"enterpayment": "",
 				"entertimeticket": "",
 				"export": "",
@@ -1865,6 +1927,7 @@
 				"newjob": "",
 				"owners": "propietarios",
 				"parts-queue": "",
+				"paymentremindersms": "",
 				"phonebook": "",
 				"productionboard": "",
 				"productionlist": "",
@@ -1890,6 +1953,7 @@
 				"shop_vendors": "Vendedores",
 				"temporarydocs": "",
 				"timetickets": "",
+				"ttapprovals": "",
 				"vehicles": "Vehículos"
 			},
 			"jobsactions": {
@@ -1973,6 +2037,16 @@
 				"critical": "Crítico",
 				"private": "Privado",
 				"text": "Contenido",
+				"type": "",
+				"types": {
+					"customer": "",
+					"general": "",
+					"office": "",
+					"paint": "",
+					"parts": "",
+					"shop": "",
+					"supplement": ""
+				},
 				"updatedat": "Actualizado en"
 			},
 			"labels": {
@@ -2363,6 +2437,7 @@
 						"qbo_usa": ""
 					}
 				},
+				"cardcolor": "",
 				"cardsettings": "",
 				"clm_no": "",
 				"comment": "",
@@ -2373,6 +2448,7 @@
 				"ins_co_nm": "",
 				"jobdetail": "",
 				"laborhrs": "",
+				"legend": "",
 				"note": "",
 				"ownr_nm": "",
 				"paintpriority": "",
@@ -2611,6 +2687,7 @@
 		},
 		"timetickets": {
 			"actions": {
+				"claimtasks": "",
 				"clockin": "",
 				"clockout": "",
 				"enter": "",
@@ -2631,10 +2708,12 @@
 				"clockhours": "",
 				"clockoff": "",
 				"clockon": "",
+				"committed": "",
 				"cost_center": "",
 				"date": "",
 				"efficiency": "",
 				"employee": "",
+				"employee_team": "",
 				"flat_rate": "",
 				"memo": "",
 				"productivehrs": "",
@@ -2721,6 +2800,7 @@
 				"shop-vendors": "",
 				"temporarydocs": "",
 				"timetickets": "",
+				"ttapprovals": "",
 				"vehicle-details": "",
 				"vehicles": ""
 			},
@@ -2766,9 +2846,15 @@
 			"shop_vendors": "Vendedores | $t(titles.app)",
 			"temporarydocs": "",
 			"timetickets": "",
+			"ttapprovals": "",
 			"vehicledetail": "Detalles del vehículo {{vehicle}} | $t(titles.app)",
 			"vehicles": "Todos los vehiculos | $t(titles.app)"
 		},
+		"tt_approvals": {
+			"actions": {
+				"approveselected": ""
+			}
+		},
 		"user": {
 			"actions": {
 				"changepassword": "",

client/src/translations/fr/common.json

@@ -63,6 +63,7 @@
 				"scheduledfor": "Rendez-vous prévu pour:",
 				"severalerrorsfound": "",
 				"smartscheduling": "",
+				"smspaymentreminder": "",
 				"suggesteddates": ""
 			},
 			"successes": {
@@ -103,6 +104,7 @@
 				"admin_jobunvoid": "",
 				"billposted": "",
 				"billupdated": "",
+				"failedpayment": "",
 				"jobassignmentchange": "",
 				"jobassignmentremoved": "",
 				"jobchecklist": "",
@@ -227,6 +229,7 @@
 		},
 		"bodyshop": {
 			"actions": {
+				"add_task_preset": "",
 				"addapptcolor": "",
 				"addbucket": "",
 				"addpartslocation": "",
@@ -339,6 +342,12 @@
 				},
 				"md_payment_types": "",
 				"md_referral_sources": "",
+				"md_tasks_presets": {
+					"hourstype": "",
+					"memo": "",
+					"name": "",
+					"percent": ""
+				},
 				"messaginglabel": "",
 				"messagingtext": "",
 				"noteslabel": "",
@@ -374,6 +383,9 @@
 						"export": "",
 						"page": ""
 					},
+					"employee_teams": {
+						"page": ""
+					},
 					"employees": {
 						"page": ""
 					},
@@ -432,10 +444,15 @@
 					},
 					"timetickets": {
 						"edit": "",
+						"editcommitted": "",
 						"enter": "",
 						"list": "",
 						"shiftedit": ""
 					},
+					"ttapprovals": {
+						"approve": "",
+						"view": ""
+					},
 					"users": {
 						"editaccess": ""
 					}
@@ -453,6 +470,8 @@
 					"federal_tax": "",
 					"federal_tax_itc": "",
 					"gst_override": "",
+					"invoiceexemptcode": "",
+					"itemexemptcode": "",
 					"la1": "",
 					"la2": "",
 					"la3": "",
@@ -504,6 +523,7 @@
 					"dailyhrslimit": ""
 				},
 				"ssbuckets": {
+					"color": "",
 					"gte": "",
 					"id": "",
 					"label": "",
@@ -574,6 +594,7 @@
 					"title": ""
 				},
 				"emaillater": "",
+				"employee_teams": "",
 				"employees": "",
 				"estimators": "",
 				"filehandlers": "",
@@ -582,6 +603,7 @@
 				"jobstatuses": "",
 				"laborrates": "",
 				"licensing": "",
+				"md_tasks_presets": "",
 				"md_to_emails": "",
 				"md_to_emails_emails": "",
 				"messagingpresets": "",
@@ -608,6 +630,7 @@
 				"speedprint": "",
 				"ssbuckets": "",
 				"systemsettings": "",
+				"task-presets": "",
 				"workingdays": ""
 			},
 			"successes": {
@@ -907,6 +930,18 @@
 				"sent": "E-mail envoyé avec succès."
 			}
 		},
+		"employee_teams": {
+			"actions": {
+				"new": "",
+				"newmember": ""
+			},
+			"fields": {
+				"active": "",
+				"employeeid": "",
+				"name": "",
+				"percentage": ""
+			}
+		},
 		"employees": {
 			"actions": {
 				"addvacation": "",
@@ -1146,6 +1181,30 @@
 				"updated": ""
 			}
 		},
+		"job_payments": {
+			"buttons": {
+				"goback": "",
+				"proceedtopayment": "",
+				"refundpayment": ""
+			},
+			"notifications": {
+				"error": {
+					"description": "",
+					"title": ""
+				}
+			},
+			"titles": {
+				"amount": "",
+				"dateOfPayment": "",
+				"descriptions": "",
+				"payer": "",
+				"payername": "",
+				"paymentid": "",
+				"paymenttype": "",
+				"refundamount": "",
+				"transactionid": ""
+			}
+		},
 		"joblines": {
 			"actions": {
 				"converttolabor": "",
@@ -1578,6 +1637,7 @@
 				"scheddates": ""
 			},
 			"labels": {
+				"act_price_ppc": "",
 				"actual_completion_inferred": "",
 				"actual_delivery_inferred": "",
 				"actual_in_inferred": "",
@@ -1714,6 +1774,7 @@
 					"partstotal": "",
 					"totalreturns": ""
 				},
+				"ppc": "",
 				"profileadjustments": "",
 				"prt_dsmk_total": "",
 				"rates": "Les taux",
@@ -1854,6 +1915,7 @@
 				"customers": "Les clients",
 				"dashboard": "",
 				"enterbills": "",
+				"entercardpayment": "",
 				"enterpayment": "",
 				"entertimeticket": "",
 				"export": "",
@@ -1865,6 +1927,7 @@
 				"newjob": "",
 				"owners": "Propriétaires",
 				"parts-queue": "",
+				"paymentremindersms": "",
 				"phonebook": "",
 				"productionboard": "",
 				"productionlist": "",
@@ -1890,6 +1953,7 @@
 				"shop_vendors": "Vendeurs",
 				"temporarydocs": "",
 				"timetickets": "",
+				"ttapprovals": "",
 				"vehicles": "Véhicules"
 			},
 			"jobsactions": {
@@ -1973,6 +2037,16 @@
 				"critical": "Critique",
 				"private": "privé",
 				"text": "Contenu",
+				"type": "",
+				"types": {
+					"customer": "",
+					"general": "",
+					"office": "",
+					"paint": "",
+					"parts": "",
+					"shop": "",
+					"supplement": ""
+				},
 				"updatedat": "Mis à jour à"
 			},
 			"labels": {
@@ -2363,6 +2437,7 @@
 						"qbo_usa": ""
 					}
 				},
+				"cardcolor": "",
 				"cardsettings": "",
 				"clm_no": "",
 				"comment": "",
@@ -2373,6 +2448,7 @@
 				"ins_co_nm": "",
 				"jobdetail": "",
 				"laborhrs": "",
+				"legend": "",
 				"note": "",
 				"ownr_nm": "",
 				"paintpriority": "",
@@ -2611,6 +2687,7 @@
 		},
 		"timetickets": {
 			"actions": {
+				"claimtasks": "",
 				"clockin": "",
 				"clockout": "",
 				"enter": "",
@@ -2631,10 +2708,12 @@
 				"clockhours": "",
 				"clockoff": "",
 				"clockon": "",
+				"committed": "",
 				"cost_center": "",
 				"date": "",
 				"efficiency": "",
 				"employee": "",
+				"employee_team": "",
 				"flat_rate": "",
 				"memo": "",
 				"productivehrs": "",
@@ -2721,6 +2800,7 @@
 				"shop-vendors": "",
 				"temporarydocs": "",
 				"timetickets": "",
+				"ttapprovals": "",
 				"vehicle-details": "",
 				"vehicles": ""
 			},
@@ -2766,9 +2846,15 @@
 			"shop_vendors": "Vendeurs | $t(titles.app)",
 			"temporarydocs": "",
 			"timetickets": "",
+			"ttapprovals": "",
 			"vehicledetail": "Détails du véhicule {{vehicle} | $t(titles.app)",
 			"vehicles": "Tous les véhicules | $t(titles.app)"
 		},
+		"tt_approvals": {
+			"actions": {
+				"approveselected": ""
+			}
+		},
 		"user": {
 			"actions": {
 				"changepassword": "",

hasura/metadata/tables.yaml

@@ -941,6 +941,7 @@
           - md_referral_sources
           - md_responsibility_centers
           - md_ro_statuses
+          - md_tasks_presets
           - md_to_emails
           - messagingservicesid
           - pbs_configuration
@@ -1038,6 +1039,7 @@
           - md_referral_sources
           - md_responsibility_centers
           - md_ro_statuses
+          - md_tasks_presets
           - md_to_emails
           - pbs_configuration
           - phone
@@ -4331,6 +4333,7 @@
           - jobid
           - private
           - text
+          - type
           - updated_at
   select_permissions:
     - role: user
@@ -4344,6 +4347,7 @@
           - jobid
           - private
           - text
+          - type
           - updated_at
         filter:
           job:
@@ -4367,6 +4371,7 @@
           - jobid
           - private
           - text
+          - type
           - updated_at
         filter:
           job:

hasura/migrations/1684251223317_alter_table_public_bodyshops_add_column_md_tasks_presets/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "md_tasks_presets" jsonb
+--  not null default jsonb_build_object();

hasura/migrations/1684251223317_alter_table_public_bodyshops_add_column_md_tasks_presets/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "md_tasks_presets" jsonb
+ not null default jsonb_build_object();

hasura/migrations/1684353031975_alter_table_public_notes_add_column_type/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."notes" add column "type" text
+--  not null default 'general';

hasura/migrations/1684353031975_alter_table_public_notes_add_column_type/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."notes" add column "type" text
+ not null default 'general';

server/data/autohouse.js

@@ -792,10 +792,11 @@ const CreateCosts = (job) => {
           job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
         ].add(
           Dinero({
-            amount:
+            amount: Math.round(
               (job.bodyshop.jc_hourly_rates &&
                 job.bodyshop.jc_hourly_rates.mapa * 100) ||
-              0,
+                0
+            ),
           }).multiply(job.job_totals.rates.mapa.hours)
         );
       }
@@ -806,10 +807,11 @@ const CreateCosts = (job) => {
         job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
       ].add(
         Dinero({
-          amount:
+          amount: Math.round(
             (job.bodyshop.jc_hourly_rates &&
               job.bodyshop.jc_hourly_rates.mapa * 100) ||
-            0,
+              0
+          ),
         }).multiply(job.job_totals.rates.mapa.hours)
       );
     }
@@ -829,10 +831,11 @@ const CreateCosts = (job) => {
       job.bodyshop.md_responsibility_centers.defaults.costs.MASH
     ].add(
       Dinero({
-        amount:
+        amount: Math.round(
           (job.bodyshop.jc_hourly_rates &&
             job.bodyshop.jc_hourly_rates.mash * 100) ||
-          0,
+            0
+        ),
       }).multiply(job.job_totals.rates.mash.hours)
     );
   }

server/job/job-costing.js

@@ -642,10 +642,11 @@ function GenerateCostingData(job) {
           job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
         ].add(
           Dinero({
-            amount:
+            amount: Math.round(
               (job.bodyshop.jc_hourly_rates &&
                 job.bodyshop.jc_hourly_rates.mapa * 100) ||
-              0,
+                0
+            ),
           }).multiply(materialsHours.mapaHrs)
         );
       }
@@ -656,10 +657,11 @@ function GenerateCostingData(job) {
         job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
       ].add(
         Dinero({
-          amount:
+          amount: Math.round(
             (job.bodyshop.jc_hourly_rates &&
               job.bodyshop.jc_hourly_rates.mapa * 100) ||
-            0,
+              0
+          ),
         }).multiply(materialsHours.mapaHrs)
       );
     }
@@ -680,10 +682,11 @@ function GenerateCostingData(job) {
       job.bodyshop.md_responsibility_centers.defaults.costs.MASH
     ].add(
       Dinero({
-        amount:
+        amount: Math.round(
           (job.bodyshop.jc_hourly_rates &&
             job.bodyshop.jc_hourly_rates.mash * 100) ||
-          0,
+            0
+        ),
       }).multiply(materialsHours.mashHrs)
     );
   }
@@ -840,7 +843,9 @@ function GenerateCostingData(job) {
   //Push adjustments to bottom line.
   if (job.adjustment_bottom_line) {
     //Add to totals.
-    const Adjustment = Dinero({ amount: job.adjustment_bottom_line * 100 }); //Need to invert, since this is being assigned as a cost.
+    const Adjustment = Dinero({
+      amount: Math.round(job.adjustment_bottom_line * 100),
+    }); //Need to invert, since this is being assigned as a cost.
     summaryData.totalLaborSales = summaryData.totalLaborSales.add(Adjustment);
     summaryData.totalSales = summaryData.totalSales.add(Adjustment);
     //Add to lines.