QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-22 15:50:32 +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
2021-03-29 10:51:33 +02:00
parent 2d6d642f3b b9c63b87ed
commit 5184365d2a
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/containers/Drawers/PaperTemplate/PaperTemplateTable.js
View File

@@ -16,7 +16,7 @@ export default function DrawerTemplateTable({ tableData, currencyCode }) {
accessor: 'rate', accessor: 'rate',
accessor: ({ rate }) => <Money amount={rate} currency={currencyCode} />, accessor: ({ rate }) => <Money amount={rate} currency={currencyCode} />,
disableSortBy: true, disableSortBy: true,
width: 50, width: 80,
}, },
{ {
Header: formatMessage({ id: 'Qty' }), Header: formatMessage({ id: 'Qty' }),

14
client/src/containers/Expenses/ExpenseForm/ExpenseForm.js
View File

@@ -63,11 +63,7 @@ function ExpenseForm({
categories: orderingLinesIndexes(defaultExpense.categories), categories: orderingLinesIndexes(defaultExpense.categories),
}), }),
}), }),
[ [expense, baseCurrency, preferredPaymentAccount],
expense,
baseCurrency,
preferredPaymentAccount,
],
); );
// Handle form submit. // Handle form submit.
@@ -117,8 +113,12 @@ function ExpenseForm({
} }
}; };
// Handle request error // Handle the request error.
const handleError = ({ response: { data: { errors } } }) => { const handleError = ({
response: {
data: { errors },
},
}) => {
transformErrors(errors, { setErrors }); transformErrors(errors, { setErrors });
setSubmitting(false); setSubmitting(false);
}; };

4
client/src/containers/Vendors/VendorForm/VendorForm.js
View File

@@ -94,8 +94,8 @@ function VendorForm({
const initialValues = useMemo( const initialValues = useMemo(
() => ({ () => ({
...defaultInitialValues, ...defaultInitialValues,
currency_code: baseCurrency, ...transformToForm(vendor, defaultInitialValues),
...transformToForm(contactDuplicate || vendor, defaultInitialValues), ...transformToForm(contactDuplicate, defaultInitialValues),
}), }),
[vendor, contactDuplicate, baseCurrency], [vendor, contactDuplicate, baseCurrency],
); );

6
client/src/hooks/query/expenses.js
View File

@@ -38,7 +38,7 @@ export function useExpenses(query, props) {
{ {
method: 'get', method: 'get',
url: `expenses`, url: `expenses`,
params: { ...query } params: { ...query },
}, },
{ {
select: transformExpenses, select: transformExpenses,
@@ -61,7 +61,7 @@ export function useExpense(id, props) {
[t.EXPENSE, id], [t.EXPENSE, id],
{ {
method: 'get', method: 'get',
url: `expenses/${id}` url: `expenses/${id}`,
}, },
{ {
select: (res) => res.data.expense, select: (res) => res.data.expense,
@@ -120,7 +120,7 @@ export function useCreateExpense(props) {
const apiRequest = useApiRequest(); const apiRequest = useApiRequest();
return useMutation((values) => apiRequest.post('expenses', values), { return useMutation((values) => apiRequest.post('expenses', values), {
onSuccess: (res, [values]) => { onSuccess: () => {
// Common invalidate queries. // Common invalidate queries.
commonInvalidateQueries(queryClient); commonInvalidateQueries(queryClient);
}, },