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

Fixed BOD-63 breaking changes. Original functionality restored.

Browse Source
This commit is contained in:
Patrick Fic
2020-05-05 09:00:36 -07:00
parent 9d694e6403
commit c2e6948d46
2 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/components/invoice-detail-edit/invoice-detail-edit.container.jsx
View File

@@ -71,7 +71,6 @@ export function InvoiceDetailEditContainer({ bodyshop }) {
data data
? { ? {
...data.invoices_by_pk, ...data.invoices_by_pk,
// invoicelines: [],
date: data.invoices_by_pk date: data.invoices_by_pk
? moment(data.invoices_by_pk.date) ? moment(data.invoices_by_pk.date)
: null, : null,

13
client/src/components/invoice-enter-modal/invoice-enter-modal.lines.component.jsx
View File

@@ -115,11 +115,8 @@ export default function InvoiceEnterModalLinesComponent({
</Select> </Select>
</Form.Item> </Form.Item>
{ {!!getFieldsValue(["invoicelines"]).invoicelines[index] &&
//TODO Will need to refactor this to use proper form components in the search select above. !getFieldsValue(["invoicelines"]).invoicelines[index]
getFieldsValue("invoicelines")[index] &&
// getFieldsValue("invoicelines")[index].joblinename &&
!getFieldsValue("invoicelines").invoicelines[index]
.joblineid ? ( .joblineid ? (
<Form.Item <Form.Item
label={t("invoicelines.fields.line_desc")} label={t("invoicelines.fields.line_desc")}
@@ -127,16 +124,14 @@ export default function InvoiceEnterModalLinesComponent({
name={[field.name, "line_desc"]} name={[field.name, "line_desc"]}
rules={[ rules={[
{ {
required: !getFieldsValue("invoicelines")[index] required: true,
.joblineid,
message: t("general.validation.required"), message: t("general.validation.required"),
}, },
]} ]}
> >
<Input /> <Input />
</Form.Item> </Form.Item>
) : null ) : null}
}
<Form.Item <Form.Item
label={t("invoicelines.fields.actual")} label={t("invoicelines.fields.actual")}