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

IO-974 Close bill drawer on return.

Browse Source
This commit is contained in:
Patrick Fic
2021-05-06 17:06:26 -07:00
parent a4f80a2d01
commit acae628bc4
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
View File

@@ -173,7 +173,9 @@ export function BillDetailEditcontainer({ setPartsOrderContext }) {
<Space>
<Button
disabled={data.bills_by_pk.is_credit_memo}
onClick={() =>
onClick={() => {
delete search.billid;
history.push({ search: queryString.stringify(search) });
setPartsOrderContext({
actions: {},
context: {
@@ -193,8 +195,8 @@ export function BillDetailEditcontainer({ setPartsOrderContext }) {
}),
isReturn: true,
},
})
}
});
}}
>
{t("bills.actions.return")}
</Button>

7
client/src/components/bill-form/bill-form.component.jsx
View File

@@ -202,24 +202,27 @@ export function BillFormComponent({
</LayoutFormRow>
<LayoutFormRow>
<Form.Item
span={3}
label={t("bills.fields.federal_tax_rate")}
name="federal_tax_rate"
>
<CurrencyInput min={0} disabled={disabled} />
</Form.Item>
<Form.Item
span={3}
label={t("bills.fields.state_tax_rate")}
name="state_tax_rate"
>
<CurrencyInput min={0} disabled={disabled} />
</Form.Item>
<Form.Item
span={3}
label={t("bills.fields.local_tax_rate")}
name="local_tax_rate"
>
<CurrencyInput min={0} />
</Form.Item>
<Form.Item shouldUpdate grow>
<Form.Item shouldUpdate span={15}>
{() => {
const values = form.getFieldsValue([
"billlines",
@@ -238,7 +241,7 @@ export function BillFormComponent({
if (!!totals)
return (
<div>
<Space split={<Divider type="vertical" />} wrap>
<Space wrap>
<Statistic
title={t("bills.labels.subtotal")}
value={totals.subtotal.toFormat()}