feat: inject default message value to sales forms

This commit is contained in:
Ahmed Bouhuolia
2023-12-15 20:15:42 +02:00
parent 217321380a
commit ad53ddb9dd
6 changed files with 89 additions and 54 deletions

View File

@@ -1,5 +1,4 @@
// @ts-nocheck
import React, { useMemo } from 'react';
import intl from 'react-intl-universal';
import classNames from 'classnames';
import { Formik, Form } from 'formik';
@@ -45,6 +44,8 @@ function ReceiptForm({
receiptNextNumber,
receiptNumberPrefix,
receiptAutoIncrement,
receiptTermsConditions,
receiptMessage,
preferredDepositAccount,
// #withCurrentOrganization
@@ -67,23 +68,21 @@ function ReceiptForm({
receiptNextNumber,
);
// Initial values in create and edit mode.
const initialValues = useMemo(
() => ({
...(!isEmpty(receipt)
? { ...transformToEditForm(receipt) }
: {
...defaultReceipt,
...(receiptAutoIncrement && {
receipt_number: nextReceiptNumber,
}),
deposit_account_id: parseInt(preferredDepositAccount),
entries: orderingLinesIndexes(defaultReceipt.entries),
currency_code: base_currency,
const initialValues = {
...(!isEmpty(receipt)
? { ...transformToEditForm(receipt) }
: {
...defaultReceipt,
...(receiptAutoIncrement && {
receipt_number: nextReceiptNumber,
}),
}),
[receipt, preferredDepositAccount, nextReceiptNumber, receiptAutoIncrement],
);
deposit_account_id: parseInt(preferredDepositAccount),
entries: orderingLinesIndexes(defaultReceipt.entries),
currency_code: base_currency,
receipt_message: receiptMessage,
terms_conditions: receiptTermsConditions,
}),
};
// Handle the form submit.
const handleFormSubmit = (
values,
@@ -184,6 +183,8 @@ export default compose(
receiptNextNumber: receiptSettings?.nextNumber,
receiptNumberPrefix: receiptSettings?.numberPrefix,
receiptAutoIncrement: receiptSettings?.autoIncrement,
receiptMessage: receiptSettings?.receiptMessage,
receiptTermsConditions: receiptSettings?.termsConditions,
preferredDepositAccount: receiptSettings?.preferredDepositAccount,
})),
withCurrentOrganization(),

View File

@@ -7,7 +7,6 @@ import { omit, first } from 'lodash';
import { useFormikContext } from 'formik';
import {
defaultFastFieldShouldUpdate,
transactionNumber,
repeatValue,
transformToForm,
formattedAmount,
@@ -50,7 +49,7 @@ export const defaultReceipt = {
receipt_date: moment(new Date()).format('YYYY-MM-DD'),
reference_no: '',
receipt_message: '',
statement: '',
terms_conditions: '',
closed: '',
branch_id: '',
warehouse_id: '',