From 818e0679d9111d6355568bed08de38d279ec5fb4 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 8 Nov 2022 13:36:54 -0800 Subject: [PATCH 1/6] Update AP posting form validation. --- .../dms-allocations-summary-ap.component.jsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx b/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx index 21281aa93..1da53e3ba 100644 --- a/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx +++ b/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx @@ -140,7 +140,10 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) { > - From 928673691b1c399f5d75d11e8a35804ccca6f933 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 8 Nov 2022 14:22:03 -0800 Subject: [PATCH 2/6] Updated header to remove language selector. --- .../components/header/header.component.jsx | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx index 7da393683..1ed3f526d 100644 --- a/client/src/components/header/header.component.jsx +++ b/client/src/components/header/header.component.jsx @@ -12,7 +12,7 @@ import Icon, { FileAddFilled, FileAddOutlined, FileFilled, - GlobalOutlined, + //GlobalOutlined, HomeFilled, ImportOutlined, LineChartOutlined, @@ -374,25 +374,27 @@ function Header({ {t("menus.currentuser.profile")} - - - {t("menus.currentuser.languageselector")} - - } - > - - {t("general.languages.english")} - - - {t("general.languages.french")} - - - {t("general.languages.spanish")} - - + { + // + // + // {t("menus.currentuser.languageselector")} + // + // } + // > + // + // {t("general.languages.english")} + // + // + // {t("general.languages.french")} + // + // + // {t("general.languages.spanish")} + // + // + } }> {recentItems.map((i, idx) => ( From 83626d83def3209ec47973281bc347c498048832 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Wed, 9 Nov 2022 08:16:44 -0800 Subject: [PATCH 3/6] IO-2100 Add last 3 months to date range picker. --- client/src/utils/DatePickerRanges.js | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/utils/DatePickerRanges.js b/client/src/utils/DatePickerRanges.js index d2c377a81..812ef1428 100644 --- a/client/src/utils/DatePickerRanges.js +++ b/client/src/utils/DatePickerRanges.js @@ -22,5 +22,6 @@ const range = { moment().startOf("quarter"), moment().startOf("quarter").add(1, "quarter").subtract(1, "day"), ], + "Last 3 Months": [moment().add(-3, "months"), moment()], }; export default range; From abac60a3167c8763dbdfee710cd2f138c8ae1a66 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Wed, 9 Nov 2022 08:59:51 -0800 Subject: [PATCH 4/6] IO-2100 Update label for updated date range picker. --- client/src/utils/DatePickerRanges.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/utils/DatePickerRanges.js b/client/src/utils/DatePickerRanges.js index 812ef1428..aeed206c5 100644 --- a/client/src/utils/DatePickerRanges.js +++ b/client/src/utils/DatePickerRanges.js @@ -22,6 +22,6 @@ const range = { moment().startOf("quarter"), moment().startOf("quarter").add(1, "quarter").subtract(1, "day"), ], - "Last 3 Months": [moment().add(-3, "months"), moment()], + "Last 90 Days": [moment().add(-90, "days"), moment()], }; export default range; From b8d3c5e36c9feec6cbd6959d120b0e1622e27e45 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Wed, 9 Nov 2022 09:18:20 -0800 Subject: [PATCH 5/6] IO-2097 Update query on job card details to include remove = true filter. --- client/src/graphql/jobs.queries.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js index 4bf702cee..33363a5d3 100644 --- a/client/src/graphql/jobs.queries.js +++ b/client/src/graphql/jobs.queries.js @@ -855,7 +855,7 @@ export const QUERY_JOB_CARD_DETAILS = gql` count status } - joblines { + joblines(where: { removed: { _eq: false } }) { id mod_lbr_ty mod_lb_hrs From 77bfa90b59ff8d3c9c528124693e2d6e840c4675 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Wed, 9 Nov 2022 09:28:56 -0800 Subject: [PATCH 6/6] IO-2062 Update handling of negative EFT amounts for ICBC. --- .../ca-bc-etf-table-modal.container.jsx | 8 +++++++- client/src/translations/en_us/common.json | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table-modal.container.jsx b/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table-modal.container.jsx index 8f97a3008..872d2aec3 100644 --- a/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table-modal.container.jsx +++ b/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table-modal.container.jsx @@ -39,7 +39,13 @@ export function ContractsFindModalContainer({ if (!claim || !shortclaim) return; const trimmedShortClaim = shortclaim.trim(); // const trimmedClaim = claim.trim(); - claimNumbers.push({ claim: trimmedShortClaim, amount }); + if (amount.slice(-1) === "-") { + } + + claimNumbers.push({ + claim: trimmedShortClaim, + amount: amount.slice(-1) === "-" ? parseFloat(amount) * -1 : amount, + }); }); await GenerateDocument( diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 430e8b3c4..9c3ae03f0 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -2099,7 +2099,7 @@ }, "labels": { "balance": "Balance", - "ca_bc_etf_table": "ICBC ETF Table Converter", + "ca_bc_etf_table": "ICBC EFT Table Converter", "customer": "Customer", "edit": "Edit Payment", "electronicpayment": "Use Electronic Payment Processing?", @@ -2275,7 +2275,7 @@ "title": "Print Center" }, "payments": { - "ca_bc_etf_table": "ICBC ETF Table", + "ca_bc_etf_table": "ICBC EFT Table", "exported_payroll": "Payroll Table" }, "special": {