From dca587d6e07c5527735d8334c5d9a824633db6da Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Mon, 1 Apr 2024 13:20:30 -0700 Subject: [PATCH 1/6] IO-2730 Bill Search Result Align Signed-off-by: Allan Carr --- client/src/pages/bills/bills.page.component.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/pages/bills/bills.page.component.jsx b/client/src/pages/bills/bills.page.component.jsx index 43e199ae5..d9d47f936 100644 --- a/client/src/pages/bills/bills.page.component.jsx +++ b/client/src/pages/bills/bills.page.component.jsx @@ -241,7 +241,7 @@ export function BillsListPage({ extra={ {search.search && ( - <> + {t("general.labels.searchresults", { search: search.search })} @@ -254,7 +254,7 @@ export function BillsListPage({ > {t("general.actions.clear")} - + )} )} - + } > {!context || (context && !context.id) ? null : ( From 04315a904579d05a24a86f847f203d94f13cea7f Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Mon, 1 Apr 2024 14:07:58 -0700 Subject: [PATCH 3/6] IO-2563 Repair LIne Expander Bills Translation Signed-off-by: Allan Carr --- .../job-detail-lines/job-lines-expander.component.jsx | 2 +- client/src/translations/en_us/common.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/src/components/job-detail-lines/job-lines-expander.component.jsx b/client/src/components/job-detail-lines/job-lines-expander.component.jsx index 06e00c729..9c5fd608e 100644 --- a/client/src/components/job-detail-lines/job-lines-expander.component.jsx +++ b/client/src/components/job-detail-lines/job-lines-expander.component.jsx @@ -84,7 +84,7 @@ export default function JobLinesExpander({ jobline, jobid }) { )) ) : ( - {t("parts_orders.labels.notyetordered")} + {t("bills.labels.nobilllines")} )} diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 210f04c0f..447cb881d 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -217,8 +217,9 @@ "markexported": "Mark Exported", "markforreexport": "Mark for Re-export", "new": "New Bill", + "nobilllines": "This part has not yet been recieved.", "noneselected": "No bill selected.", - "onlycmforinvoiced": "Only credit memos can be entered for any Job that has been invoiced, exported, or voided.", + "onlycmforinvoiced": "Only credit memos can be entered for any Job that has been invoiced, exported, or voided.", "printlabels": "Print Labels", "retailtotal": "Bills Retail Total", "savewithdiscrepancy": "You are about to save this bill with a discrepancy. The system will continue to use the calculated amount using the bill lines. Press cancel to return to the bill.", From 817c41afb98e6c7a2c9900514f1c55b7aaae76e8 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Mon, 1 Apr 2024 14:27:25 -0700 Subject: [PATCH 4/6] IO-2552 PVRT Button Spacing and Alignment Signed-off-by: Allan Carr --- .../ca-bc-pvrt-calculator.component.jsx | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx b/client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx index 0a1476ee5..887ece76b 100644 --- a/client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx +++ b/client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx @@ -1,8 +1,8 @@ -import React, { useState } from "react"; -import { Button, Form, InputNumber, Popover } from "antd"; -import { logImEXEvent } from "../../firebase/firebase.utils"; -import { useTranslation } from "react-i18next"; import { CalculatorFilled } from "@ant-design/icons"; +import { Button, Form, InputNumber, Popover, Space } from "antd"; +import React, { useState } from "react"; +import { useTranslation } from "react-i18next"; +import { logImEXEvent } from "../../firebase/firebase.utils"; export default function CABCpvrtCalculator({ disabled, form }) { const [visibility, setVisibility] = useState(false); @@ -26,10 +26,14 @@ export default function CABCpvrtCalculator({ disabled, form }) { - - +
+ + + + +
); From 7d1910086eed0cb6406595106f0ce0fc5f569025 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Tue, 2 Apr 2024 10:39:41 -0700 Subject: [PATCH 5/6] IO-2553 Unsaved Changes on Edit CC Signed-off-by: Allan Carr --- .../courtesy-car-form/courtesy-car-form.component.jsx | 10 +++++++--- client/src/graphql/courtesy-car.queries.js | 2 +- .../courtesy-car-create.page.container.jsx | 6 +++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx b/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx index f9a32dfee..6c223353a 100644 --- a/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx +++ b/client/src/components/courtesy-car-form/courtesy-car-form.component.jsx @@ -10,11 +10,15 @@ import CourtesyCarFuelSlider from "../courtesy-car-fuel-select/courtesy-car-fuel import CourtesyCarReadiness from "../courtesy-car-readiness-select/courtesy-car-readiness-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"; -export default function CourtesyCarCreateFormComponent({ form, saveLoading }) { +export default function CourtesyCarCreateFormComponent({ + form, + saveLoading, + newCC, +}) { const { t } = useTranslation(); const client = useApolloClient(); @@ -33,7 +37,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) { } /> - {/* */} + {newCC ? null : } - + ); From 37196e65c3ec98219cf4d85b2a4980ae2231badd Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Wed, 3 Apr 2024 09:46:52 -0700 Subject: [PATCH 6/6] Add schema changes for RO Guard to bodyshop table. --- hasura/metadata/tables.yaml | 2 ++ .../down.sql | 4 ++++ .../up.sql | 2 ++ 3 files changed, 8 insertions(+) create mode 100644 hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/down.sql create mode 100644 hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/up.sql diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index 38dff43fa..7a9de6b10 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -969,6 +969,7 @@ - md_rbac - md_referral_sources - md_responsibility_centers + - md_ro_guard - md_ro_statuses - md_tasks_presets - md_to_emails @@ -1068,6 +1069,7 @@ - md_rbac - md_referral_sources - md_responsibility_centers + - md_ro_guard - md_ro_statuses - md_tasks_presets - md_to_emails diff --git a/hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/down.sql b/hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/down.sql new file mode 100644 index 000000000..8f554a895 --- /dev/null +++ b/hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/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_ro_guard" jsonb +-- null default jsonb_build_object(); diff --git a/hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/up.sql b/hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/up.sql new file mode 100644 index 000000000..a932a2446 --- /dev/null +++ b/hasura/migrations/1712162752434_alter_table_public_bodyshops_add_column_md_ro_guard/up.sql @@ -0,0 +1,2 @@ +alter table "public"."bodyshops" add column "md_ro_guard" jsonb + null default jsonb_build_object();