mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-17 21:30:31 +00:00
fix: bill edit form.
This commit is contained in:
@@ -146,7 +146,7 @@ export default function BillFloatingActions() {
|
||||
<If condition={bill && bill?.is_open}>
|
||||
<ButtonGroup>
|
||||
<Button
|
||||
disabled={isSubmitting}
|
||||
loading={isSubmitting}
|
||||
intent={Intent.PRIMARY}
|
||||
onClick={handleSubmitOpenBtnClick}
|
||||
text={<T id={'save'} />}
|
||||
|
||||
@@ -2,6 +2,7 @@ import React, { useMemo } from 'react';
|
||||
import { Formik, Form } from 'formik';
|
||||
import { Intent } from '@blueprintjs/core';
|
||||
import classNames from 'classnames';
|
||||
import * as R from 'ramda';
|
||||
import intl from 'react-intl-universal';
|
||||
import { useHistory } from 'react-router-dom';
|
||||
import { isEmpty, omit } from 'lodash';
|
||||
@@ -44,7 +45,6 @@ function BillForm({
|
||||
}
|
||||
: {
|
||||
...defaultBill,
|
||||
entries: orderingLinesIndexes(defaultBill.entries),
|
||||
currency_code: baseCurrency,
|
||||
}),
|
||||
}),
|
||||
@@ -81,7 +81,7 @@ function BillForm({
|
||||
const form = {
|
||||
...values,
|
||||
open: submitPayload.status,
|
||||
entries: entries.map((entry) => ({ ...omit(entry, ['total']) })),
|
||||
entries: R.compose(orderingLinesIndexes)(entries),
|
||||
};
|
||||
// Handle the request success.
|
||||
const onSuccess = (response) => {
|
||||
|
||||
@@ -8,10 +8,10 @@ import 'style/pages/Bills/PageForm.scss';
|
||||
|
||||
export default function BillFormPage() {
|
||||
const { id } = useParams();
|
||||
const idInt = parseInt(id, 10);
|
||||
const billId = parseInt(id, 10);
|
||||
|
||||
return (
|
||||
<BillFormProvider billId={idInt}>
|
||||
<BillFormProvider billId={billId}>
|
||||
<BillForm />
|
||||
</BillFormProvider>
|
||||
);
|
||||
|
||||
@@ -39,11 +39,11 @@ export const defaultBill = {
|
||||
|
||||
export const transformToEditForm = (bill) => {
|
||||
const initialEntries = [
|
||||
...bill.entries.map((bill) => ({
|
||||
...transformToForm(bill, defaultBill.entries[0]),
|
||||
...bill.entries.map((entry) => ({
|
||||
...transformToForm(entry, defaultBillEntry),
|
||||
})),
|
||||
...repeatValue(
|
||||
defaultBill,
|
||||
defaultBillEntry,
|
||||
Math.max(MIN_LINES_NUMBER - bill.entries.length, 0),
|
||||
),
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user