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

Revert "Revert "Release/2026 02 27 (pull request #3070)" (pull request #3080)"

Browse Source
This commit is contained in:
Patrick Fic
2026-03-04 17:41:10 +00:00
parent 5a55798d2d
commit faf5878bdf
204 changed files with 7713 additions and 5495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
View File

@@ -158,20 +158,28 @@ export function ScheduleJobModalComponent({
</LayoutFormRow>
<LayoutFormRow grow>
<Form.Item name="color" label={t("appointments.fields.color")}>
<Select allowClear>
{bodyshop.appt_colors &&
bodyshop.appt_colors.map((color) => (
<Select.Option style={{ color: color.color.hex }} key={color.color.hex} value={color.color.hex}>
{color.label}
</Select.Option>
))}
</Select>
<Select
allowClear
options={
bodyshop.appt_colors &&
bodyshop.appt_colors.map((color) => ({
value: color.color.hex,
label: color.label
}))
}
/>
</Form.Item>
<Form.Item name={"alt_transport"} label={t("jobs.fields.alt_transport")}>
<Select allowClear>
{bodyshop.appt_alt_transport &&
bodyshop.appt_alt_transport.map((alt) => <Select.Option key={alt}>{alt}</Select.Option>)}
</Select>
<Select
allowClear
options={
bodyshop.appt_alt_transport &&
bodyshop.appt_alt_transport.map((alt) => ({
value: alt,
label: alt
}))
}
/>
</Form.Item>
<Form.Item name={"note"} label={t("appointments.fields.note")}>
<Input />

2
client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
View File

@@ -208,7 +208,7 @@ export function ScheduleJobModalContainer({
onCancel={() => toggleModalVisible()}
onOk={() => form.submit()}
width={"90%"}
maskClosable={false}
mask={{ closable: false }}
destroyOnHidden
okButtonProps={{
loading: loading