fix: items entries total calculation.

client/src/containers/Sales/Estimates/EstimateForm/EstimateForm.js

@@ -89,6 +89,7 @@ function EstimateForm({
     );
     const totalQuantity = sumBy(entries, (entry) => parseInt(entry.quantity));
 
+    // Validate the entries quantity should be bigger than zero.
     if (totalQuantity === 0) {
       AppToaster.show({
         message: intl.get('quantity_cannot_be_zero_or_empty'),

client/src/containers/Sales/Estimates/EstimateForm/EstimateFormHeader.js

@@ -1,14 +1,15 @@
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
-import { sumBy } from 'lodash';
 import { useFormikContext } from 'formik';
 import intl from 'react-intl-universal';
 
 import { CLASSES } from 'common/classes';
-
 import EstimateFormHeaderFields from './EstimateFormHeaderFields';
-import { PageFormBigNumber } from 'components';
+
 import withSettings from 'containers/Settings/withSettings';
+
+import { getEntriesTotal } from 'containers/Entries/utils';
+import { PageFormBigNumber } from 'components';
 import { compose } from 'utils';
 
 // Estimate form top header.
@@ -20,7 +21,7 @@ function EstimateFormHeader({
 
   // Calculate the total due amount of bill entries.
   const totalDueAmount = useMemo(
-    () => sumBy(values.entries, 'total'),
+    () => getEntriesTotal(values.entries),
     [values.entries],
   );
 

client/src/containers/Sales/Estimates/EstimateForm/EstimateFormProvider.js

@@ -8,6 +8,7 @@ import {
   useCreateEstimate,
   useEditEstimate,
 } from 'hooks/query';
+import { ITEMS_FILTER_ROLES } from './utils';
 
 const EstimateFormContext = createContext();
 
@@ -18,31 +19,24 @@ function EstimateFormProvider({ estimateId, ...props }) {
   const {
     data: estimate,
     isFetching: isEstimateFetching,
+    isLoading: isEstimateLoading,
   } = useEstimate(estimateId, { enabled: !!estimateId });
 
-  // Filter all sellable items only.
-  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 {
     data: { items },
     isFetching: isItemsFetching,
+    isLoading: isItemsLoading,
   } = useItems({
     page_size: 10000,
-    stringified_filter_roles: stringifiedFilterRoles,
+    stringified_filter_roles: ITEMS_FILTER_ROLES,
   });
 
   // Handle fetch customers data table or list
   const {
     data: { customers },
     isFetch: isCustomersFetching,
+    isLoading: isCustomersLoading,
   } = useCustomers({ page_size: 10000 });
 
   // Handle fetch settings.
@@ -68,6 +62,10 @@ function EstimateFormProvider({ estimateId, ...props }) {
     isItemsFetching,
     isEstimateFetching,
 
+    isCustomersLoading,
+    isItemsLoading,
+    isEstimateLoading,
+
     submitPayload,
     setSubmitPayload,
 
@@ -77,7 +75,7 @@ function EstimateFormProvider({ estimateId, ...props }) {
 
   return (
     <DashboardInsider
-      loading={isCustomersFetching || isItemsFetching || isEstimateFetching}
+      loading={isCustomersLoading || isItemsLoading || isEstimateLoading}
       name={'estimate-form'}
     >
       <EstimateFormContext.Provider value={provider} {...props} />

client/src/containers/Sales/Estimates/EstimateForm/utils.js

@@ -17,6 +17,7 @@ export const defaultEstimateEntry = {
   discount: '',
   quantity: '',
   description: '',
+  amount: '',
 };
 
 export const defaultEstimate = {
@@ -55,7 +56,7 @@ export const useObserveEstimateNoSettings = (prefix, nextNumber) => {
     setFieldValue('estimate_number', estimateNo);
   }, [setFieldValue, prefix, nextNumber]);
 };
-  
+
 /**
  * Detarmines customers fast field when update.
  */
@@ -75,3 +76,20 @@ export const entriesFieldShouldUpdate = (newProps, oldProps) => {
     defaultFastFieldShouldUpdate(newProps, oldProps)
   );
 };
+
+export const ITEMS_FILTER_ROLES = JSON.stringify([
+  {
+    index: 1,
+    fieldKey: 'sellable',
+    value: true,
+    condition: '&&',
+    comparator: 'equals',
+  },
+  {
+    index: 2,
+    fieldKey: 'active',
+    value: true,
+    condition: '&&',
+    comparator: 'equals',
+  },
+]);