QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-18 05:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2020-10-28 18:31:49 +02:00
parent 8a20deacf3 bc94e4b5ab
commit 3caf076e05
11 changed files with 166 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/src/common/errors.js
View File

@@ -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',
};

4
client/src/components/DataTableCells/ItemsListCell.js
View File

@@ -1,5 +1,5 @@
import React, { useCallback, useMemo } from 'react';
import ItemListField from 'components/ItemListField';
import ItemsListField from 'components/ItemsListField';
import classNames from 'classnames';
import { FormGroup, Classes, Intent } from '@blueprintjs/core';
@@ -24,7 +24,7 @@ function ItemsListCell({
intent={error ? Intent.DANGER : null}
className={classNames('form-group--select-list', Classes.FILL)}
>
<ItemListField
<ItemsListField
items={items}
onItemSelected={handleItemSelected}
selectedItemId={initialValue}

4
client/src/components/ItemListField.js → client/src/components/ItemsListField.js
View File

@@ -2,7 +2,7 @@ import React, { useCallback, useMemo, useEffect, useState } from 'react';
import { MenuItem } from '@blueprintjs/core';
import ListSelect from 'components/ListSelect';
function ItemListField({
function ItemsListField({
items,
initialItemId,
selectedItemId,
@@ -66,4 +66,4 @@ function ItemListField({
);
}
export default ItemListField;
export default ItemsListField;

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

@@ -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);
});
}

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

@@ -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';
@@ -115,7 +116,13 @@ const EstimateForm = ({
.label(formatMessage({ id: 'note' })),
entries: Yup.array().of(
Yup.object().shape({
quantity: Yup.number().nullable(),
quantity: Yup.number()
.nullable()
.when(['rate'], {
is: (rate) => rate,
then: Yup.number().required(),
}),
rate: Yup.number().nullable(),
item_id: Yup.number()
.nullable()
.when(['quantity', 'rate'], {
@@ -204,12 +211,22 @@ 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: {
...initialValues,
},
onSubmit: async (values, { setSubmitting, setErrors, resetForm }) => {
onSubmit: (values, { setSubmitting, setErrors, resetForm }) => {
const entries = values.entries.filter(
(item) => item.item_id && item.quantity,
);
@@ -220,20 +237,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 +271,13 @@ const EstimateForm = ({
saveEstimateSubmit({ action: 'new', ...payload });
})
.catch((errors) => {
handleErrors(errors, { setErrors });
setSubmitting(false);
});
}
},
});
useEffect(() => {
formik.setFieldValue('estimate_number', estimateNumber);
}, [estimateNumber]);
@@ -302,10 +325,7 @@ const EstimateForm = ({
};
return (
<div className={classNames(
CLASSES.PAGE_FORM,
CLASSES.PAGE_FORM_ESTIMATE,
)}>
<div className={classNames(CLASSES.PAGE_FORM, CLASSES.PAGE_FORM_ESTIMATE)}>
<form onSubmit={formik.handleSubmit}>
<EstimateFormHeader formik={formik} />
<EntriesItemsTable
@@ -338,7 +358,7 @@ const EstimateForm = ({
/>
</FormGroup>
</Col>
<Col md={4}>
<Dragzone
initialFiles={initialAttachmentFiles}
@@ -366,7 +386,7 @@ export default compose(
withDashboardActions,
withMediaActions,
withSettings(({ estimatesSettings }) => ({
estimateNextNumber: estimatesSettings?.next_number,
estimateNumberPrefix: estimatesSettings?.number_prefix,
estimateNextNumber: estimatesSettings?.nextNumber,
estimateNumberPrefix: estimatesSettings?.numberPrefix,
})),
)(EstimateForm);

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

@@ -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';
@@ -114,7 +115,12 @@ function InvoiceForm({
entries: Yup.array().of(
Yup.object().shape({
quantity: Yup.number().nullable(),
quantity: Yup.number()
.nullable()
.when(['rate'], {
is: (rate) => rate,
then: Yup.number().required(),
}),
rate: Yup.number().nullable(),
item_id: Yup.number()
.nullable()
@@ -206,12 +212,22 @@ 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: {
...initialValues,
},
onSubmit: async (values, { setSubmitting, setErrors, resetForm }) => {
onSubmit: (values, { setSubmitting, setErrors, resetForm }) => {
setSubmitting(true);
const entries = values.entries.filter(
@@ -239,7 +255,8 @@ function InvoiceForm({
saveInvokeSubmit({ action: 'update', ...payload });
resetForm();
})
.catch((error) => {
.catch((errors) => {
handleErrors(errors, { setErrors });
setSubmitting(false);
});
} else {
@@ -257,12 +274,12 @@ function InvoiceForm({
resetForm();
})
.catch((errors) => {
handleErrors(errors, { setErrors });
setSubmitting(false);
});
}
},
});
useEffect(() => {
formik.setFieldValue('invoice_no', invoiceNumber);
}, [invoiceNumber]);
@@ -373,7 +390,7 @@ export default compose(
withInvoiceDetail(),
withSettings(({ invoiceSettings }) => ({
invoiceNextNumber: invoiceSettings?.next_number,
invoiceNumberPrefix: invoiceSettings?.number_prefix,
invoiceNextNumber: invoiceSettings?.nextNumber,
invoiceNumberPrefix: invoiceSettings?.numberPrefix,
})),
)(InvoiceForm);

30
client/src/containers/Sales/Invoice/InvoiceFormHeader.js
View File

@@ -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={
<ErrorMessage name="invoice_no" {...{ errors, touched }} />
}
rightElement={
<InputPrependButton
buttonProps={{
onClick: handleInvoiceNumberChange,
icon: <Icon icon={'settings-18'} />,
}}
tooltip={true}
tooltipProps={{
content: 'Setting your auto-generated invoice number',
position: Position.BOTTOM_LEFT,
}}
/>
}
>
<InputGroup
intent={errors.invoice_no && touched.invoice_no && Intent.DANGER}
minimal={true}
rightElement={
<InputPrependButton
buttonProps={{
onClick: handleInvoiceNumberChange,
icon: <Icon icon={'settings-18'} />,
}}
tooltip={true}
tooltipProps={{
content: 'Setting your auto-generated invoice number',
position: Position.BOTTOM_LEFT,
}}
/>
}
{...getFieldProps('invoice_no')}
/>
</FormGroup>

12
client/src/containers/Sales/Invoice/Invoices.js
View File

@@ -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);

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

@@ -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)
@@ -117,7 +116,12 @@ function ReceiptForm({
entries: Yup.array().of(
Yup.object().shape({
quantity: Yup.number().nullable(),
quantity: Yup.number()
.nullable()
.when(['rate'], {
is: (rate) => rate,
then: Yup.number().required(),
}),
rate: Yup.number().nullable(),
item_id: Yup.number()
.nullable()
@@ -159,7 +163,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,12 +211,21 @@ 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: {
...initialValues,
},
onSubmit: async (values, { setErrors, setSubmitting, resetForm }) => {
onSubmit: (values, { setErrors, setSubmitting, resetForm }) => {
const entries = values.entries.filter(
(item) => item.item_id && item.quantity,
);
@@ -225,20 +237,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 +273,7 @@ function ReceiptForm({
resetForm();
})
.catch((errors) => {
handleErrors(errors, { setErrors });
setSubmitting(false);
});
}

5
client/src/lang/en/index.js
View File

@@ -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'
};