From c87a98a5e431e44ecad8a75f4967a92909b444db Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Tue, 21 Dec 2021 12:12:06 +0200 Subject: [PATCH] fix: accountant. --- .../QuickPaymentReceiveForm.js | 2 +- .../Accountant/Accountant.schema.js | 4 ++-- .../Preferences/Accountant/AccountantForm.js | 20 ++++++++++++++----- .../Accountant/AccountantFormPage.js | 4 +--- .../Preferences/Accountant/utils.js | 8 ++++---- .../PaymentReceiveForm/PaymentReceiveForm.js | 9 +++++++-- 6 files changed, 30 insertions(+), 17 deletions(-) diff --git a/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveForm.js b/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveForm.js index 1b2a68b49..5b5e7637a 100644 --- a/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveForm.js +++ b/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveForm.js @@ -106,6 +106,6 @@ export default compose( paymentReceiveNextNumber: paymentReceiveSettings?.nextNumber, paymentReceiveNumberPrefix: paymentReceiveSettings?.numberPrefix, paymentReceiveAutoIncrement: paymentReceiveSettings?.autoIncrement, - preferredDepositAccount: paymentReceiveSettings?.depositAccount, + preferredDepositAccount: paymentReceiveSettings?.preferredDepositAccount, })), )(QuickPaymentReceiveForm); diff --git a/src/containers/Preferences/Accountant/Accountant.schema.js b/src/containers/Preferences/Accountant/Accountant.schema.js index 0c029efa5..3b0b55373 100644 --- a/src/containers/Preferences/Accountant/Accountant.schema.js +++ b/src/containers/Preferences/Accountant/Accountant.schema.js @@ -4,9 +4,9 @@ const Schema = Yup.object().shape({ accounting_basis: Yup.string().required(), account_code_required: Yup.boolean().nullable(), account_code_unique: Yup.boolean().nullable(), - deposit_account: Yup.number().nullable(), withdrawal_account: Yup.number().nullable(), - advance_deposit: Yup.number().nullable(), + preferred_deposit_account: Yup.number().nullable(), + preferred_advance_deposit: Yup.number().nullable(), }); export const AccountantSchema = Schema; diff --git a/src/containers/Preferences/Accountant/AccountantForm.js b/src/containers/Preferences/Accountant/AccountantForm.js index 870833e78..474ac29b0 100644 --- a/src/containers/Preferences/Accountant/AccountantForm.js +++ b/src/containers/Preferences/Accountant/AccountantForm.js @@ -17,6 +17,7 @@ import { FieldRequiredHint, } from 'components'; import { handleStringChange, inputIntent } from 'utils'; +import { ACCOUNT_TYPE } from 'common/accountTypes'; import { useAccountantFormContext } from './AccountantFormProvider'; @@ -113,7 +114,7 @@ export default function AccountantForm() { {/* ----------- Deposit customer account ----------- */} - + {({ form: { values, setFieldValue }, field: { value }, @@ -138,11 +139,15 @@ export default function AccountantForm() { { - setFieldValue('deposit_account', id); + setFieldValue('preferred_deposit_account', id); }} selectedAccountId={value} defaultSelectText={} - // filterByParentTypes={[ACCOUNT_PARENT_TYPE.CURRENT_ASSET]} + filterByTypes={[ + ACCOUNT_TYPE.CASH, + ACCOUNT_TYPE.BANK, + ACCOUNT_TYPE.OTHER_CURRENT_ASSET, + ]} /> )} @@ -178,13 +183,18 @@ export default function AccountantForm() { }} selectedAccountId={value} defaultSelectText={} + filterByTypes={[ + ACCOUNT_TYPE.CASH, + ACCOUNT_TYPE.BANK, + ACCOUNT_TYPE.OTHER_CURRENT_ASSET, + ]} /> )} {/* ----------- Withdrawal customer account ----------- */} - + {({ form: { values, setFieldValue }, field: { value }, @@ -209,7 +219,7 @@ export default function AccountantForm() { { - setFieldValue('advance_deposit', id); + setFieldValue('preferred_advance_deposit', id); }} selectedAccountId={value} defaultSelectText={} diff --git a/src/containers/Preferences/Accountant/AccountantFormPage.js b/src/containers/Preferences/Accountant/AccountantFormPage.js index 33d259f84..ab9fb326a 100644 --- a/src/containers/Preferences/Accountant/AccountantFormPage.js +++ b/src/containers/Preferences/Accountant/AccountantFormPage.js @@ -28,15 +28,13 @@ function AccountantFormPage({ accountsSettings, billPaymentSettings, }) { - - const { saveSettingMutate } = useAccountantFormContext(); const accountantSettings = { ...billPaymentSettings, ...accountsSettings, ...pick(organizationSettings, ['accountingBasis']), - ...pick(paymentReceiveSettings, ['depositAccount', 'advanceDeposit']), + ...pick(paymentReceiveSettings, ['preferredDepositAccount', 'preferredAdvanceDeposit']), }; const initialValues = { diff --git a/src/containers/Preferences/Accountant/utils.js b/src/containers/Preferences/Accountant/utils.js index 22f838ba4..0579127f5 100644 --- a/src/containers/Preferences/Accountant/utils.js +++ b/src/containers/Preferences/Accountant/utils.js @@ -11,13 +11,13 @@ export const transformToOptions = (option) => { group: 'bill_payments', }, { - key: 'deposit_account', - value: option.deposit_account, + key: 'preferred_deposit_account', + value: option.preferred_deposit_account, group: 'payment_receives', }, { - key: 'advance_deposit', - value: option.advance_deposit, + key: 'preferred_advance_deposit', + value: option.preferred_advance_deposit, group: 'payment_receives', }, { diff --git a/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveForm.js b/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveForm.js index 94196ecfb..5448dce3d 100644 --- a/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveForm.js +++ b/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveForm.js @@ -28,7 +28,11 @@ import { AppToaster } from 'components'; import { transactionNumber, compose } from 'utils'; import { usePaymentReceiveFormContext } from './PaymentReceiveFormProvider'; -import { defaultPaymentReceive, transformToEditForm, transformFormToRequest } from './utils'; +import { + defaultPaymentReceive, + transformToEditForm, + transformFormToRequest, +} from './utils'; /** * Payment Receive form. @@ -61,6 +65,7 @@ function PaymentReceiveForm({ paymentReceiveNumberPrefix, paymentReceiveNextNumber, ); + console.log(preferredDepositAccount, 'XX'); // Form initial values. const initialValues = useMemo( () => ({ @@ -194,7 +199,7 @@ export default compose( paymentReceiveNextNumber: paymentReceiveSettings?.nextNumber, paymentReceiveNumberPrefix: paymentReceiveSettings?.numberPrefix, paymentReceiveAutoIncrement: paymentReceiveSettings?.autoIncrement, - preferredDepositAccount: paymentReceiveSettings?.depositAccount, + preferredDepositAccount: paymentReceiveSettings?.preferredDepositAccount, })), withCurrentOrganization(), )(PaymentReceiveForm);