QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-16 12:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

amend.

Browse Source
This commit is contained in:
a.bouhuolia
2021-03-24 12:10:00 +02:00
parent 4ec324a462
commit 542110fdf3
4 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
client/src/containers/Sales/Estimates/EstimateForm/EstimateFormProvider.js
View File

@@ -6,7 +6,7 @@ import {
useItems,
useSettingsEstimates,
useCreateEstimate,
useEditEstimate
useEditEstimate,
} from 'hooks/query';
const EstimateFormContext = createContext();
@@ -15,14 +15,20 @@ const EstimateFormContext = createContext();
* Estimate form provider.
*/
function EstimateFormProvider({ estimateId, ...props }) {
const { data: estimate, isFetching: isEstimateFetching } = useEstimate(
estimateId, { enabled: !!estimateId }
);
const {
data: estimate,
isFetching: isEstimateFetching,
} = useEstimate(estimateId, { enabled: !!estimateId });
// Filter all sellable items only.
const stringifiedFilterRoles = React.useMemo(() => JSON.stringify(
[{ "fieldKey": "sellable", "value":true, "condition":"equals"}]
), []);
const stringifiedFilterRoles = React.useMemo(
() =>
JSON.stringify([
{ index: 1, fieldKey: 'sellable', value: true, condition: '&&', comparator: 'equals', },
{ index: 2, fieldKey: 'active', value: true, condition: '&&', comparator: 'equals' },
]),
[],
);
// Handle fetch Items data table or list
const {
@@ -30,7 +36,7 @@ function EstimateFormProvider({ estimateId, ...props }) {
isFetching: isItemsFetching,
} = useItems({
page_size: 10000,
stringified_filter_roles: stringifiedFilterRoles
stringified_filter_roles: stringifiedFilterRoles,
});
// Handle fetch customers data table or list
@@ -44,11 +50,11 @@ function EstimateFormProvider({ estimateId, ...props }) {
// Form submit payload.
const [submitPayload, setSubmitPayload] = React.useState({});
// Create and edit estimate form.
const { mutateAsync: createEstimateMutate } = useCreateEstimate();
const { mutateAsync: editEstimateMutate } = useEditEstimate();
const isNewMode = !estimateId;
// Provider payload.
@@ -66,7 +72,7 @@ function EstimateFormProvider({ estimateId, ...props }) {
setSubmitPayload,
createEstimateMutate,
editEstimateMutate
editEstimateMutate,
};
return (

13
client/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormProvider.js
View File

@@ -39,9 +39,14 @@ function InvoiceFormProvider({ invoiceId, ...props }) {
: [];
// Filter all sellable items only.
const stringifiedFilterRoles = React.useMemo(() => JSON.stringify(
[{ "fieldKey": "sellable", "value":true, "condition":"equals"}]
), []);
const stringifiedFilterRoles = React.useMemo(
() =>
JSON.stringify([
{ index: 1, fieldKey: 'sellable', value: true, condition: '&&', comparator: 'equals', },
{ index: 2, fieldKey: 'active', value: true, condition: '&&', comparator: 'equals' },
]),
[],
);
// Handle fetching the items table based on the given query.
const {
@@ -49,7 +54,7 @@ function InvoiceFormProvider({ invoiceId, ...props }) {
isLoading: isItemsLoading,
} = useItems({
page_size: 10000,
stringified_filter_roles: stringifiedFilterRoles
stringified_filter_roles: stringifiedFilterRoles,
});
// Handle fetch customers data table or list

17
client/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormProvider.js
View File

@@ -7,7 +7,7 @@ import {
useCustomers,
useItems,
useCreateReceipt,
useEditReceipt
useEditReceipt,
} from 'hooks/query';
const ReceiptFormContext = createContext();
@@ -33,9 +33,14 @@ function ReceiptFormProvider({ receiptId, ...props }) {
} = useCustomers({ page_size: 10000 });
// Filter all sellable items only.
const stringifiedFilterRoles = React.useMemo(() => JSON.stringify(
[{ "fieldKey": "sellable", "value":true, "condition":"equals"}]
), []);
const stringifiedFilterRoles = React.useMemo(
() =>
JSON.stringify([
{ index: 1, fieldKey: 'sellable', value: true, condition: '&&', comparator: 'equals', },
{ index: 2, fieldKey: 'active', value: true, condition: '&&', comparator: 'equals' },
]),
[],
);
// Handle fetch Items data table or list
const {
@@ -43,7 +48,7 @@ function ReceiptFormProvider({ receiptId, ...props }) {
isFetching: isItemsLoading,
} = useItems({
page_size: 10000,
stringified_filter_roles: stringifiedFilterRoles
stringified_filter_roles: stringifiedFilterRoles,
});
// Fetch receipt settings.
@@ -73,7 +78,7 @@ function ReceiptFormProvider({ receiptId, ...props }) {
createReceiptMutate,
editReceiptMutate,
setSubmitPayload
setSubmitPayload,
};
return (
<DashboardInsider