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.invoices_by_pk,
// invoicelines: [],
date: data.invoices_by_pk
? moment(data.invoices_by_pk.date)
: null,

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

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