From 542110fdf3af4e17836e8fbfabb4d7df81648f3b Mon Sep 17 00:00:00 2001
From: "a.bouhuolia" <a.bouhuolia@live.com>
Date: Wed, 24 Mar 2021 12:10:00 +0200
Subject: [PATCH] amend.

---
 .../EstimateForm/EstimateFormProvider.js      | 28 +++++++++++--------
 .../InvoiceForm/InvoiceFormProvider.js        | 13 ++++++---
 .../ReceiptForm/ReceiptFormProvider.js        | 17 +++++++----
 .../style/containers/Dashboard/Sidebar.scss   |  2 +-
 4 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/client/src/containers/Sales/Estimates/EstimateForm/EstimateFormProvider.js b/client/src/containers/Sales/Estimates/EstimateForm/EstimateFormProvider.js
index f0a17148b..3c942de78 100644
--- a/client/src/containers/Sales/Estimates/EstimateForm/EstimateFormProvider.js
+++ b/client/src/containers/Sales/Estimates/EstimateForm/EstimateFormProvider.js
@@ -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 (
diff --git a/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormProvider.js b/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormProvider.js
index 37f3201d9..539f09e33 100644
--- a/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormProvider.js
+++ b/client/src/containers/Sales/Invoices/InvoiceForm/InvoiceFormProvider.js
@@ -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
diff --git a/client/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormProvider.js b/client/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormProvider.js
index f5d3b6e28..29ab728ed 100644
--- a/client/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormProvider.js
+++ b/client/src/containers/Sales/Receipts/ReceiptForm/ReceiptFormProvider.js
@@ -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
diff --git a/client/src/style/containers/Dashboard/Sidebar.scss b/client/src/style/containers/Dashboard/Sidebar.scss
index eb9830bac..c2102933e 100644
--- a/client/src/style/containers/Dashboard/Sidebar.scss
+++ b/client/src/style/containers/Dashboard/Sidebar.scss
@@ -60,7 +60,7 @@
         font-size: 15px;
 
         &:not([class*="bp3-intent-"]):not(.bp3-minimal) {
-          color: rgba(255, 255, 255, 0.95);
+          color: rgb(255, 255, 255);
         }
         &:hover,
         &:focus,