mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-16 12:50:38 +00:00
fix: branch & warehouse multi select.
This commit is contained in:
@@ -38,8 +38,8 @@ const branchItemRenderer = (
|
||||
active={modifiers.active}
|
||||
disabled={modifiers.disabled}
|
||||
icon={isSelected ? 'tick' : 'blank'}
|
||||
text={branch.name.toString()}
|
||||
label={branch.code.toString()}
|
||||
text={branch.name}
|
||||
label={branch.code}
|
||||
key={branch.id}
|
||||
onClick={handleClick}
|
||||
/>
|
||||
@@ -50,7 +50,7 @@ const branchSelectProps = {
|
||||
itemPredicate: branchItemPredicate,
|
||||
itemRenderer: branchItemRenderer,
|
||||
valueAccessor: (item) => item.id,
|
||||
labelAccessor: (item) => item.label,
|
||||
labelAccessor: (item) => item.code,
|
||||
tagRenderer: (item) => item.name,
|
||||
};
|
||||
|
||||
|
||||
@@ -40,8 +40,8 @@ const warehouseItemRenderer = (
|
||||
active={modifiers.active}
|
||||
disabled={modifiers.disabled}
|
||||
icon={isSelected ? 'tick' : 'blank'}
|
||||
text={warehouse.name.toString()}
|
||||
label={warehouse.code.toString()}
|
||||
text={warehouse.name}
|
||||
label={warehouse.code}
|
||||
key={warehouse.id}
|
||||
onClick={handleClick}
|
||||
/>
|
||||
@@ -52,7 +52,7 @@ const warehouseSelectProps = {
|
||||
itemPredicate: warehouseItemPredicate,
|
||||
itemRenderer: warehouseItemRenderer,
|
||||
valueAccessor: (item) => item.id,
|
||||
labelAccessor: (item) => item.label,
|
||||
labelAccessor: (item) => item.code,
|
||||
tagRenderer: (item) => item.name,
|
||||
};
|
||||
|
||||
|
||||
@@ -54,10 +54,7 @@ function APAgingSummaryHeader({
|
||||
filterByOption: 'without-zero-balance',
|
||||
};
|
||||
// Formik initial values.
|
||||
const initialValues = transformToForm(
|
||||
{ ...pageFilter, branchesIds: [] },
|
||||
defaultValues,
|
||||
);
|
||||
const initialValues = transformToForm({ ...pageFilter }, defaultValues);
|
||||
|
||||
// Handle form submit.
|
||||
const handleSubmit = (values, { setSubmitting }) => {
|
||||
|
||||
@@ -11,6 +11,7 @@ export const getDefaultAPAgingSummaryQuery = () => {
|
||||
agingDaysBefore: 30,
|
||||
agingPeriods: 3,
|
||||
vendorsIds: [],
|
||||
branchesIds: [],
|
||||
filterByOption: 'without-zero-balance',
|
||||
}
|
||||
}
|
||||
@@ -51,13 +51,12 @@ function ARAgingSummaryHeader({
|
||||
branchesIds: [],
|
||||
filterByOption: 'without-zero-balance',
|
||||
};
|
||||
|
||||
|
||||
// Initial values.
|
||||
const initialValues = transformToForm(
|
||||
{
|
||||
...pageFilter,
|
||||
asDate: moment(pageFilter.asDate).toDate(),
|
||||
branchesIds: [],
|
||||
},
|
||||
defaultValues,
|
||||
);
|
||||
|
||||
@@ -15,5 +15,6 @@ export const getDefaultARAgingSummaryQuery = () => {
|
||||
agingPeriods: 3,
|
||||
customersIds: [],
|
||||
filterByOption: 'without-zero-balance',
|
||||
branchesIds: [],
|
||||
};
|
||||
};
|
||||
|
||||
@@ -47,6 +47,7 @@ export const useBalanceSheetQuery = () => {
|
||||
return {
|
||||
...defaultQuery,
|
||||
...transformToForm(locationQuery, defaultQuery),
|
||||
branchesIds: [],
|
||||
};
|
||||
}, [locationQuery]);
|
||||
|
||||
|
||||
@@ -49,6 +49,7 @@ export const useProfitLossSheetQuery = () => {
|
||||
return {
|
||||
...defaultQuery,
|
||||
...transformToForm(locationQuery, defaultQuery),
|
||||
branchesIds: [],
|
||||
};
|
||||
}, [locationQuery]);
|
||||
|
||||
|
||||
@@ -6,5 +6,7 @@ export function getDefaultTrialBalanceQuery() {
|
||||
toDate: moment().endOf('year').format('YYYY-MM-DD'),
|
||||
basis: 'accural',
|
||||
filterByOption: 'with-transactions',
|
||||
branchesIds: [],
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user