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

Merge branch 'feature/IO-1828-Front-End-Package-Updates' into feature/IO-2456-Customized-Report-Filtering

Browse Source
This commit is contained in:
Dave Richer
2024-02-13 12:46:42 -05:00
parent acd22c9c42 9883c39101
commit a4a4d0b8f6
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/components/card-payment-modal/card-payment-modal.component..jsx
View File

@@ -280,24 +280,22 @@ const CardPaymentModalComponent = ({
<Input <Input
className="ipayfield" className="ipayfield"
data-ipayname="account" data-ipayname="account"
//type="hidden" type="hidden"
value={ value={
payments && data && data.jobs.length > 0 payments && data && data.jobs.length > 0
? data.jobs.map((j) => j.ro_number).join(", ") ? data.jobs.map((j) => j.ro_number).join(", ")
: null : null
} }
hidden
/> />
<Input <Input
className="ipayfield" className="ipayfield"
data-ipayname="email" data-ipayname="email"
// type="hidden" type="hidden"
value={ value={
payments && data && data.jobs.length > 0 payments && data && data.jobs.length > 0
? data.jobs.filter((j) => j.ownr_ea)[0]?.ownr_ea ? data.jobs.filter((j) => j.ownr_ea)[0]?.ownr_ea
: null : null
} }
hidden
/> />
</> </>
); );
@@ -325,9 +323,8 @@ const CardPaymentModalComponent = ({
<Input <Input
className="ipayfield" className="ipayfield"
data-ipayname="amount" data-ipayname="amount"
//type="hidden" type="hidden"
value={totalAmountToCharge?.toFixed(2)} value={totalAmountToCharge?.toFixed(2)}
hidden
/> />
<Button <Button
type="primary" type="primary"

2
client/src/components/form-date-time-picker/form-date-time-picker.component.jsx
View File

@@ -36,7 +36,7 @@ const DateTimePicker = (
disabledDate: (d) => dayjs().isAfter(d), disabledDate: (d) => dayjs().isAfter(d),
})} })}
onChange={onChange} onChange={onChange}
showSecond={false} disableSeconds={true}
minuteStep={15} minuteStep={15}
onBlur={onBlur} onBlur={onBlur}
format="hh:mm a" format="hh:mm a"

4
client/src/components/schedule-calendar/schedule-calendar.container.jsx
View File

@@ -48,7 +48,7 @@ export function ScheduleCalendarContainer({calculateScheduleLoad}) {
if (error) return <AlertComponent message={error.message} type="error"/>; if (error) return <AlertComponent message={error.message} type="error"/>;
let normalizedData = [ let normalizedData = [
...data.appointments.map((e) => { ...data.appointments.map((e) => {
//Required becuase Hasura returns a string instead of a date object. //Required because Hasura returns a string instead of a date object.
return Object.assign( return Object.assign(
{}, {},
e, e,
@@ -57,7 +57,7 @@ export function ScheduleCalendarContainer({calculateScheduleLoad}) {
); );
}), }),
...data.employee_vacation.map((e) => { ...data.employee_vacation.map((e) => {
//Required becuase Hasura returns a string instead of a date object. //Required because Hasura returns a string instead of a date object.
return { return {
...e, ...e,
title: `${ title: `${

4
client/src/components/shop-info/shop-info.scheduling.component.jsx
View File

@@ -35,7 +35,7 @@ export default function ShopInfoSchedulingComponent({form}) {
}, },
]} ]}
> >
<TimePicker showSecond={false} format="HH:mm"/> <TimePicker disableSeconds={true} format="HH:mm"/>
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("bodyshop.fields.schedule_end_time")} label={t("bodyshop.fields.schedule_end_time")}
@@ -47,7 +47,7 @@ export default function ShopInfoSchedulingComponent({form}) {
}, },
]} ]}
> >
<TimePicker showSecond={false} format="HH:mm"/> <TimePicker disableSeconds={true} format="HH:mm"/>
</Form.Item> </Form.Item>
<Form.Item <Form.Item
name={["appt_alt_transport"]} name={["appt_alt_transport"]}