Fix :data types variables.

This commit is contained in:
elforjani3
2020-11-21 20:51:13 +02:00
parent b9e61461ae
commit 4b1f562587
17 changed files with 309 additions and 179 deletions

View File

@@ -1,5 +1,6 @@
import * as Yup from 'yup';
import { formatMessage } from 'services/intl';
import { DATATYPES_LENGTH } from 'common/dataTypes';
const BillFormSchema = Yup.object().shape({
vendor_id: Yup.number()
@@ -12,22 +13,24 @@ const BillFormSchema = Yup.object().shape({
.required()
.label(formatMessage({ id: 'due_date_' })),
bill_number: Yup.string()
.max(DATATYPES_LENGTH.STRING)
.label(formatMessage({ id: 'bill_number_' })),
reference_no: Yup.string().nullable().min(1).max(255),
reference_no: Yup.string().nullable().min(1).max(DATATYPES_LENGTH.STRING),
note: Yup.string()
.trim()
.min(1)
.max(1024)
.max(DATATYPES_LENGTH.TEXT)
.label(formatMessage({ id: 'note' })),
entries: Yup.array().of(
Yup.object().shape({
quantity: Yup.number()
.nullable()
.max(DATATYPES_LENGTH.INT_10)
.when(['rate'], {
is: (rate) => rate,
then: Yup.number().required(),
}),
rate: Yup.number().nullable(),
rate: Yup.number().nullable().max(DATATYPES_LENGTH.INT_10),
item_id: Yup.number()
.nullable()
.when(['quantity', 'rate'], {
@@ -35,8 +38,8 @@ const BillFormSchema = Yup.object().shape({
then: Yup.number().required(),
}),
total: Yup.number().nullable(),
discount: Yup.number().nullable().min(0).max(100),
description: Yup.string().nullable(),
discount: Yup.number().nullable().min(0).max(DATATYPES_LENGTH.INT_10),
description: Yup.string().nullable().max(DATATYPES_LENGTH.TEXT),
}),
),
});
@@ -44,7 +47,4 @@ const BillFormSchema = Yup.object().shape({
const CreateBillFormSchema = BillFormSchema;
const EditBillFormSchema = BillFormSchema;
export {
CreateBillFormSchema,
EditBillFormSchema,
};
export { CreateBillFormSchema, EditBillFormSchema };

View File

@@ -21,7 +21,10 @@ import withPaymentMadeDetail from './withPaymentMadeDetail';
import withPaymentMade from './withPaymentMade';
import withSettings from 'containers/Settings/withSettings';
import withDashboardActions from 'containers/Dashboard/withDashboardActions';
import {
EditPaymentMadeFormSchema,
CreatePaymentMadeFormSchema,
} from './PaymentMadeForm.schema';
import { compose, orderingLinesIndexes } from 'utils';
const ERRORS = {
@@ -73,50 +76,27 @@ function PaymentMadeForm({
}) {
const history = useHistory();
const { formatMessage } = useIntl();
const isNewMode = !paymentMadeId;
const [amountChangeAlert, setAmountChangeAlert] = useState(false);
const [clearLinesAlert, setClearLinesAlert] = useState(false);
const [clearFormAlert, setClearFormAlert] = useState(false);
const [fullAmount, setFullAmount] = useState(null);
const [localPaymentEntries, setLocalPaymentEntries] = useState(paymentMadeEntries);
const [localPaymentEntries, setLocalPaymentEntries] = useState(
paymentMadeEntries,
);
useEffect(() => {
if (localPaymentEntries !== paymentMadeEntries) {
setLocalPaymentEntries(paymentMadeEntries);
}
}, [localPaymentEntries, paymentMadeEntries])
}, [localPaymentEntries, paymentMadeEntries]);
// Yup validation schema.
const validationSchema = Yup.object().shape({
vendor_id: Yup.string()
.label(formatMessage({ id: 'vendor_name_' }))
.required(),
payment_date: Yup.date()
.required()
.label(formatMessage({ id: 'payment_date_' })),
payment_account_id: Yup.number()
.required()
.label(formatMessage({ id: 'payment_account_' })),
payment_number: Yup.string()
.label(formatMessage({ id: 'payment_no_' })),
reference: Yup.string().min(1).max(255).nullable(),
description: Yup.string(),
entries: Yup.array().of(
Yup.object().shape({
id: Yup.number().nullable(),
due_amount: Yup.number().nullable(),
payment_amount: Yup.number().nullable().max(Yup.ref('due_amount')),
bill_id: Yup.number()
.nullable()
.when(['payment_amount'], {
is: (payment_amount) => payment_amount,
then: Yup.number().required(),
}),
}),
),
});
const validationSchema = isNewMode
? CreatePaymentMadeFormSchema
: EditPaymentMadeFormSchema;
// Form initial values.
const initialValues = useMemo(
() => ({
@@ -246,7 +226,7 @@ function PaymentMadeForm({
const resetEntriesPaymentAmount = (entries) => {
return entries.map((entry) => ({ ...entry, payment_amount: 0 }));
}
};
// Handle fetch success of vendor bills entries.
const handleFetchEntriesSuccess = useCallback(
(entries) => {
@@ -307,10 +287,13 @@ function PaymentMadeForm({
changePageSubtitle(paymentNumber);
};
// Clear page subtitle before once page leave.
useEffect(() => () => {
changePageSubtitle('')
}, [changePageSubtitle]);
// Clear page subtitle before once page leave.
useEffect(
() => () => {
changePageSubtitle('');
},
[changePageSubtitle],
);
const fullAmountPaid = useMemo(
() => sumBy(values.entries, 'payment_amount'),
@@ -385,9 +368,7 @@ function PaymentMadeForm({
<p>Are you sure you want to clear this transaction?</p>
</Alert>
<PaymentMadeFooter
getFieldProps={getFieldProps}
/>
<PaymentMadeFooter getFieldProps={getFieldProps} />
<PaymentMadeFloatingActions
isSubmitting={isSubmitting}

View File

@@ -0,0 +1,36 @@
import * as Yup from 'yup';
import { formatMessage } from 'services/intl';
import { DATATYPES_LENGTH } from 'common/dataTypes';
const Schema = Yup.object().shape({
vendor_id: Yup.string()
.label(formatMessage({ id: 'vendor_name_' }))
.required(),
payment_date: Yup.date()
.required()
.label(formatMessage({ id: 'payment_date_' })),
payment_account_id: Yup.number()
.required()
.label(formatMessage({ id: 'payment_account_' })),
payment_number: Yup.string()
.max(DATATYPES_LENGTH.STRING)
.label(formatMessage({ id: 'payment_no_' })),
reference: Yup.string().min(1).max(DATATYPES_LENGTH.STRING).nullable(),
description: Yup.string().max(DATATYPES_LENGTH.TEXT),
entries: Yup.array().of(
Yup.object().shape({
id: Yup.number().nullable(),
due_amount: Yup.number().nullable(),
payment_amount: Yup.number().nullable().max(Yup.ref('due_amount')),
bill_id: Yup.number()
.nullable()
.when(['payment_amount'], {
is: (payment_amount) => payment_amount,
then: Yup.number().required(),
}),
}),
),
});
export const CreatePaymentMadeFormSchema = Schema;
export const EditPaymentMadeFormSchema = Schema;