RO into IO merge as of 02/05/2024.

This commit is contained in:
Patrick Fic
2024-02-12 12:22:05 -08:00
211 changed files with 31134 additions and 25729 deletions

View File

@@ -43,6 +43,7 @@ import {signOutStart} from "../../redux/user/user.actions";
import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
import {FiLogOut} from "react-icons/fi";
import {checkBeta, handleBeta, setBeta} from "../../utils/betaHandler";
import InstanceRenderManager from "../../utils/instanceRenderMgr";
const mapStateToProps = createStructuredSelector({
currentUser: selectCurrentUser,
@@ -174,8 +175,20 @@ function Header({
key: 'timetickets',
icon: <FieldTimeOutlined/>,
label: (<Link to="/manage/timetickets">{t("menus.header.timetickets")}</Link>)
},
{
});
if (bodyshop?.md_tasks_presets?.use_approvals) {
accountingChildren.push({
key: 'ttapprovals',
icon: <FieldTimeOutlined/>,
label:
<Link to="/manage/ttapprovals">
{t("menus.header.ttapprovals")}
</Link>
});
}
accountingChildren.push({
key: 'entertimetickets',
icon: <Icon component={GiPlayerTime}/>,
label: t("menus.header.entertimeticket"),
@@ -421,17 +434,19 @@ function Header({
icon: <Icon component={QuestionCircleFilled}/>,
label: t("menus.header.help"),
onClick: () => {
window.open("https://help.imex.online/", "_blank");
}
},
{
key: 'rescue',
icon: <Icon component={CarFilled}/>,
label: t("menus.header.rescueme"),
onClick: () => {
window.open("https://imexrescue.com/", "_blank");
window.open(InstanceRenderManager({imex:"https://help.imex.online/",rome: "https://rometech.com//", promanager:"https://web-est.com" })
, "_blank");
}
},
// {
// key: 'rescue',
// icon: <Icon component={CarFilled}/>,
// label: t("menus.header.rescueme"),
// onClick: () => {
// window.open("https://imexrescue.com/", "_blank");
// }
// },
{
key: 'shiftclock',
icon: <Icon component={GiPlayerTime}/>,
@@ -487,9 +502,9 @@ function Header({
key: 'beta-switch',
style: {marginLeft: 'auto'},
label: (
<Tooltip title="A more modern ImEX Online is ready for you to try! You can switch back at any time.">
<Tooltip title={`A more modern ${InstanceRenderManager({imex: 'ImEX Online', rome: "Rome Online"})} is ready for you to try! You can switch back at any time.`}>
<InfoCircleOutlined/>
<span style={{marginRight: 8}}>Try the new ImEX Online</span>
<span style={{marginRight: 8}}>Try the new app</span>
<Switch
checked={betaSwitch}
onChange={betaSwitchChange}