diff --git a/client/src/common/errors.js b/client/src/common/errors.js index e69de29bb..34db1734c 100644 --- a/client/src/common/errors.js +++ b/client/src/common/errors.js @@ -0,0 +1,14 @@ +export const ERROR = { + // Sales Estimates + ESTIMATE_NUMBER_IS_NOT_UNQIUE: 'ESTIMATE.NUMBER.IS.NOT.UNQIUE', + + // Sales Invoices + SALE_INVOICE_NUMBER_IS_EXISTS: 'SALE.INVOICE.NUMBER.IS.EXISTS', + SALE_INVOICE_NO_NOT_UNIQUE: 'SALE_INVOICE_NO_NOT_UNIQUE', + + // Sales Receipts + SALE_RECEIPT_NUMBER_NOT_UNIQUE: 'SALE_RECEIPT_NUMBER_NOT_UNIQUE', + + // Bills + BILL_NUMBER_EXISTS: 'BILL.NUMBER.EXISTS', +}; diff --git a/client/src/containers/Purchases/Bill/BillForm.js b/client/src/containers/Purchases/Bill/BillForm.js index 4c2954245..15b2c5904 100644 --- a/client/src/containers/Purchases/Bill/BillForm.js +++ b/client/src/containers/Purchases/Bill/BillForm.js @@ -24,7 +24,7 @@ import withBillDetail from './withBillDetail'; import { AppToaster } from 'components'; import useMedia from 'hooks/useMedia'; - +import { ERROR } from 'common/errors'; import { compose, repeatValue } from 'utils'; const MIN_LINES_NUMBER = 5; @@ -137,7 +137,6 @@ function BillForm({ [], ); - const defaultInitialValues = useMemo( () => ({ vendor_id: '', @@ -192,6 +191,16 @@ function BillForm({ : []; }, [bill]); + const handleErrors = (errors, { setErrors }) => { + if (errors.some((e) => e.type === ERROR.BILL_NUMBER_EXISTS)) { + setErrors({ + bill_number: formatMessage({ + id: 'bill_number_exists', + }), + }); + } + }; + const formik = useFormik({ // enableReinitialize: true, validationSchema, @@ -222,7 +231,8 @@ function BillForm({ saveBillSubmit({ action: 'update', ...payload }); resetForm(); }) - .catch((error) => { + .catch((errors) => { + handleErrors(errors, { setErrors }); setSubmitting(false); }); } else { @@ -240,6 +250,7 @@ function BillForm({ resetForm(); }) .catch((errors) => { + handleErrors(errors, { setErrors }); setSubmitting(false); }); } diff --git a/client/src/containers/Sales/Estimate/EstimateForm.js b/client/src/containers/Sales/Estimate/EstimateForm.js index c1df70b5c..97ead1a26 100644 --- a/client/src/containers/Sales/Estimate/EstimateForm.js +++ b/client/src/containers/Sales/Estimate/EstimateForm.js @@ -27,6 +27,7 @@ import withSettings from 'containers/Settings/withSettings'; import { AppToaster, Row, Col } from 'components'; import Dragzone from 'components/Dragzone'; import useMedia from 'hooks/useMedia'; +import { ERROR } from 'common/errors'; import { compose, repeatValue } from 'utils'; @@ -204,6 +205,16 @@ const EstimateForm = ({ : []; }, [estimate]); + const handleErrors = (errors, { setErrors }) => { + if (errors.some((e) => e.type === ERROR.ESTIMATE_NUMBER_IS_NOT_UNQIUE)) { + setErrors({ + estimate_number: formatMessage({ + id: 'estimate_number_is_not_unqiue', + }), + }); + } + }; + const formik = useFormik({ validationSchema, initialValues: { @@ -220,20 +231,25 @@ const EstimateForm = ({ const requestForm = { ...form }; if (estimate && estimate.id) { - requestEditEstimate(estimate.id, requestForm).then((response) => { - AppToaster.show({ - message: formatMessage( - { - id: 'the_estimate_has_been_successfully_edited', - }, - { number: values.estimate_number }, - ), - intent: Intent.SUCCESS, + requestEditEstimate(estimate.id, requestForm) + .then((response) => { + AppToaster.show({ + message: formatMessage( + { + id: 'the_estimate_has_been_successfully_edited', + }, + { number: values.estimate_number }, + ), + intent: Intent.SUCCESS, + }); + setSubmitting(false); + saveEstimateSubmit({ action: 'update', ...payload }); + resetForm(); + }) + .catch((errors) => { + handleErrors(errors, { setErrors }); + setSubmitting(false); }); - setSubmitting(false); - saveEstimateSubmit({ action: 'update', ...payload }); - resetForm(); - }); } else { requestSubmitEstimate(requestForm) .then((response) => { @@ -249,12 +265,13 @@ const EstimateForm = ({ saveEstimateSubmit({ action: 'new', ...payload }); }) .catch((errors) => { + handleErrors(errors, { setErrors }); setSubmitting(false); }); } }, }); - + useEffect(() => { formik.setFieldValue('estimate_number', estimateNumber); }, [estimateNumber]); @@ -302,10 +319,7 @@ const EstimateForm = ({ }; return ( -
+
- + ({ - estimateNextNumber: estimatesSettings?.next_number, - estimateNumberPrefix: estimatesSettings?.number_prefix, + estimateNextNumber: estimatesSettings?.nextNumber, + estimateNumberPrefix: estimatesSettings?.numberPrefix, })), )(EstimateForm); diff --git a/client/src/containers/Sales/Invoice/InvoiceForm.js b/client/src/containers/Sales/Invoice/InvoiceForm.js index 681734ae7..b7f425157 100644 --- a/client/src/containers/Sales/Invoice/InvoiceForm.js +++ b/client/src/containers/Sales/Invoice/InvoiceForm.js @@ -27,6 +27,7 @@ import withSettings from 'containers/Settings/withSettings'; import { AppToaster, Col, Row } from 'components'; import Dragzone from 'components/Dragzone'; import useMedia from 'hooks/useMedia'; +import { ERROR } from 'common/errors'; import { compose, repeatValue } from 'utils'; @@ -206,6 +207,16 @@ function InvoiceForm({ : []; }, [invoice]); + const handleErrors = (errors, { setErrors }) => { + if (errors.some((e) => e.type === ERROR.SALE_INVOICE_NUMBER_IS_EXISTS)) { + setErrors({ + invoice_no: formatMessage({ + id: 'sale_invoice_number_is_exists', + }), + }); + } + }; + const formik = useFormik({ validationSchema, initialValues: { @@ -239,7 +250,8 @@ function InvoiceForm({ saveInvokeSubmit({ action: 'update', ...payload }); resetForm(); }) - .catch((error) => { + .catch((errors) => { + handleErrors(errors, { setErrors }); setSubmitting(false); }); } else { @@ -257,12 +269,12 @@ function InvoiceForm({ resetForm(); }) .catch((errors) => { + handleErrors(errors, { setErrors }); setSubmitting(false); }); } }, }); - useEffect(() => { formik.setFieldValue('invoice_no', invoiceNumber); }, [invoiceNumber]); @@ -373,7 +385,7 @@ export default compose( withInvoiceDetail(), withSettings(({ invoiceSettings }) => ({ - invoiceNextNumber: invoiceSettings?.next_number, - invoiceNumberPrefix: invoiceSettings?.number_prefix, + invoiceNextNumber: invoiceSettings?.nextNumber, + invoiceNumberPrefix: invoiceSettings?.numberPrefix, })), )(InvoiceForm); diff --git a/client/src/containers/Sales/Invoice/InvoiceFormHeader.js b/client/src/containers/Sales/Invoice/InvoiceFormHeader.js index 0f1eb9da3..ade8b97e0 100644 --- a/client/src/containers/Sales/Invoice/InvoiceFormHeader.js +++ b/client/src/containers/Sales/Invoice/InvoiceFormHeader.js @@ -123,7 +123,7 @@ function InvoiceFormHeader({ className={classNames( 'form-group--select-list', 'form-group--invoice-date', - CLASSES.FILL + CLASSES.FILL, )} intent={ errors.invoice_date && touched.invoice_date && Intent.DANGER @@ -149,7 +149,7 @@ function InvoiceFormHeader({ className={classNames( 'form-group--select-list', 'form-group--due-date', - CLASSES.FILL + CLASSES.FILL, )} intent={errors.due_date && touched.due_date && Intent.DANGER} helperText={ @@ -175,23 +175,23 @@ function InvoiceFormHeader({ helperText={ } - rightElement={ - , - }} - tooltip={true} - tooltipProps={{ - content: 'Setting your auto-generated invoice number', - position: Position.BOTTOM_LEFT, - }} - /> - } > , + }} + tooltip={true} + tooltipProps={{ + content: 'Setting your auto-generated invoice number', + position: Position.BOTTOM_LEFT, + }} + /> + } {...getFieldProps('invoice_no')} /> diff --git a/client/src/containers/Sales/Invoice/Invoices.js b/client/src/containers/Sales/Invoice/Invoices.js index b96f93357..f9dd83584 100644 --- a/client/src/containers/Sales/Invoice/Invoices.js +++ b/client/src/containers/Sales/Invoice/Invoices.js @@ -8,13 +8,22 @@ import DashboardInsider from 'components/Dashboard/DashboardInsider'; import withCustomersActions from 'containers/Customers/withCustomersActions'; import withItemsActions from 'containers/Items/withItemsActions'; import withInvoiceActions from './withInvoiceActions'; +import withSettingsActions from 'containers/Settings/withSettingsActions'; import { compose } from 'utils'; function Invoices({ + // #withCustomersActions requestFetchCustomers, + + // #withItemsActions requestFetchItems, + + // #withInvoiceActions requsetFetchInvoice, + + // #withSettingsActions + requestFetchOptions, }) { const history = useHistory(); const { id } = useParams(); @@ -25,6 +34,8 @@ function Invoices({ { enabled: !!id }, ); + const fetchSettings = useQuery(['settings'], () => requestFetchOptions({})); + // Handle fetch Items data table or list const fetchItems = useQuery('items-table', () => requestFetchItems({})); @@ -65,4 +76,5 @@ export default compose( withInvoiceActions, withCustomersActions, withItemsActions, + withSettingsActions, )(Invoices); diff --git a/client/src/containers/Sales/Receipt/ReceiptForm.js b/client/src/containers/Sales/Receipt/ReceiptForm.js index 7b096b42f..14b4b0320 100644 --- a/client/src/containers/Sales/Receipt/ReceiptForm.js +++ b/client/src/containers/Sales/Receipt/ReceiptForm.js @@ -15,7 +15,7 @@ import { pick } from 'lodash'; import classNames from 'classnames'; import { CLASSES } from 'common/classes'; - +import { ERROR } from 'common/errors'; import ReceiptFromHeader from './ReceiptFormHeader'; import EntriesItemsTable from 'containers/Sales/Estimate/EntriesItemsTable'; import ReceiptReceiveFloatingActions from './ReceiptReceiveFloatingActions'; @@ -108,7 +108,6 @@ function ReceiptForm({ .min(1) .max(1024) .label(formatMessage({ id: 'receipt_message_' })), - send_to_email: Yup.string().email().nullable(), statement: Yup.string() .trim() .min(1) @@ -159,7 +158,6 @@ function ReceiptForm({ deposit_account_id: '', receipt_number: receiptNumber, receipt_date: moment(new Date()).format('YYYY-MM-DD'), - send_to_email: '', reference_no: '', receipt_message: '', statement: '', @@ -208,6 +206,15 @@ function ReceiptForm({ : []; }, [receipt]); + const handleErrors = (errors, { setErrors }) => { + if (errors.some((e) => e.type === ERROR.SALE_RECEIPT_NUMBER_NOT_UNIQUE)) { + setErrors({ + receipt_number: formatMessage({ + id: 'sale_receipt_number_not_unique', + }), + }); + } + }; const formik = useFormik({ validationSchema, initialValues: { @@ -225,20 +232,25 @@ function ReceiptForm({ const requestForm = { ...form }; if (receipt && receipt.id) { - requestEditReceipt(receipt.id, requestForm).then(() => { - AppToaster.show({ - message: formatMessage( - { - id: 'the_receipt_has_been_successfully_edited', - }, - { number: values.receipt_number }, - ), - intent: Intent.SUCCESS, + requestEditReceipt(receipt.id, requestForm) + .then(() => { + AppToaster.show({ + message: formatMessage( + { + id: 'the_receipt_has_been_successfully_edited', + }, + { number: values.receipt_number }, + ), + intent: Intent.SUCCESS, + }); + setSubmitting(false); + saveInvokeSubmit({ action: 'update', ...payload }); + resetForm(); + }) + .catch((errors) => { + handleErrors(errors, { setErrors }); + setSubmitting(false); }); - setSubmitting(false); - saveInvokeSubmit({ action: 'update', ...payload }); - resetForm(); - }); } else { requestSubmitReceipt(requestForm) .then((response) => { @@ -256,6 +268,7 @@ function ReceiptForm({ resetForm(); }) .catch((errors) => { + handleErrors(errors, { setErrors }); setSubmitting(false); }); } diff --git a/client/src/lang/en/index.js b/client/src/lang/en/index.js index 14cad7561..54ff4d23c 100644 --- a/client/src/lang/en/index.js +++ b/client/src/lang/en/index.js @@ -783,4 +783,9 @@ export default { receipt_number_settings: 'Receipt Number Settings', invoice_number_settings: 'Invoice Number Settings', receipt_number: 'Receipt Number', + estimate_number_is_not_unqiue: 'Estimate number is not unqiue', + invoice_number_is_not_unqiue: 'Invoice number is not unqiue', + sale_receipt_number_not_unique: 'Receipt number is not unique', + sale_invoice_number_is_exists: 'Sale invoice number is exists', + bill_number_exists:'Bill number exists' }; diff --git a/server/src/api/controllers/Sales/SalesReceipts.ts b/server/src/api/controllers/Sales/SalesReceipts.ts index 489067d10..cbac69810 100644 --- a/server/src/api/controllers/Sales/SalesReceipts.ts +++ b/server/src/api/controllers/Sales/SalesReceipts.ts @@ -73,7 +73,6 @@ export default class SalesReceiptsController extends BaseController{ check('customer_id').exists().isNumeric().toInt(), check('deposit_account_id').exists().isNumeric().toInt(), check('receipt_date').exists().isISO8601(), - check('send_to_email').optional().isEmail(), check('receipt_number').optional().trim().escape(), check('reference_no').optional().trim().escape(),