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

Merge branch 'master' of https://github.com/abouolia/Ratteb

Browse Source
This commit is contained in:
a.bouhuolia
2020-12-21 14:08:10 +02:00
parent 1f76c08262 53320e4c61
commit c327c79612
18 changed files with 83 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ const defaultBill = {
index: 0,
item_id: '',
rate: '',
discount: '',
discount: 0,
quantity: 1,
description: '',
};

2
client/src/containers/Purchases/Bill/BillForm.schema.js
View File

@@ -22,7 +22,7 @@ const BillFormSchema = Yup.object().shape({
.min(1)
.max(DATATYPES_LENGTH.TEXT)
.label(formatMessage({ id: 'note' })),
open: Yup.boolean().required(),
open: Yup.boolean(),
entries: Yup.array().of(
Yup.object().shape({
quantity: Yup.number()

3
client/src/containers/Purchases/PaymentMades/PaymentMadeViewTabs.js
View File

@@ -1,5 +1,6 @@
import React, { useEffect, useRef } from 'react';
import { useHistory } from 'react-router';
import { FormattedMessage as T } from 'react-intl';
import { Alignment, Navbar, NavbarGroup } from '@blueprintjs/core';
import { useParams, withRouter } from 'react-router-dom';
import { connect } from 'react-redux';
@@ -80,7 +81,7 @@ function PaymentMadeViewTabs({
<NavbarGroup align={Alignment.LEFT}>
<DashboardViewsTabs
initialViewId={customViewId}
baseUrl={'/payment-mades'}
defaultTabText={<T id={'all_payments'} />}
tabs={tabs}
onNewViewTabClick={handleClickNewView}
onChange={handleTabsChange}

4
client/src/containers/Sales/Estimate/EstimateFloatingActions.js
View File

@@ -102,11 +102,11 @@ export default function EstimateFloatingActions({
content={
<Menu>
<MenuItem
text={<T id={'publish_and_new'} />}
text={<T id={'deliver_and_new'} />}
onClick={handleSubmitDeliverAndNewBtnClick}
/>
<MenuItem
text={<T id={'publish_continue_editing'} />}
text={<T id={'deliver_continue_editing'} />}
onClick={handleSubmitDeliverContinueEditingBtnClick}
/>
</Menu>

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

@@ -43,8 +43,8 @@ const MIN_LINES_NUMBER = 4;
const defaultEstimate = {
index: 0,
item_id: '',
rate: 0,
discount: '',
rate: '',
discount: 0,
quantity: 1,
description: '',
};
@@ -164,6 +164,8 @@ const EstimateForm = ({
values,
{ setSubmitting, setErrors, resetForm },
) => {
setSubmitting(true);
const entries = values.entries.filter(
(item) => item.item_id && item.quantity,
);
@@ -211,7 +213,9 @@ const EstimateForm = ({
};
const onError = (errors) => {
handleErrors(errors, { setErrors });
if (errors) {
handleErrors(errors, { setErrors });
}
setSubmitting(false);
};
@@ -246,11 +250,13 @@ const EstimateForm = ({
);
return (
<div className={classNames(
CLASSES.PAGE_FORM,
CLASSES.PAGE_FORM_STRIP_STYLE,
CLASSES.PAGE_FORM_ESTIMATE,
)}>
<div
className={classNames(
CLASSES.PAGE_FORM,
CLASSES.PAGE_FORM_STRIP_STYLE,
CLASSES.PAGE_FORM_ESTIMATE,
)}
>
<Formik
validationSchema={
isNewMode ? CreateEstimateFormSchema : EditEstimateFormSchema
@@ -258,13 +264,13 @@ const EstimateForm = ({
initialValues={initialValues}
onSubmit={handleFormSubmit}
>
{({ isSubmitting ,values }) => (
{({ isSubmitting, values }) => (
<Form>
<EstimateFormHeader
onEstimateNumberChanged={handleEstimateNumberChange}
/>
<EstimateNumberWatcher estimateNumber={estimateNumber} />
<EstimateFormBody />
<EstimateFormBody defaultEstimate={defaultEstimate} />
<EstimateFormFooter />
<EstimateFloatingActions
isSubmitting={isSubmitting}

4
client/src/containers/Sales/Estimate/EstimateForm.schema.js
View File

@@ -27,7 +27,7 @@ const Schema = Yup.object().shape({
.min(1)
.max(DATATYPES_LENGTH.TEXT)
.label(formatMessage({ id: 'note' })),
delivered: Yup.boolean().required(),
delivered: Yup.boolean(),
entries: Yup.array().of(
Yup.object().shape({
quantity: Yup.number()
@@ -44,7 +44,7 @@ const Schema = Yup.object().shape({
is: (quantity, rate) => !isBlank(quantity) && !isBlank(rate),
then: Yup.number().required(),
}),
discount: Yup.number().nullable().min(0).max(DATATYPES_LENGTH.INT_10),
discount: Yup.number().nullable().min(0).max(100),
description: Yup.string().nullable().max(DATATYPES_LENGTH.TEXT),
}),
),

14
client/src/containers/Sales/Estimate/EstimateFormBody.js
View File

@@ -3,13 +3,13 @@ import classNames from 'classnames';
import { CLASSES } from 'common/classes';
import EditableItemsEntriesTable from 'containers/Entries/EditableItemsEntriesTable';
export default function EstimateFormBody() {
export default function EstimateFormBody({ defaultEstimate }) {
return (
<div className={classNames(CLASSES.PAGE_FORM_BODY)}>
<EditableItemsEntriesTable filterSellableItems={true} />
<EditableItemsEntriesTable
defaultEntry={defaultEstimate}
filterSellableItems={true}
/>
</div>
)
}
);
}

19
client/src/containers/Sales/Estimate/EstimateFormHeader.js
View File

@@ -1,22 +1,22 @@
import React, { useMemo } from 'react';
import { compose } from 'utils';
import classNames from 'classnames';
import { sumBy } from 'lodash';
import { useFormikContext } from 'formik';
import { CLASSES } from 'common/classes';
import { PageFormBigNumber } from 'components';
import withCustomers from 'containers/Customers/withCustomers';
import withDialogActions from 'containers/Dialog/withDialogActions';
import EstimateFormHeaderFields from './EstimateFormHeaderFields';
import { PageFormBigNumber } from 'components';
import withSettings from 'containers/Settings/withSettings';
import { compose } from 'utils';
// Estimate form top header.
function EstimateFormHeader({
// #ownProps
onEstimateNumberChanged,
// #withSettings
baseCurrency,
}) {
const { values } = useFormikContext();
@@ -33,15 +33,14 @@ function EstimateFormHeader({
<PageFormBigNumber
label={'Amount'}
amount={totalDueAmount}
currencyCode={'LYD'}
currencyCode={baseCurrency}
/>
</div>
);
}
export default compose(
withCustomers(({ customers }) => ({
customers,
withSettings(({ organizationSettings }) => ({
baseCurrency: organizationSettings?.baseCurrency,
})),
withDialogActions,
)(EstimateFormHeader);

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

@@ -83,7 +83,7 @@ function EstimateFormHeader({
{...momentFormatter('YYYY/MM/DD')}
value={tansformDateValue(value)}
onChange={handleDateChange((formattedDate) => {
form.setFieldValue('estimate_date', formatMessage);
form.setFieldValue('estimate_date', formattedDate);
})}
popoverProps={{ position: Position.BOTTOM, minimal: true }}
inputProps={{

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

@@ -44,7 +44,7 @@ const defaultInvoice = {
index: 0,
item_id: '',
rate: '',
discount: '',
discount: 0,
quantity: 1,
description: '',
};

4
client/src/containers/Sales/Invoice/InvoiceForm.schema.js
View File

@@ -17,7 +17,7 @@ const Schema = Yup.object().shape({
.max(DATATYPES_LENGTH.STRING)
.label(formatMessage({ id: 'invoice_no_' })),
reference_no: Yup.string().min(1).max(DATATYPES_LENGTH.STRING),
delivered: Yup.boolean().required(),
delivered: Yup.boolean(),
invoice_message: Yup.string()
.trim()
.min(1)
@@ -43,7 +43,7 @@ const Schema = Yup.object().shape({
is: (quantity, rate) => !isBlank(quantity) && !isBlank(rate),
then: Yup.number().required(),
}),
discount: Yup.number().nullable().min(0).max(DATATYPES_LENGTH.INT_10),
discount: Yup.number().nullable().min(0).max(100),
description: Yup.string().nullable().max(DATATYPES_LENGTH.TEXT),
}),
),

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

@@ -4,16 +4,20 @@ import { sumBy } from 'lodash';
import { useFormikContext } from 'formik';
import { CLASSES } from 'common/classes';
import InvoiceFormHeaderFields from './InvoiceFormHeaderFields';
import { PageFormBigNumber } from 'components';
import withSettings from 'containers/Settings/withSettings';
import { compose } from 'redux';
/**
* Invoice form header section.
*/
export default function InvoiceFormHeader({
function InvoiceFormHeader({
// #ownProps
onInvoiceNumberChanged,
// #withSettings
baseCurrency,
}) {
const { values } = useFormikContext();
@@ -30,8 +34,13 @@ export default function InvoiceFormHeader({
<PageFormBigNumber
label={'Due Amount'}
amount={totalDueAmount}
currencyCode={'LYD'}
currencyCode={baseCurrency}
/>
</div>
);
}
export default compose(
withSettings(({ organizationSettings }) => ({
baseCurrency: organizationSettings?.baseCurrency,
})),
)(InvoiceFormHeader);

3
client/src/containers/Sales/PaymentReceive/PaymentReceiveViewTabs.js
View File

@@ -2,6 +2,7 @@ import React, { useEffect, useRef } from 'react';
import { useHistory } from 'react-router';
import { Alignment, Navbar, NavbarGroup } from '@blueprintjs/core';
import { useParams, withRouter } from 'react-router-dom';
import { FormattedMessage as T } from 'react-intl';
import { connect } from 'react-redux';
import { pick, debounce } from 'lodash';
@@ -82,8 +83,8 @@ function PaymentReceiveViewTabs({
<NavbarGroup align={Alignment.LEFT}>
<DashboardViewsTabs
initialViewId={customViewId}
baseUrl={'/payment-receives'}
tabs={tabs}
defaultTabText={<T id={'all_payments'}/>}
onNewViewTabClick={handleClickNewView}
onChange={handleTabsChange}
/>

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

@@ -267,7 +267,7 @@ function ReceiptForm({
onReceiptNumberChanged={handleReceiptNumberChanged}
/>
<ReceiptNumberWatcher receiptNumber={receiptNumber} />
<ReceiptFormBody />
<ReceiptFormBody defaultReceipt ={defaultReceipt} />
<ReceiptFormFooter />
<ReceiptFormFloatingActions
isSubmitting={isSubmitting}

2
client/src/containers/Sales/Receipt/ReceiptForm.schema.js
View File

@@ -28,7 +28,7 @@ const Schema = Yup.object().shape({
.min(1)
.max(DATATYPES_LENGTH.TEXT)
.label(formatMessage({ id: 'note' })),
closed: Yup.boolean().required(),
closed: Yup.boolean(),
entries: Yup.array().of(
Yup.object().shape({
quantity: Yup.number()

11
client/src/containers/Sales/Receipt/ReceiptFormBody.js
View File

@@ -4,10 +4,13 @@ import { CLASSES } from 'common/classes';
import EditableItemsEntriesTable from 'containers/Entries/EditableItemsEntriesTable';
export default function ExpenseFormBody() {
export default function ExpenseFormBody({ defaultReceipt }) {
return (
<div className={classNames(CLASSES.PAGE_FORM_BODY)}>
<EditableItemsEntriesTable filterSellableItems={true} />
<EditableItemsEntriesTable
defaultEntry={defaultReceipt}
filterSellableItems={true}
/>
</div>
)
}
);
}

17
client/src/containers/Sales/Receipt/ReceiptFormHeader.js
View File

@@ -7,10 +7,17 @@ import { CLASSES } from 'common/classes';
import ReceiptFormHeaderFields from './ReceiptFormHeaderFields';
import { PageFormBigNumber } from 'components';
import withSettings from 'containers/Settings/withSettings';
import { compose } from 'redux';
export default function ReceiptFormHeader({
/**
* Receipt form header section.
*/
function ReceiptFormHeader({
// #ownProps
onReceiptNumberChanged,
// #withSettings
baseCurrency,
}) {
const { values } = useFormikContext();
@@ -27,8 +34,14 @@ export default function ReceiptFormHeader({
<PageFormBigNumber
label={'Due Amount'}
amount={totalDueAmount}
currencyCode={'LYD'}
currencyCode={baseCurrency}
/>
</div>
);
}
export default compose(
withSettings(({ organizationSettings }) => ({
baseCurrency: organizationSettings?.baseCurrency,
})),
)(ReceiptFormHeader);

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

@@ -928,4 +928,5 @@ export default {
'Are you sure you want to activate this item? You will be able to inactivate it later',
inactivate_item: 'Inactivate Item',
activate_item: 'Activate Item',
all_payments:'All Payments'
};