Merge pull request #291 from bigcapitalhq/BIG-81

feat: Add default customer message and terms conditions to sales transactions
This commit is contained in:
Ahmed Bouhuolia
2023-12-16 22:41:58 +02:00
committed by GitHub
29 changed files with 1089 additions and 57 deletions

View File

@@ -59,6 +59,12 @@ export default {
auto_increment: {
type: 'boolean',
},
customer_notes: {
type: 'string',
},
terms_conditions: {
type: 'string',
},
},
sales_receipts: {
next_number: {
@@ -73,6 +79,12 @@ export default {
preferred_deposit_account: {
type: 'number',
},
receipt_message: {
type: 'string',
},
terms_conditions: {
type: 'string',
},
},
sales_invoices: {
next_number: {
@@ -84,6 +96,12 @@ export default {
auto_increment: {
type: 'boolean',
},
customer_notes: {
type: 'string',
},
terms_conditions: {
type: 'string',
},
},
payment_receives: {
next_number: {
@@ -147,6 +165,12 @@ export default {
auto_increment: {
type: 'boolean',
},
customer_notes: {
type: 'string',
},
terms_conditions: {
type: 'string',
},
},
vendor_credit: {
next_number: {

View File

@@ -12,6 +12,22 @@ export default [
text: <T id={'users'} />,
href: '/preferences/users',
},
{
text: <T id={'preferences.estimates'} />,
href: '/preferences/estimates',
},
{
text: <T id={'preferences.invoices'} />,
href: '/preferences/invoices',
},
{
text: <T id={'preferences.receipts'} />,
href: '/preferences/receipts',
},
{
text: <T id={'preferences.creditNotes'} />,
href: '/preferences/credit-notes',
},
{
text: <T id={'currencies'} />,
href: '/preferences/currencies',

View File

@@ -0,0 +1,14 @@
// @ts-nocheck
import { PreferencesCreditNotesBoot } from './PreferencesCreditNotesFormBoot';
import { PreferencesCreditNotesFormPage } from './PreferencesCreditNotesFormPage';
/**
* Credit notes preferences.
*/
export function PreferencesCreditNotes() {
return (
<PreferencesCreditNotesBoot>
<PreferencesCreditNotesFormPage />
</PreferencesCreditNotesBoot>
);
}

View File

@@ -0,0 +1,9 @@
// @ts-nocheck
import * as Yup from 'yup';
const Schema = Yup.object().shape({
termsConditions: Yup.string().optional(),
customerNotes: Yup.string().optional(),
});
export const PreferencesCreditNotesFormSchema = Schema;

View File

@@ -0,0 +1,74 @@
// @ts-nocheck
import styled from 'styled-components';
import { Form } from 'formik';
import { Button, Intent } from '@blueprintjs/core';
import { useHistory } from 'react-router-dom';
import { FormattedMessage as T, FFormGroup, FTextArea } from '@/components';
/**
* Preferences credit notes form.
*/
export function PreferencesCreditNotesForm({ isSubmitting }) {
const history = useHistory();
// Handle close click.
const handleCloseClick = () => {
history.go(-1);
};
return (
<Form>
{/* ---------- Customer Notes ---------- */}
<FFormGroup
name={'customerNotes'}
label={<T id={'pref.creditNotes.customerNotes.field'} />}
fastField={true}
>
<FTextArea
medium={'true'}
name={'customerNotes'}
fastField={true}
fill={true}
/>
</FFormGroup>
{/* ---------- Terms & Conditions ---------- */}
<FFormGroup
name={'termsConditions'}
label={<T id={'pref.creditNotes.termsConditions.field'} />}
fastField={true}
>
<FTextArea
medium={'true'}
name={'termsConditions'}
fastField={true}
fill={true}
/>
</FFormGroup>
<CardFooterActions>
<Button loading={isSubmitting} intent={Intent.PRIMARY} type="submit">
<T id={'save'} />
</Button>
<Button onClick={handleCloseClick}>
<T id={'close'} />
</Button>
</CardFooterActions>
</Form>
);
}
const CardFooterActions = styled.div`
padding-top: 16px;
border-top: 1px solid #e0e7ea;
margin-top: 30px;
.bp4-button {
min-width: 70px;
+ .bp4-button {
margin-left: 10px;
}
}
`;

View File

@@ -0,0 +1,55 @@
// @ts-nocheck
import React from 'react';
import styled from 'styled-components';
import classNames from 'classnames';
import { CLASSES } from '@/constants/classes';
import { useSettings } from '@/hooks/query';
import PreferencesPageLoader from '../PreferencesPageLoader';
import { Card } from '@/components';
const PreferencesCreditNotesFormContext = React.createContext();
function PreferencesCreditNotesBoot({ ...props }) {
// Fetches organization settings.
const { isLoading: isSettingsLoading } = useSettings();
// Provider state.
const provider = {
isSettingsLoading,
};
// Detarmines whether if any query is loading.
const isLoading = isSettingsLoading;
return (
<div
className={classNames(
CLASSES.PREFERENCES_PAGE_INSIDE_CONTENT,
CLASSES.PREFERENCES_PAGE_INSIDE_CONTENT_ACCOUNTANT,
)}
>
<PreferencesCreditNotesCard>
{isLoading ? (
<PreferencesPageLoader />
) : (
<PreferencesCreditNotesFormContext.Provider
value={provider}
{...props}
/>
)}
</PreferencesCreditNotesCard>
</div>
);
}
const PreferencesCreditNotesCard = styled(Card)`
padding: 25px;
.bp4-form-group {
max-width: 600px;
}
`;
const usePreferencesCreditNotesFormContext = () =>
React.useContext(PreferencesCreditNotesFormContext);
export { PreferencesCreditNotesBoot, usePreferencesCreditNotesFormContext };

View File

@@ -0,0 +1,82 @@
// @ts-nocheck
import { useEffect } from 'react';
import intl from 'react-intl-universal';
import { Formik } from 'formik';
import * as R from 'ramda';
import { Intent } from '@blueprintjs/core';
import { AppToaster } from '@/components';
import { PreferencesCreditNotesFormSchema } from './PreferencesCreditNotesForm.schema';
import { PreferencesCreditNotesForm } from './PreferencesCreditNotesForm';
import withDashboardActions from '@/containers/Dashboard/withDashboardActions';
import { compose, transformToForm, transfromToSnakeCase } from '@/utils';
import withSettings from '@/containers/Settings/withSettings';
import { transferObjectOptionsToArray } from '../Accountant/utils';
import { useSaveSettings } from '@/hooks/query';
const defaultValues = {
termsConditions: '',
customerNotes: '',
};
/**
* Preferences - Credit Notes.
*/
function PreferencesCreditNotesFormPageRoot({
// #withDashboardActions
changePreferencesPageTitle,
// #withSettings
creditNoteSettings,
}) {
// Save settings.
const { mutateAsync: saveSettingMutate } = useSaveSettings();
useEffect(() => {
changePreferencesPageTitle(intl.get('preferences.creditNotes'));
}, [changePreferencesPageTitle]);
// Initial values.
const initialValues = {
...defaultValues,
...transformToForm(creditNoteSettings, defaultValues),
};
// Handle the form submit.
const handleFormSubmit = (values, { setSubmitting }) => {
const options = R.compose(
transferObjectOptionsToArray,
transfromToSnakeCase,
)({ creditNote: { ...values } });
// Handle request success.
const onSuccess = () => {
AppToaster.show({
message: intl.get('preferences.credit_notes.success_message'),
intent: Intent.SUCCESS,
});
setSubmitting(false);
};
// Handle request error.
const onError = () => {
setSubmitting(false);
};
saveSettingMutate({ options }).then(onSuccess).catch(onError);
};
return (
<Formik
initialValues={initialValues}
validationSchema={PreferencesCreditNotesFormSchema}
onSubmit={handleFormSubmit}
component={PreferencesCreditNotesForm}
/>
);
}
export const PreferencesCreditNotesFormPage = compose(
withDashboardActions,
withSettings(({ creditNoteSettings }) => ({
creditNoteSettings: creditNoteSettings,
})),
)(PreferencesCreditNotesFormPageRoot);

View File

@@ -0,0 +1,14 @@
// @ts-nocheck
import { PreferencesEstimatesBoot } from './PreferencesEstimatesFormBoot';
import { PreferencesEstimatesFormPage } from './PreferencesEstimatesFormPage';
/**
* Estimates preferences.
*/
export function PreferencesEstimates() {
return (
<PreferencesEstimatesBoot>
<PreferencesEstimatesFormPage />
</PreferencesEstimatesBoot>
);
}

View File

@@ -0,0 +1,9 @@
// @ts-nocheck
import * as Yup from 'yup';
const Schema = Yup.object().shape({
termsConditions: Yup.string().optional(),
customerNotes: Yup.string().optional(),
});
export const PreferencesEstimatesFormSchema = Schema;

View File

@@ -0,0 +1,74 @@
// @ts-nocheck
import styled from 'styled-components';
import { Form } from 'formik';
import { Button, Intent } from '@blueprintjs/core';
import { useHistory } from 'react-router-dom';
import { FormattedMessage as T, FFormGroup, FTextArea } from '@/components';
/**
* Preferences estimates form.
*/
export function PreferencesEstimatesForm({ isSubmitting }) {
const history = useHistory();
// Handle close click.
const handleCloseClick = () => {
history.go(-1);
};
return (
<Form>
{/* ---------- Customer Notes ---------- */}
<FFormGroup
name={'customerNotes'}
label={<T id={'pref.estimates.customerNotes.field'} />}
fastField={true}
>
<FTextArea
medium={'true'}
name={'customerNotes'}
fastField={true}
fill={true}
/>
</FFormGroup>
{/* ---------- Terms & Conditions ---------- */}
<FFormGroup
name={'termsConditions'}
label={<T id={'pref.estimates.termsConditions.field'} />}
fastField={true}
>
<FTextArea
medium={'true'}
name={'termsConditions'}
fastField={true}
fill={true}
/>
</FFormGroup>
<CardFooterActions>
<Button loading={isSubmitting} intent={Intent.PRIMARY} type="submit">
<T id={'save'} />
</Button>
<Button onClick={handleCloseClick}>
<T id={'close'} />
</Button>
</CardFooterActions>
</Form>
);
}
const CardFooterActions = styled.div`
padding-top: 16px;
border-top: 1px solid #e0e7ea;
margin-top: 30px;
.bp4-button {
min-width: 70px;
+ .bp4-button {
margin-left: 10px;
}
}
`;

View File

@@ -0,0 +1,55 @@
// @ts-nocheck
import React from 'react';
import classNames from 'classnames';
import { CLASSES } from '@/constants/classes';
import { useSettings } from '@/hooks/query';
import PreferencesPageLoader from '../PreferencesPageLoader';
import styled from 'styled-components';
import { Card } from '@/components';
const PreferencesEstimatesFormContext = React.createContext();
function PreferencesEstimatesBoot({ ...props }) {
// Fetches organization settings.
const { isLoading: isSettingsLoading } = useSettings();
// Provider state.
const provider = {
isSettingsLoading,
};
// Detarmines whether if any query is loading.
const isLoading = isSettingsLoading;
return (
<div
className={classNames(
CLASSES.PREFERENCES_PAGE_INSIDE_CONTENT,
CLASSES.PREFERENCES_PAGE_INSIDE_CONTENT_ACCOUNTANT,
)}
>
<PreferencesEstimatesCard>
{isLoading ? (
<PreferencesPageLoader />
) : (
<PreferencesEstimatesFormContext.Provider
value={provider}
{...props}
/>
)}
</PreferencesEstimatesCard>
</div>
);
}
const usePreferencesEstimatesFormContext = () =>
React.useContext(PreferencesEstimatesFormContext);
const PreferencesEstimatesCard = styled(Card)`
padding: 25px;
.bp4-form-group {
max-width: 600px;
}
`;
export { PreferencesEstimatesBoot, usePreferencesEstimatesFormContext };

View File

@@ -0,0 +1,82 @@
// @ts-nocheck
import React, { useEffect } from 'react';
import intl from 'react-intl-universal';
import { Formik } from 'formik';
import { Intent } from '@blueprintjs/core';
import * as R from 'ramda';
import { AppToaster } from '@/components';
import { PreferencesEstimatesFormSchema } from './PreferencesEstimatesForm.schema';
import { PreferencesEstimatesForm } from './PreferencesEstimatesForm';
import withDashboardActions from '@/containers/Dashboard/withDashboardActions';
import withSettings from '@/containers/Settings/withSettings';
import { transferObjectOptionsToArray } from '../Accountant/utils';
import { compose, transformToForm, transfromToSnakeCase } from '@/utils';
import { useSaveSettings } from '@/hooks/query';
const defaultValues = {
termsConditions: '',
customerNotes: '',
};
/**
* Preferences estimates form.
*/
function PreferencesEstimatesFormPageRoot({
// #withDashboardActions
changePreferencesPageTitle,
// #withSettings
estimatesSettings,
}) {
// Save Organization Settings.
const { mutateAsync: saveSettingMutate } = useSaveSettings();
useEffect(() => {
changePreferencesPageTitle(intl.get('preferences.estimates'));
}, [changePreferencesPageTitle]);
// Initial values.
const initialValues = {
...defaultValues,
...transformToForm(estimatesSettings, defaultValues),
};
// Handle the form submit.
const handleFormSubmit = (values, { setSubmitting }) => {
const options = R.compose(
transferObjectOptionsToArray,
transfromToSnakeCase,
)({ salesEstimates: { ...values } });
// Handle request success.
const onSuccess = (response) => {
AppToaster.show({
message: intl.get('preferences.estimates.success_message'),
intent: Intent.SUCCESS,
});
setSubmitting(false);
};
// Handle request error.
const onError = () => {
setSubmitting(false);
};
saveSettingMutate({ options }).then(onSuccess).catch(onError);
};
return (
<Formik
initialValues={initialValues}
validationSchema={PreferencesEstimatesFormSchema}
onSubmit={handleFormSubmit}
component={PreferencesEstimatesForm}
/>
);
}
export const PreferencesEstimatesFormPage = compose(
withDashboardActions,
withSettings(({ estimatesSettings }) => ({
estimatesSettings: estimatesSettings,
})),
)(PreferencesEstimatesFormPageRoot);

View File

@@ -0,0 +1,9 @@
// @ts-nocheck
import * as Yup from 'yup';
const Schema = Yup.object().shape({
termsConditions: Yup.string().optional(),
customerNotes: Yup.string().optional(),
});
export const PreferencesInvoiceFormSchema = Schema;

View File

@@ -0,0 +1,53 @@
// @ts-nocheck
import React from 'react';
import classNames from 'classnames';
import styled from 'styled-components';
import { CLASSES } from '@/constants/classes';
import { useSettings } from '@/hooks/query';
import PreferencesPageLoader from '../PreferencesPageLoader';
import { Card } from '@/components';
const PreferencesInvoiceFormContext = React.createContext();
function PreferencesInvoicesBoot({ ...props }) {
// Fetches organization settings.
const { isLoading: isSettingsLoading } = useSettings();
// Provider state.
const provider = {
isSettingsLoading
};
// Detarmines whether if any query is loading.
const isLoading = isSettingsLoading;
return (
<div
className={classNames(
CLASSES.PREFERENCES_PAGE_INSIDE_CONTENT,
CLASSES.PREFERENCES_PAGE_INSIDE_CONTENT_ACCOUNTANT,
)}
>
<PreferencesInvoicesCard>
{isLoading ? (
<PreferencesPageLoader />
) : (
<PreferencesInvoiceFormContext.Provider value={provider} {...props} />
)}
</PreferencesInvoicesCard>
</div>
);
}
const PreferencesInvoicesCard = styled(Card)`
padding: 25px;
.bp4-form-group{
max-width: 600px;
}
`;
const usePreferencesInvoiceFormContext = () =>
React.useContext(PreferencesInvoiceFormContext);
export { PreferencesInvoicesBoot, usePreferencesInvoiceFormContext };

View File

@@ -0,0 +1,82 @@
// @ts-nocheck
import React, { useEffect } from 'react';
import intl from 'react-intl-universal';
import { Formik } from 'formik';
import { Intent } from '@blueprintjs/core';
import * as R from 'ramda';
import { AppToaster } from '@/components';
import { PreferencesInvoiceFormSchema } from './PreferencesInvoiceForm.schema';
import { PreferencesInvoicesForm } from './PreferencesInvoicesForm';
import withDashboardActions from '@/containers/Dashboard/withDashboardActions';
import { compose, transformToForm, transfromToSnakeCase } from '@/utils';
import withSettings from '@/containers/Settings/withSettings';
import { transferObjectOptionsToArray } from '../Accountant/utils';
import { useSaveSettings } from '@/hooks/query';
const defaultValues = {
termsConditions: '',
customerNotes: '',
};
/**
* Preferences - Invoices.
*/
function PreferencesInvoiceFormPage({
// #withDashboardActions
changePreferencesPageTitle,
// #withSettings
invoiceSettings,
}) {
// Save settings.
const { mutateAsync: saveSettingMutate } = useSaveSettings();
useEffect(() => {
changePreferencesPageTitle(intl.get('preferences.invoices'));
}, [changePreferencesPageTitle]);
// Initial values.
const initialValues = {
...defaultValues,
...transformToForm(invoiceSettings, defaultValues),
};
// Handle the form submit.
const handleFormSubmit = (values, { setSubmitting }) => {
const options = R.compose(
transferObjectOptionsToArray,
transfromToSnakeCase,
)({ salesInvoices: { ...values } });
// Handle request success.
const onSuccess = () => {
AppToaster.show({
message: intl.get('preferences.invoices.success_message'),
intent: Intent.SUCCESS,
});
setSubmitting(false);
};
// Handle request error.
const onError = () => {
setSubmitting(false);
};
saveSettingMutate({ options }).then(onSuccess).catch(onError);
};
return (
<Formik
initialValues={initialValues}
validationSchema={PreferencesInvoiceFormSchema}
onSubmit={handleFormSubmit}
component={PreferencesInvoicesForm}
/>
);
}
export default compose(
withDashboardActions,
withSettings(({ invoiceSettings }) => ({
invoiceSettings: invoiceSettings,
})),
)(PreferencesInvoiceFormPage);

View File

@@ -0,0 +1,14 @@
// @ts-nocheck
import { PreferencesInvoicesBoot } from './PreferencesInvoiceFormBoot';
import PreferencesInvoiceFormPage from './PreferencesInvoiceFormPage';
/**
* items preferences.
*/
export default function PreferencesInvoices() {
return (
<PreferencesInvoicesBoot>
<PreferencesInvoiceFormPage />
</PreferencesInvoicesBoot>
);
}

View File

@@ -0,0 +1,74 @@
// @ts-nocheck
import styled from 'styled-components';
import { Form } from 'formik';
import { Button, Intent } from '@blueprintjs/core';
import { useHistory } from 'react-router-dom';
import { FormattedMessage as T, FFormGroup, FTextArea } from '@/components';
/**
* Invoices preferences form.
*/
export function PreferencesInvoicesForm({ isSubmitting }) {
const history = useHistory();
// Handle close click.
const handleCloseClick = () => {
history.go(-1);
};
return (
<Form>
{/* ---------- Customer Notes ---------- */}
<FFormGroup
name={'customerNotes'}
label={<T id={'pref.invoices.customerNotes.field'} />}
fastField={true}
>
<FTextArea
medium={'true'}
name={'customerNotes'}
fastField={true}
fill={true}
/>
</FFormGroup>
{/* ---------- Terms & Conditions ---------- */}
<FFormGroup
name={'termsConditions'}
label={<T id={'pref.invoices.termsConditions.field'} />}
fastField={true}
>
<FTextArea
medium={'true'}
name={'termsConditions'}
fastField={true}
fill={true}
/>
</FFormGroup>
<CardFooterActions>
<Button loading={isSubmitting} intent={Intent.PRIMARY} type="submit">
<T id={'save'} />
</Button>
<Button onClick={handleCloseClick}>
<T id={'close'} />
</Button>
</CardFooterActions>
</Form>
);
}
const CardFooterActions = styled.div`
padding-top: 16px;
border-top: 1px solid #e0e7ea;
margin-top: 30px;
.bp4-button {
min-width: 70px;
+ .bp4-button {
margin-left: 10px;
}
}
`;

View File

@@ -0,0 +1,14 @@
// @ts-nocheck
import { PreferencesReceiptsBoot } from './PreferencesReceiptsFormBoot';
import { PreferencesReceiptsFormPage } from './PreferencesReceiptsFormPage';
/**
* Preferences - Receipts.
*/
export function PreferencesReceipts() {
return (
<PreferencesReceiptsBoot>
<PreferencesReceiptsFormPage />
</PreferencesReceiptsBoot>
);
}

View File

@@ -0,0 +1,9 @@
// @ts-nocheck
import * as Yup from 'yup';
const Schema = Yup.object().shape({
termsConditions: Yup.string().optional(),
customerNotes: Yup.string().optional(),
});
export const PreferencesReceiptsFormSchema = Schema;

View File

@@ -0,0 +1,74 @@
// @ts-nocheck
import styled from 'styled-components';
import { Form } from 'formik';
import { Button, Intent } from '@blueprintjs/core';
import { useHistory } from 'react-router-dom';
import { FormattedMessage as T, FFormGroup, FTextArea } from '@/components';
/**
* Preferences general form.
*/
export function PreferencesReceiptsForm({ isSubmitting }) {
const history = useHistory();
// Handle close click.
const handleCloseClick = () => {
history.go(-1);
};
return (
<Form>
{/* ---------- Customer Notes ---------- */}
<FFormGroup
name={'receiptMessage'}
label={<T id={'pref.receipts.receiptMessage.field'} />}
fastField={true}
>
<FTextArea
medium={'true'}
name={'receiptMessage'}
fastField={true}
fill={true}
/>
</FFormGroup>
{/* ---------- Terms & Conditions ---------- */}
<FFormGroup
name={'termsConditions'}
label={<T id={'pref.receipts.termsConditions.field'} />}
fastField={true}
>
<FTextArea
medium={'true'}
name={'termsConditions'}
fastField={true}
fill={true}
/>
</FFormGroup>
<CardFooterActions>
<Button loading={isSubmitting} intent={Intent.PRIMARY} type="submit">
<T id={'save'} />
</Button>
<Button onClick={handleCloseClick}>
<T id={'close'} />
</Button>
</CardFooterActions>
</Form>
);
}
const CardFooterActions = styled.div`
padding-top: 16px;
border-top: 1px solid #e0e7ea;
margin-top: 30px;
.bp4-button {
min-width: 70px;
+ .bp4-button {
margin-left: 10px;
}
}
`;

View File

@@ -0,0 +1,56 @@
// @ts-nocheck
import React from 'react';
import classNames from 'classnames';
import styled from 'styled-components';
import { CLASSES } from '@/constants/classes';
import { useSettings } from '@/hooks/query';
import PreferencesPageLoader from '../PreferencesPageLoader';
import { Card } from '@/components';
const PreferencesReceiptsFormContext = React.createContext();
function PreferencesReceiptsBoot({ ...props }) {
// Fetches organization settings.
const { isLoading: isSettingsLoading } = useSettings();
// Provider state.
const provider = {
isSettingsLoading,
};
// Detarmines whether if any query is loading.
const isLoading = isSettingsLoading;
return (
<div
className={classNames(
CLASSES.PREFERENCES_PAGE_INSIDE_CONTENT,
CLASSES.PREFERENCES_PAGE_INSIDE_CONTENT_ACCOUNTANT,
)}
>
<PreferencesReceiptsCard>
{isLoading ? (
<PreferencesPageLoader />
) : (
<PreferencesReceiptsFormContext.Provider
value={provider}
{...props}
/>
)}
</PreferencesReceiptsCard>
</div>
);
}
const PreferencesReceiptsCard = styled(Card)`
padding: 25px;
.bp4-form-group {
max-width: 600px;
}
`;
const usePreferencesReceiptsFormContext = () =>
React.useContext(PreferencesReceiptsFormContext);
export { PreferencesReceiptsBoot, usePreferencesReceiptsFormContext };

View File

@@ -0,0 +1,82 @@
// @ts-nocheck
import React, { useEffect } from 'react';
import intl from 'react-intl-universal';
import { Formik } from 'formik';
import { Intent } from '@blueprintjs/core';
import * as R from 'ramda';
import { AppToaster } from '@/components';
import { PreferencesReceiptsFormSchema } from './PreferencesReceiptsForm.schema';
import { PreferencesReceiptsForm } from './PreferencesReceiptsForm';
import withDashboardActions from '@/containers/Dashboard/withDashboardActions';
import { compose, transformToForm, transfromToSnakeCase } from '@/utils';
import withSettings from '@/containers/Settings/withSettings';
import { useSaveSettings } from '@/hooks/query';
import { transferObjectOptionsToArray } from '../Accountant/utils';
const defaultValues = {
termsConditions: '',
receiptMessage: '',
};
/**
* Preferences - Receipts.
*/
function PreferencesReceiptsFormPageRoot({
// #withDashboardActions
changePreferencesPageTitle,
// #withSettings
receiptSettings,
}) {
// Save settings.
const { mutateAsync: saveSettingMutate } = useSaveSettings();
useEffect(() => {
changePreferencesPageTitle(intl.get('preferences.receipts'));
}, [changePreferencesPageTitle]);
// Initial values.
const initialValues = {
...defaultValues,
...transformToForm(receiptSettings, defaultValues),
};
// Handle the form submit.
const handleFormSubmit = (values, { setSubmitting }) => {
const options = R.compose(
transferObjectOptionsToArray,
transfromToSnakeCase,
)({ salesReceipts: { ...values } });
// Handle request success.
const onSuccess = () => {
AppToaster.show({
message: intl.get('preferences.receipts.success_message'),
intent: Intent.SUCCESS,
});
setSubmitting(false);
};
// Handle request error.
const onError = () => {
setSubmitting(false);
};
saveSettingMutate({ options }).then(onSuccess).catch(onError);
};
return (
<Formik
initialValues={initialValues}
validationSchema={PreferencesReceiptsFormSchema}
onSubmit={handleFormSubmit}
component={PreferencesReceiptsForm}
/>
);
}
export const PreferencesReceiptsFormPage = compose(
withDashboardActions,
withSettings(({ receiptSettings }) => ({
receiptSettings: receiptSettings,
})),
)(PreferencesReceiptsFormPageRoot);

View File

@@ -5,7 +5,7 @@ import classNames from 'classnames';
import { useHistory } from 'react-router-dom';
import { Formik, Form } from 'formik';
import { Intent } from '@blueprintjs/core';
import { isEmpty } from 'lodash';
import { defaultTo, isEmpty } from 'lodash';
import { CLASSES } from '@/constants/classes';
import {
CreateCreditNoteFormSchema,
@@ -48,6 +48,8 @@ function CreditNoteForm({
creditAutoIncrement,
creditNumberPrefix,
creditNextNumber,
creditCustomerNotes,
creditTermsConditions,
// #withCurrentOrganization
organization: { base_currency },
@@ -68,22 +70,21 @@ function CreditNoteForm({
const creditNumber = transactionNumber(creditNumberPrefix, creditNextNumber);
// Initial values.
const initialValues = React.useMemo(
() => ({
...(!isEmpty(creditNote)
? { ...transformToEditForm(creditNote) }
: {
...defaultCreditNote,
...(creditAutoIncrement && {
credit_note_number: creditNumber,
}),
entries: orderingLinesIndexes(defaultCreditNote.entries),
currency_code: base_currency,
...newCreditNote,
const initialValues = {
...(!isEmpty(creditNote)
? { ...transformToEditForm(creditNote) }
: {
...defaultCreditNote,
...(creditAutoIncrement && {
credit_note_number: creditNumber,
}),
}),
[],
);
entries: orderingLinesIndexes(defaultCreditNote.entries),
currency_code: base_currency,
terms_conditions: defaultTo(creditTermsConditions, ''),
note: defaultTo(creditCustomerNotes, ''),
...newCreditNote,
}),
};
// Handles form submit.
const handleFormSubmit = (
@@ -178,6 +179,8 @@ export default compose(
creditAutoIncrement: creditNoteSettings?.autoIncrement,
creditNextNumber: creditNoteSettings?.nextNumber,
creditNumberPrefix: creditNoteSettings?.numberPrefix,
creditCustomerNotes: creditNoteSettings?.customerNotes,
creditTermsConditions: creditNoteSettings?.termsConditions,
})),
withCurrentOrganization(),
)(CreditNoteForm);

View File

@@ -4,7 +4,7 @@ import intl from 'react-intl-universal';
import classNames from 'classnames';
import { Formik, Form } from 'formik';
import { Intent } from '@blueprintjs/core';
import { sumBy, isEmpty } from 'lodash';
import { sumBy, isEmpty, defaultTo } from 'lodash';
import { useHistory } from 'react-router-dom';
import { CLASSES } from '@/constants/classes';
@@ -43,6 +43,8 @@ function EstimateForm({
estimateNextNumber,
estimateNumberPrefix,
estimateAutoIncrementMode,
estimateCustomerNotes,
estimateTermsConditions,
// #withCurrentOrganization
organization: { base_currency },
@@ -60,25 +62,23 @@ function EstimateForm({
estimateNumberPrefix,
estimateNextNumber,
);
// Initial values in create and edit mode.
const initialValues = useMemo(
() => ({
...(!isEmpty(estimate)
? { ...transformToEditForm(estimate) }
: {
...defaultEstimate,
// If the auto-increment mode is enabled, take the next estimate
// number from the settings.
...(estimateAutoIncrementMode && {
estimate_number: estimateNumber,
}),
entries: orderingLinesIndexes(defaultEstimate.entries),
currency_code: base_currency,
const initialValues = {
...(!isEmpty(estimate)
? { ...transformToEditForm(estimate) }
: {
...defaultEstimate,
// If the auto-increment mode is enabled, take the next estimate
// number from the settings.
...(estimateAutoIncrementMode && {
estimate_number: estimateNumber,
}),
}),
[estimate, estimateNumber, estimateAutoIncrementMode, base_currency],
);
entries: orderingLinesIndexes(defaultEstimate.entries),
currency_code: base_currency,
terms_conditions: defaultTo(estimateTermsConditions, ''),
note: defaultTo(estimateCustomerNotes, ''),
}),
};
// Handles form submit.
const handleFormSubmit = (
@@ -181,6 +181,8 @@ export default compose(
estimateNextNumber: estimatesSettings?.nextNumber,
estimateNumberPrefix: estimatesSettings?.numberPrefix,
estimateAutoIncrementMode: estimatesSettings?.autoIncrement,
estimateCustomerNotes: estimatesSettings?.customerNotes,
estimateTermsConditions: estimatesSettings?.termsConditions,
})),
withCurrentOrganization(),
)(EstimateForm);

View File

@@ -4,7 +4,7 @@ import intl from 'react-intl-universal';
import classNames from 'classnames';
import { Formik, Form } from 'formik';
import { Intent } from '@blueprintjs/core';
import { sumBy, isEmpty } from 'lodash';
import { sumBy, isEmpty, defaultTo } from 'lodash';
import { useHistory } from 'react-router-dom';
import { CLASSES } from '@/constants/classes';
import {
@@ -44,6 +44,8 @@ function InvoiceForm({
invoiceNextNumber,
invoiceNumberPrefix,
invoiceAutoIncrementMode,
invoiceCustomerNotes,
invoiceTermsConditions,
// #withCurrentOrganization
organization: { base_currency },
@@ -79,6 +81,8 @@ function InvoiceForm({
}),
entries: orderingLinesIndexes(defaultInvoice.entries),
currency_code: base_currency,
invoice_message: defaultTo(invoiceCustomerNotes, ''),
terms_conditions: defaultTo(invoiceTermsConditions, ''),
...newInvoice,
}),
};
@@ -192,6 +196,8 @@ export default compose(
invoiceNextNumber: invoiceSettings?.nextNumber,
invoiceNumberPrefix: invoiceSettings?.numberPrefix,
invoiceAutoIncrementMode: invoiceSettings?.autoIncrement,
invoiceCustomerNotes: invoiceSettings?.customerNotes,
invoiceTermsConditions: invoiceSettings?.termsConditions,
})),
withCurrentOrganization(),
)(InvoiceForm);

View File

@@ -1,5 +1,4 @@
// @ts-nocheck
import React, { useMemo } from 'react';
import intl from 'react-intl-universal';
import classNames from 'classnames';
import { Formik, Form } from 'formik';
@@ -45,6 +44,8 @@ function ReceiptForm({
receiptNextNumber,
receiptNumberPrefix,
receiptAutoIncrement,
receiptTermsConditions,
receiptMessage,
preferredDepositAccount,
// #withCurrentOrganization
@@ -67,23 +68,21 @@ function ReceiptForm({
receiptNextNumber,
);
// Initial values in create and edit mode.
const initialValues = useMemo(
() => ({
...(!isEmpty(receipt)
? { ...transformToEditForm(receipt) }
: {
...defaultReceipt,
...(receiptAutoIncrement && {
receipt_number: nextReceiptNumber,
}),
deposit_account_id: parseInt(preferredDepositAccount),
entries: orderingLinesIndexes(defaultReceipt.entries),
currency_code: base_currency,
const initialValues = {
...(!isEmpty(receipt)
? { ...transformToEditForm(receipt) }
: {
...defaultReceipt,
...(receiptAutoIncrement && {
receipt_number: nextReceiptNumber,
}),
}),
[receipt, preferredDepositAccount, nextReceiptNumber, receiptAutoIncrement],
);
deposit_account_id: parseInt(preferredDepositAccount),
entries: orderingLinesIndexes(defaultReceipt.entries),
currency_code: base_currency,
receipt_message: receiptMessage,
terms_conditions: receiptTermsConditions,
}),
};
// Handle the form submit.
const handleFormSubmit = (
values,
@@ -184,6 +183,8 @@ export default compose(
receiptNextNumber: receiptSettings?.nextNumber,
receiptNumberPrefix: receiptSettings?.numberPrefix,
receiptAutoIncrement: receiptSettings?.autoIncrement,
receiptMessage: receiptSettings?.receiptMessage,
receiptTermsConditions: receiptSettings?.termsConditions,
preferredDepositAccount: receiptSettings?.preferredDepositAccount,
})),
withCurrentOrganization(),

View File

@@ -7,7 +7,6 @@ import { omit, first } from 'lodash';
import { useFormikContext } from 'formik';
import {
defaultFastFieldShouldUpdate,
transactionNumber,
repeatValue,
transformToForm,
formattedAmount,
@@ -50,7 +49,7 @@ export const defaultReceipt = {
receipt_date: moment(new Date()).format('YYYY-MM-DD'),
reference_no: '',
receipt_message: '',
statement: '',
terms_conditions: '',
closed: '',
branch_id: '',
warehouse_id: '',

View File

@@ -2070,7 +2070,7 @@
"project_task.dialog.edit_success_message": "The task has been edited successfully.",
"project_task.action.edit_task": "Edit Task",
"project_task.action.delete_task": "Delete Task",
"project_task.rate": "{rate} / hour",
"project_task.rate": "{rate} / hour",
"project_task.fixed_price": "Fixed price",
"project_task.non_chargable": "Non-chargeable",
"project_task.estimate_hours": "• {estimate_hours}h 0m estimated",
@@ -2290,5 +2290,27 @@
"sidebar.new_project": "New Project",
"sidebar.new_time_entry": "New Time Entry",
"sidebar.project_profitability_summary": "Project Profitability Summary",
"global_error.too_many_requests": "Too many requests"
}
"global_error.too_many_requests": "Too many requests",
"pref.invoices.termsConditions.field": "Terms & Conditions",
"pref.invoices.customerNotes.field": "Customer Notes",
"pref.creditNotes.termsConditions.field": "Terms & Conditions",
"pref.creditNotes.customerNotes.field": "Customer Notes",
"pref.estimates.termsConditions.field": "Terms & Conditions",
"pref.estimates.customerNotes.field": "Customer Notes",
"pref.receipts.termsConditions.field": "Terms & Conditions",
"pref.receipts.receiptMessage.field": "Receipt Message",
"preferences.invoices": "Invoices",
"preferences.estimates": "Estimates",
"preferences.creditNotes": "Credit Notes",
"preferences.receipts": "Receipts",
"preferences.estimates.success_message": "The preferences have been saved successfully.",
"preferences.credit_notes.success_message": "The preferences have been saved successfully.",
"preferences.receipts.success_message": "The preferences have been saved successfully.",
"preferences.invoices.success_message": "The preferences have been saved successfully."
}

View File

@@ -9,6 +9,10 @@ import SMSIntegration from '../containers/Preferences/SMSIntegration';
import DefaultRoute from '../containers/Preferences/DefaultRoute';
import Warehouses from '../containers/Preferences/Warehouses';
import Branches from '../containers/Preferences/Branches';
import Invoices from '../containers/Preferences/Invoices/PreferencesInvoices';
import { PreferencesCreditNotes } from '../containers/Preferences/CreditNotes/PreferencesCreditNotes';
import { PreferencesEstimates } from '@/containers/Preferences/Estimates/PreferencesEstimates';
import{ PreferencesReceipts } from '@/containers/Preferences/Receipts/PreferencesReceipts'
const BASE_URL = '/preferences';
@@ -23,6 +27,26 @@ export default [
component: Users,
exact: true,
},
{
path: `${BASE_URL}/invoices`,
component: Invoices,
exact: true,
},
{
path: `${BASE_URL}/credit-notes`,
component: PreferencesCreditNotes,
exact: true,
},
{
path: `${BASE_URL}/estimates`,
component: PreferencesEstimates,
exact: true,
},
{
path: `${BASE_URL}/receipts`,
component: PreferencesReceipts,
exact: true,
},
{
path: `${BASE_URL}/roles`,
component: Roles,