QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-21 07:10:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Validation for Minimum and Maximum discount

Browse Source
This commit is contained in:
elforjani3
2020-11-06 00:57:54 +02:00
parent ecc66593a9
commit 929b7c0d3a
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/containers/Purchases/Bill/BillForm.js
View File

@@ -117,7 +117,7 @@ function BillForm({
then: Yup.number().required(), then: Yup.number().required(),
}), }),
total: Yup.number().nullable(), total: Yup.number().nullable(),
discount: Yup.number().nullable(), discount: Yup.number().nullable().min(0).max(100),
description: Yup.string().nullable(), description: Yup.string().nullable(),
}), }),
), ),
@@ -207,7 +207,6 @@ function BillForm({
}; };
const formik = useFormik({ const formik = useFormik({
// enableReinitialize: true,
validationSchema, validationSchema,
initialValues: { initialValues: {
...initialValues, ...initialValues,

2
client/src/containers/Sales/Estimate/EstimateForm.js
View File

@@ -129,7 +129,7 @@ const EstimateForm = ({
is: (quantity, rate) => quantity || rate, is: (quantity, rate) => quantity || rate,
then: Yup.number().required(), then: Yup.number().required(),
}), }),
discount: Yup.number().nullable(), discount: Yup.number().nullable().min(0).max(100),
description: Yup.string().nullable(), description: Yup.string().nullable(),
}), }),
), ),

2
client/src/containers/Sales/Invoice/InvoiceForm.js
View File

@@ -128,7 +128,7 @@ function InvoiceForm({
is: (quantity, rate) => quantity || rate, is: (quantity, rate) => quantity || rate,
then: Yup.number().required(), then: Yup.number().required(),
}), }),
discount: Yup.number().nullable(), discount: Yup.number().nullable().min(0).max(100),
description: Yup.string().nullable(), description: Yup.string().nullable(),
}), }),
), ),

4
client/src/containers/Sales/Receipt/ReceiptForm.js
View File

@@ -129,7 +129,7 @@ function ReceiptForm({
is: (quantity, rate) => quantity || rate, is: (quantity, rate) => quantity || rate,
then: Yup.number().required(), then: Yup.number().required(),
}), }),
discount: Yup.number().nullable(), discount: Yup.number().nullable().min(0).max(100),
description: Yup.string().nullable(), description: Yup.string().nullable(),
}), }),
), ),
@@ -383,9 +383,9 @@ function ReceiptForm({
export default compose( export default compose(
withReceiptActions, withReceiptActions,
withReceiptDetail(),
withDashboardActions, withDashboardActions,
withMediaActions, withMediaActions,
withReceiptDetail(),
withSettings(({ receiptSettings }) => ({ withSettings(({ receiptSettings }) => ({
receiptNextNumber: receiptSettings?.nextNumber, receiptNextNumber: receiptSettings?.nextNumber,
receiptNumberPrefix: receiptSettings?.numberPrefix, receiptNumberPrefix: receiptSettings?.numberPrefix,