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

Minor bug fixing after smoke testing.

Browse Source
This commit is contained in:
Patrick Fic
2024-02-27 09:04:40 -08:00
parent 42aa42c892
commit 55ef205907
13 changed files with 149 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/pages/contract-create/contract-create.page.container.jsx
View File

@@ -12,6 +12,7 @@ import {setBreadcrumbs, setSelectedHeader,} from "../../redux/application/applic
import {selectBodyshop} from "../../redux/user/user.selectors";
import ContractCreatePageComponent from "./contract-create.page.component";
import InstanceRenderManager from '../../utils/instanceRenderMgr';
import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wrapper.component";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
@@ -122,6 +123,7 @@ export function ContractCreatePageContainer({
}, [t, setBreadcrumbs, setSelectedHeader]);
return (
<FeatureWrapperComponent featureName='courtesycars'>
<RbacWrapper action="contracts:create">
<Form
form={form}
@@ -137,6 +139,7 @@ export function ContractCreatePageContainer({
/>
</Form>
</RbacWrapper>
</FeatureWrapperComponent>
);
}

12
client/src/pages/jobs-detail/jobs-detail.page.component.jsx
View File

@@ -107,31 +107,31 @@ export function JobsDetailPage({
// The union and spread is required to keep values coming in from the estimating system that aren't displayed.
parts_tax_rates: _.union(
Object.keys(job.parts_tax_rates),
Object.keys(values.parts_tax_rates)
Object.keys(values.parts_tax_rates || {})
).reduce((acc, val) => {
acc[val] = {
...job.parts_tax_rates[val],
...values.parts_tax_rates[val],
...values.parts_tax_rates?.[val], //TODO:AIO Verify that these still save for Rome Online with this null coalescing.
};
return acc;
}, {}),
materials: _.union(
Object.keys(job.materials),
Object.keys(values.materials)
Object.keys(values.materials|| {})
).reduce((acc, val) => {
acc[val] = {
...job.materials[val],
...values.materials[val],
...values.materials?.[val],
};
return acc;
}, {}),
cieca_pfl: _.union(
Object.keys(job.cieca_pfl),
Object.keys(values.cieca_pfl)
Object.keys(values.cieca_pfl|| {})
).reduce((acc, val) => {
acc[val] = {
...job.cieca_pfl[val],
...values.cieca_pfl[val],
...values.cieca_pfl?.[val],
};
return acc;
}, {}),