diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeForm.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeForm.tsx index fe042ff90..8cb6d3294 100644 --- a/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeForm.tsx +++ b/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeForm.tsx @@ -3,8 +3,7 @@ import React from 'react'; import intl from 'react-intl-universal'; import { Formik } from 'formik'; import { Intent } from '@blueprintjs/core'; -import { pick, omit } from 'lodash'; - +import { omit } from 'lodash'; import { AppToaster } from '@/components'; import { CreateQuickPaymentMadeFormSchema } from './QuickPaymentMade.schema'; import { useQuickPaymentMadeContext } from './QuickPaymentMadeFormProvider'; @@ -21,28 +20,25 @@ function QuickPaymentMadeForm({ // #withDialogActions closeDialog, }) { - const { bill, dialogName, createPaymentMadeMutate, } = useQuickPaymentMadeContext(); - // Initial form values + // Initial form values. const initialValues = { ...defaultPaymentMade, ...bill, }; - // Handles the form submit. const handleFormSubmit = (values, { setSubmitting, setFieldError }) => { - const entries = [values] - .filter((entry) => entry.id && entry.payment_amount) - .map((entry) => ({ - bill_id: entry.id, - ...pick(entry, ['payment_amount']), - })); - + const entries = [ + { + payment_amount: values.amount, + bill_id: values.id, + }, + ]; const form = { ...omit(values, ['payment_amount']), vendor_id: values?.vendor?.id, diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.tsx index d5e875519..bcb0f473d 100644 --- a/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.tsx +++ b/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/QuickPaymentMadeFormFields.tsx @@ -124,7 +124,7 @@ function QuickPaymentMadeFormFields({ {/*------------ Amount Received -----------*/} - + {({ form: { values, setFieldValue }, field: { value }, @@ -135,7 +135,7 @@ function QuickPaymentMadeFormFields({ labelInfo={} className={classNames('form-group--payment_amount', CLASSES.FILL)} intent={inputIntent({ error, touched })} - helperText={} + helperText={} > @@ -144,7 +144,7 @@ function QuickPaymentMadeFormFields({ value={value} minimal={true} onChange={(amount) => { - setFieldValue('payment_amount', amount); + setFieldValue('amount', amount); }} intent={inputIntent({ error, touched })} inputRef={(ref) => (paymentMadeFieldRef.current = ref)} diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/utils.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/utils.tsx index b90e21da8..4c3e105e5 100644 --- a/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/utils.tsx +++ b/packages/webapp/src/containers/Dialogs/QuickPaymentMadeFormDialog/utils.tsx @@ -16,6 +16,7 @@ export const defaultPaymentMade = { payment_date: moment(new Date()).format('YYYY-MM-DD'), reference: '', payment_number: '', + amount: '', // statement: '', exchange_rate: 1, branch_id: '', diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveForm.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveForm.tsx index c31195715..664ab64bb 100644 --- a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveForm.tsx +++ b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveForm.tsx @@ -3,7 +3,7 @@ import React from 'react'; import intl from 'react-intl-universal'; import { Formik } from 'formik'; import { Intent } from '@blueprintjs/core'; -import { pick, defaultTo, omit } from 'lodash'; +import { defaultTo, omit } from 'lodash'; import { AppToaster } from '@/components'; import { useQuickPaymentReceiveContext } from './QuickPaymentReceiveFormProvider'; @@ -26,14 +26,10 @@ function QuickPaymentReceiveForm({ paymentReceiveAutoIncrement, paymentReceiveNumberPrefix, paymentReceiveNextNumber, - preferredDepositAccount + preferredDepositAccount, }) { - - const { - dialogName, - invoice, - createPaymentReceiveMutate, - } = useQuickPaymentReceiveContext(); + const { dialogName, invoice, createPaymentReceiveMutate } = + useQuickPaymentReceiveContext(); // Payment receive number. const nextPaymentNumber = transactionNumber( @@ -53,13 +49,12 @@ function QuickPaymentReceiveForm({ // Handles the form submit. const handleFormSubmit = (values, { setSubmitting, setFieldError }) => { - const entries = [values] - .filter((entry) => entry.id && entry.payment_amount) - .map((entry) => ({ - invoice_id: entry.id, - ...pick(entry, ['payment_amount']), - })); - + const entries = [ + { + invoice_id: values.id, + payment_amount: values.amount, + }, + ]; const form = { ...omit(values, ['payment_receive_no', 'payment_amount']), ...(!paymentReceiveAutoIncrement && { diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.tsx index b5ebcd358..0825b1cf9 100644 --- a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.tsx +++ b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveFormFields.tsx @@ -128,7 +128,7 @@ function QuickPaymentReceiveFormFields({ {/*------------ Amount Received -----------*/} - + {({ form: { values, setFieldValue }, field: { value }, @@ -139,7 +139,7 @@ function QuickPaymentReceiveFormFields({ labelInfo={} className={classNames('form-group--payment_amount', CLASSES.FILL)} intent={inputIntent({ error, touched })} - helperText={} + helperText={} > @@ -148,7 +148,7 @@ function QuickPaymentReceiveFormFields({ value={value} minimal={true} onChange={(amount) => { - setFieldValue('payment_amount', amount); + setFieldValue('amount', amount); }} intent={inputIntent({ error, touched })} inputRef={(ref) => (paymentReceiveFieldRef.current = ref)} diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/utils.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/utils.tsx index 673ad9f49..5b74b8268 100644 --- a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/utils.tsx +++ b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/utils.tsx @@ -15,6 +15,7 @@ export const defaultInitialValues = { payment_receive_no: '', payment_date: moment(new Date()).format('YYYY-MM-DD'), reference_no: '', + amount: '', // statement: '', exchange_rate: 1, branch_id: '',