diff --git a/client/src/assets/promanager/ProManagerLogo.gif b/client/src/assets/promanager/ProManagerLogo.gif new file mode 100644 index 000000000..0458657f0 Binary files /dev/null and b/client/src/assets/promanager/ProManagerLogo.gif differ diff --git a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx index 019de445c..84281c109 100644 --- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx +++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx @@ -239,6 +239,7 @@ function BillEnterModalContainer({ if (markPolReceived && markPolReceived.length > 0) { const r2 = await updatePartsOrderLines({ variables: {partsLineIds: markPolReceived.map((p) => p.id)}, + refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID" ], }); if (!!r2.errors) { setLoading(false); diff --git a/client/src/components/jobs-close-auto-allocate/jobs-close-auto-allocate.component.jsx b/client/src/components/jobs-close-auto-allocate/jobs-close-auto-allocate.component.jsx index 346c88d55..6a4a0d67d 100644 --- a/client/src/components/jobs-close-auto-allocate/jobs-close-auto-allocate.component.jsx +++ b/client/src/components/jobs-close-auto-allocate/jobs-close-auto-allocate.component.jsx @@ -6,6 +6,7 @@ import {connect} from "react-redux"; import {createStructuredSelector} from "reselect"; import {logImEXEvent} from "../../firebase/firebase.utils"; import {selectBodyshop} from "../../redux/user/user.selectors"; +import InstanceRenderManager from "../../utils/instanceRenderMgr"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, @@ -29,19 +30,25 @@ export function JobsCloseAutoAllocate({bodyshop, joblines, form, disabled}) { ret.profitcenter_labor = null; } //Verify that this is also manually updated in server/job-costing - if (!jl.part_type && !jl.mod_lbr_ty) { - const lineDesc = jl.line_desc ? jl.line_desc.toLowerCase() : ""; - if (lineDesc.includes("shop materials")) { - ret.profitcenter_part = defaults.profits["MASH"]; - } else if (lineDesc.includes("paint/materials")) { - ret.profitcenter_part = defaults.profits["MAPA"]; - } else if (lineDesc.includes("ats amount")) { - ret.profitcenter_part = defaults.profits["ATS"]; - } else if (jl.act_price > 0) { - ret.profitcenter_part = defaults.profits["PAO"]; - } else { - ret.profitcenter_part = null; - } + if ( + InstanceRenderManager({ + imex: !jl.part_type && !jl.mod_lbr_ty, + rome: !ret.profitcenter_part, + promanager: 'USE_ROME', + }) + ) { + const lineDesc = jl.line_desc ? jl.line_desc.toLowerCase() : ''; + if (lineDesc.includes('shop materials')) { + ret.profitcenter_part = defaults.profits['MASH']; + } else if (lineDesc.includes('paint/materials')) { + ret.profitcenter_part = defaults.profits['MAPA']; + } else if (lineDesc.includes('ats amount')) { + ret.profitcenter_part = defaults.profits['ATS']; + } else if (jl.act_price > 0) { + ret.profitcenter_part = defaults.profits['PAO']; + } else { + ret.profitcenter_part = null; + } } return ret; }), diff --git a/client/src/components/sign-in-form/sign-in-form.component.jsx b/client/src/components/sign-in-form/sign-in-form.component.jsx index 2b4376b86..100caa623 100644 --- a/client/src/components/sign-in-form/sign-in-form.component.jsx +++ b/client/src/components/sign-in-form/sign-in-form.component.jsx @@ -8,6 +8,7 @@ import {Link, useLocation, useNavigate} from "react-router-dom"; import {createStructuredSelector} from "reselect"; import RomeLogo from "../../assets/RomeOnlineBlue.png"; import ImEXOnlineLogo from "../../assets/logo192.png"; +import ProManagerLogo from '../../assets/promanager/ProManagerLogo.gif'; import InstanceRenderManager from '../../utils/instanceRenderMgr'; import {emailSignInStart, sendPasswordReset,} from "../../redux/user/user.actions"; import {selectCurrentUser, selectLoginLoading, selectSignInError,} from "../../redux/user/user.selectors"; @@ -53,9 +54,9 @@ export function SignInComponent({ return (
- {InstanceRenderManager({imex:t("titles.imexonline"), + {InstanceRenderManager({imex:t("titles.imexonline"), { - InstanceRenderManager({imex: t("titles.imexonline"), rome: t("titles.romeonline"), promanager:t("titles.promanager")}) + InstanceRenderManager({imex: t("titles.imexonline"), rome: t("titles.romeonline"), promanager:null}) }
diff --git a/server/cdk/cdk-job-export.js b/server/cdk/cdk-job-export.js index 006f8cf96..1dda38ac1 100644 --- a/server/cdk/cdk-job-export.js +++ b/server/cdk/cdk-job-export.js @@ -12,6 +12,7 @@ const CdkBase = require("../web-sockets/web-socket"); const CdkWsdl = require("./cdk-wsdl").default; const {CDK_CREDENTIALS, CheckCdkResponseForError} = require("./cdk-wsdl"); const CalcualteAllocations = require("./cdk-calculate-allocations").default; +const InstanceMgr = require("../utils/instanceMgr").default; const moment = require("moment-timezone"); @@ -599,12 +600,11 @@ async function InsertDmsCustomer(socket, newCustomerNumber) { country: socket.JobData.ownr_ctry && socket.JobData.ownr_ctry.replace(replaceSpecialRegex, ""), - postalCode: - socket.JobData.ownr_zip && - socket.JobData.ownr_zip //TODO Need to remove for US Based customers. - .toUpperCase() - .replace(/\W/g, "") - .replace(/(...)/, "$1 "), + postalCode: InstanceMgr({imex: socket.JobData.ownr_zip && + socket.JobData.ownr_zip //TODO Need to remove for US Based customers. + .toUpperCase() + .replace(/\W/g, "") + .replace(/(...)/, "$1 "), rome: socket.JobData.ownr_zip }), stateOrProvince: socket.JobData.ownr_st && socket.JobData.ownr_st.replace(replaceSpecialRegex, ""),