admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/2022-11-10 (pull request #622)

Browse Source 
Release/2022 11 10
This commit is contained in:
Patrick Fic
2022-11-10 00:23:10 +00:00
parent cf7a1b0168 77bfa90b59
commit de34cbd937
6 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table-modal.container.jsx
View File

@@ -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(

5
client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx
View File

@@ -140,7 +140,10 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
>
<Input />
</Form.Item>
<Button disabled={!socket.allocationsSummary} htmlType="submit">
<Button
disabled={!allocationsSummary || allocationsSummary.length === 0}
htmlType="submit"
>
{t("jobs.actions.dms.post")}
</Button>
</Form>

42
client/src/components/header/header.component.jsx
View File

@@ -12,7 +12,7 @@ import Icon, {
FileAddFilled,
FileAddOutlined,
FileFilled,
GlobalOutlined,
//GlobalOutlined,
HomeFilled,
ImportOutlined,
LineChartOutlined,
@@ -374,25 +374,27 @@ function Header({
<Menu.Item key="profile">
<Link to="/manage/profile">{t("menus.currentuser.profile")}</Link>
</Menu.Item>
<Menu.SubMenu
key="langselecter"
title={
<span>
<GlobalOutlined />
<span>{t("menus.currentuser.languageselector")}</span>
</span>
}
>
<Menu.Item actiontype="lang-select" key="en-US">
{t("general.languages.english")}
</Menu.Item>
<Menu.Item actiontype="lang-select" key="fr-CA">
{t("general.languages.french")}
</Menu.Item>
<Menu.Item actiontype="lang-select" key="es-MX">
{t("general.languages.spanish")}
</Menu.Item>
</Menu.SubMenu>
{
// <Menu.SubMenu
// key="langselecter"
// title={
// <span>
// <GlobalOutlined />
// <span>{t("menus.currentuser.languageselector")}</span>
// </span>
// }
// >
// <Menu.Item actiontype="lang-select" key="en-US">
// {t("general.languages.english")}
// </Menu.Item>
// <Menu.Item actiontype="lang-select" key="fr-CA">
// {t("general.languages.french")}
// </Menu.Item>
// <Menu.Item actiontype="lang-select" key="es-MX">
// {t("general.languages.spanish")}
// </Menu.Item>
// </Menu.SubMenu>
}
</Menu.SubMenu>
<Menu.SubMenu key="recent" title={<ClockCircleFilled />}>
{recentItems.map((i, idx) => (

2
client/src/graphql/jobs.queries.js
View File

@@ -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

4
client/src/translations/en_us/common.json
View File

@@ -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": {

1
client/src/utils/DatePickerRanges.js
View File

@@ -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;