Minor bug fixing after smoke testing.
This commit is contained in:
@@ -112,7 +112,7 @@ function Header({
|
||||
promanager: HasFeatureAccess({ featureName: 'bills', bodyshop }),
|
||||
})
|
||||
) {
|
||||
accountingChildren.push([
|
||||
accountingChildren.push(
|
||||
{
|
||||
key: 'bills',
|
||||
icon: <Icon component={FaFileInvoiceDollar} />,
|
||||
@@ -128,8 +128,8 @@ function Header({
|
||||
context: {},
|
||||
});
|
||||
},
|
||||
},
|
||||
]);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
if (Simple_Inventory.treatment === 'on') {
|
||||
@@ -378,7 +378,7 @@ function Header({
|
||||
...(InstanceRenderManager({
|
||||
imex: true,
|
||||
rome: true,
|
||||
promanager: false// HasFeatureAccess({ featureName: 'courtesycars', bodyshop }),
|
||||
promanager: false, // HasFeatureAccess({ featureName: 'courtesycars', bodyshop }),
|
||||
})
|
||||
? [
|
||||
{
|
||||
@@ -587,9 +587,9 @@ function Header({
|
||||
label: (
|
||||
<Tooltip
|
||||
title={`A more modern ${InstanceRenderManager({
|
||||
imex: t("titles.imexonline"),
|
||||
rome: t("titles.romeonline"),
|
||||
promanager: t("titles.promanager")
|
||||
imex: t('titles.imexonline'),
|
||||
rome: t('titles.romeonline'),
|
||||
promanager: t('titles.promanager'),
|
||||
})} is ready for you to try! You can switch back at any time.`}
|
||||
>
|
||||
<InfoCircleOutlined />
|
||||
|
||||
@@ -37,7 +37,7 @@ export function OwnerNameDisplayFunction(ownerObject, forceFirstLast = false) {
|
||||
|
||||
const rdxStore = store.getState();
|
||||
|
||||
if (rdxStore.user.bodyshop.last_name_first && !forceFirstLast)
|
||||
if (rdxStore.user?.bodyshop?.last_name_first && !forceFirstLast)
|
||||
return `${ownerObject?.ownr_ln || ""}, ${ownerObject?.ownr_fn || ""} ${
|
||||
ownerObject?.ownr_co_nm || ""
|
||||
}`.trim();
|
||||
|
||||
@@ -29,9 +29,9 @@ export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoComponent);
|
||||
|
||||
export function ShopInfoComponent({bodyshop, form, saveLoading}) {
|
||||
|
||||
const {treatments: {CriticalPartsScanning, EnhancedPayroll}} = useSplitTreatments({
|
||||
const {treatments: {CriticalPartsScanning, Enhanced_Payroll}} = useSplitTreatments({
|
||||
attributes: {},
|
||||
names: ["CriticalPartsScanning","EnhancedPayroll"],
|
||||
names: ["CriticalPartsScanning","Enhanced_Payroll"],
|
||||
splitKey: bodyshop.imexshopid,
|
||||
});
|
||||
|
||||
@@ -95,14 +95,13 @@ export function ShopInfoComponent({bodyshop, form, saveLoading}) {
|
||||
},
|
||||
]
|
||||
: []),
|
||||
...EnhancedPayroll.treatment === "on" ? [
|
||||
...Enhanced_Payroll.treatment === "on" ? [
|
||||
{
|
||||
key: 'task-presets',
|
||||
label: t("bodyshop.labels.task-presets"),
|
||||
children: <ShopInfoTaskPresets form={form}/>
|
||||
}]: []
|
||||
];
|
||||
|
||||
return (
|
||||
<Card
|
||||
extra={
|
||||
|
||||
@@ -53,7 +53,7 @@ export function SignInComponent({
|
||||
return (
|
||||
<div className="login-container">
|
||||
<div className="login-logo-container">
|
||||
<img src={InstanceRenderManager({imex:ImEXOnlineLogo, rome:RomeLogo})} width={200} alt={InstanceRenderManager({imex:t("titles.imexonline"), rome: t("titles.romeonline"), promanager:t("titles.promanager")})}/>
|
||||
<img src={InstanceRenderManager({imex:ImEXOnlineLogo, rome:RomeLogo, promanager:'https://www.web-est.com/img/web_est_logo_software.gif'})} width={200} alt={InstanceRenderManager({imex:t("titles.imexonline"), rome: t("titles.romeonline"), promanager:t("titles.promanager")})}/>
|
||||
<Typography.Title>{
|
||||
InstanceRenderManager({imex: t("titles.imexonline"), rome: t("titles.romeonline"), promanager:t("titles.promanager")})
|
||||
}</Typography.Title>
|
||||
|
||||
@@ -360,6 +360,8 @@ export function TimeTicketList({
|
||||
dataSource={timetickets}
|
||||
onChange={handleTableChange}
|
||||
summary={() => {
|
||||
if(Enhanced_Payroll.treatment === "on") return null;
|
||||
if(Enhanced_Payroll.treatment === "off")
|
||||
return (
|
||||
<Table.Summary.Row>
|
||||
<Table.Summary.Cell>
|
||||
|
||||
@@ -143,14 +143,13 @@ const JobRelatedTicketsTable = ({
|
||||
}, Dinero());
|
||||
|
||||
return {
|
||||
id: `${item.jobKey}${costCenter}`,
|
||||
costCenter,
|
||||
item,
|
||||
actHrs: actHrs.toFixed(1),
|
||||
prodHrs: prodHrs.toFixed(1),
|
||||
clockHrs,
|
||||
...InstanceRenderManager({rome: {pay}})
|
||||
|
||||
id: `${item.jobKey}${costCenter}`,
|
||||
costCenter,
|
||||
item,
|
||||
actHrs: actHrs.toFixed(1),
|
||||
prodHrs: prodHrs.toFixed(1),
|
||||
clockHrs,
|
||||
...InstanceRenderManager({ imex: {}, rome: { pay } }),
|
||||
};
|
||||
});
|
||||
})
|
||||
@@ -210,7 +209,7 @@ const JobRelatedTicketsTable = ({
|
||||
state.sortedInfo.columnKey === "clockHrs" && state.sortedInfo.order,
|
||||
render: (text, record) => record.clockHrs.toFixed(2),
|
||||
},
|
||||
...InstanceRenderManager({rome:{
|
||||
...InstanceRenderManager({ imex: [], rome:[{
|
||||
title: "Pay",
|
||||
dataIndex: "Pay",
|
||||
key: "Pay",
|
||||
@@ -218,7 +217,7 @@ const JobRelatedTicketsTable = ({
|
||||
sortOrder:
|
||||
state.sortedInfo.columnKey === "clockHrs" && state.sortedInfo.order,
|
||||
render: (text, record) => record.pay.toFormat("$0.00"),
|
||||
}})
|
||||
}]})
|
||||
,
|
||||
{
|
||||
title: t("general.labels.actions"),
|
||||
|
||||
Reference in New Issue
Block a user