Merge branch 'release/2023-05-19' into feature/america

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>