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/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 }) { > - 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) => ( 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 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": { diff --git a/client/src/utils/DatePickerRanges.js b/client/src/utils/DatePickerRanges.js index d2c377a81..aeed206c5 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 90 Days": [moment().add(-90, "days"), moment()], }; export default range;