QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-19 22:30:31 +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

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

@@ -6,7 +6,7 @@ import {
useItems, useItems,
useSettingsEstimates, useSettingsEstimates,
useCreateEstimate, useCreateEstimate,
useEditEstimate useEditEstimate,
} from 'hooks/query'; } from 'hooks/query';
const EstimateFormContext = createContext(); const EstimateFormContext = createContext();
@@ -15,14 +15,20 @@ const EstimateFormContext = createContext();
* Estimate form provider. * Estimate form provider.
*/ */
function EstimateFormProvider({ estimateId, ...props }) { function EstimateFormProvider({ estimateId, ...props }) {
const { data: estimate, isFetching: isEstimateFetching } = useEstimate( const {
estimateId, { enabled: !!estimateId } data: estimate,
); isFetching: isEstimateFetching,
} = useEstimate(estimateId, { enabled: !!estimateId });
// Filter all sellable items only. // Filter all sellable items only.
const stringifiedFilterRoles = React.useMemo(() => JSON.stringify( const stringifiedFilterRoles = React.useMemo(
[{ "fieldKey": "sellable", "value":true, "condition":"equals"}] () =>
), []); 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 // Handle fetch Items data table or list
const { const {
@@ -30,7 +36,7 @@ function EstimateFormProvider({ estimateId, ...props }) {
isFetching: isItemsFetching, isFetching: isItemsFetching,
} = useItems({ } = useItems({
page_size: 10000, page_size: 10000,
stringified_filter_roles: stringifiedFilterRoles stringified_filter_roles: stringifiedFilterRoles,
}); });
// Handle fetch customers data table or list // Handle fetch customers data table or list
@@ -66,7 +72,7 @@ function EstimateFormProvider({ estimateId, ...props }) {
setSubmitPayload, setSubmitPayload,
createEstimateMutate, createEstimateMutate,
editEstimateMutate editEstimateMutate,
}; };
return ( 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. // Filter all sellable items only.
const stringifiedFilterRoles = React.useMemo(() => JSON.stringify( const stringifiedFilterRoles = React.useMemo(
[{ "fieldKey": "sellable", "value":true, "condition":"equals"}] () =>
), []); 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. // Handle fetching the items table based on the given query.
const { const {
@@ -49,7 +54,7 @@ function InvoiceFormProvider({ invoiceId, ...props }) {
isLoading: isItemsLoading, isLoading: isItemsLoading,
} = useItems({ } = useItems({
page_size: 10000, page_size: 10000,
stringified_filter_roles: stringifiedFilterRoles stringified_filter_roles: stringifiedFilterRoles,
}); });
// Handle fetch customers data table or list // Handle fetch customers data table or list

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

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

2
client/src/style/containers/Dashboard/Sidebar.scss
View File

@@ -60,7 +60,7 @@
font-size: 15px; font-size: 15px;
&:not([class*="bp3-intent-"]):not(.bp3-minimal) { &:not([class*="bp3-intent-"]):not(.bp3-minimal) {
color: rgba(255, 255, 255, 0.95); color: rgb(255, 255, 255);
} }
&:hover, &:hover,
&:focus, &:focus,