feature : Puschases & Sales / fix : tasks

client/src/containers/Sales/Invoice/InvoiceForm.js

@@ -11,6 +11,7 @@ import moment from 'moment';
 import { Intent, FormGroup, TextArea, Button } from '@blueprintjs/core';
 import { FormattedMessage as T, useIntl } from 'react-intl';
 import { pick } from 'lodash';
+import { Row, Col } from 'react-grid-system';
 
 import InvoiceFormHeader from './InvoiceFormHeader';
 import EstimatesItemsTable from 'containers/Sales/Estimate/EntriesItemsTable';
@@ -162,7 +163,7 @@ function InvoiceForm({
       index: index + 1,
     }));
   };
-  // debugger;
+
   const initialValues = useMemo(
     () => ({
       ...(invoice
@@ -186,14 +187,6 @@ function InvoiceForm({
     [invoice, defaultInitialValues, defaultInvoice],
   );
 
-  // const initialValues = useMemo(
-  //   () => ({
-  //     ...defaultInitialValues,
-  //     entries: orderingIndex(defaultInitialValues.entries),
-  //   }),
-  //   [defaultInvoice, defaultInitialValues, invoice],
-  // );
-
   const initialAttachmentFiles = useMemo(() => {
     return invoice && invoice.media
       ? invoice.media.map((attach) => ({
@@ -308,31 +301,39 @@ function InvoiceForm({
           onClickClearAllLines={handleClearAllLines}
           formik={formik}
         />
-        <FormGroup
-          label={<T id={'invoice_message'} />}
-          className={'form-group--customer_note'}
-        >
-          <TextArea
-            growVertically={true}
-            {...formik.getFieldProps('invoice_message')}
-          />
-        </FormGroup>
-        <FormGroup
-          label={<T id={'terms_conditions'} />}
-          className={'form-group--terms_conditions'}
-        >
-          <TextArea
-            growVertically={true}
-            {...formik.getFieldProps('terms_conditions')}
-          />
-        </FormGroup>
-        <Dragzone
-          initialFiles={initialAttachmentFiles}
-          onDrop={handleDropFiles}
-          onDeleteFile={handleDeleteFile}
-          hint={'Attachments: Maxiumum size: 20MB'}
-        />
+        <Row>
+          <Col>
+            <FormGroup
+              label={<T id={'invoice_message'} />}
+              className={'form-group--customer_note'}
+            >
+              <TextArea
+                growVertically={true}
+                {...formik.getFieldProps('invoice_message')}
+              />
+            </FormGroup>
+            <FormGroup
+              label={<T id={'terms_conditions'} />}
+              className={'form-group--terms_conditions'}
+            >
+              <TextArea
+                growVertically={true}
+                {...formik.getFieldProps('terms_conditions')}
+              />
+            </FormGroup>
+          </Col>
+
+          <Col>
+            <Dragzone
+              initialFiles={initialAttachmentFiles}
+              onDrop={handleDropFiles}
+              onDeleteFile={handleDeleteFile}
+              hint={'Attachments: Maxiumum size: 20MB'}
+            />
+          </Col>
+        </Row>
       </form>
+
       <InvoiceFormFooter
         formik={formik}
         onSubmitClick={handleSubmitClick}

client/src/containers/Sales/Invoice/InvoiceFormFooter.js

@@ -9,7 +9,7 @@ export default function EstimateFormFooter({
   invoice,
 }) {
   return (
-    <div className={'estimate-form__floating-footer'}>
+    <div className={'form__floating-footer'}>
       <Button
         disabled={isSubmitting}
         intent={Intent.PRIMARY}

client/src/containers/Sales/Invoice/InvoiceFormHeader.js

@@ -68,8 +68,8 @@ function InvoiceFormHeader({
   );
 
   return (
-    <div className={'invoice-form'}>
-      <div className={'invoice__primary-section'}>
+    <div class="page-form page-form--invoice">
+      <div className={'page-form__primary-section'}>
         {/* customer name */}
         <FormGroup
           label={<T id={'customer_name'} />}

client/src/containers/Sales/Invoice/Invoices.js

@@ -19,6 +19,12 @@ function Invoices({
   const history = useHistory();
   const { id } = useParams();
 
+  const fetchInvoice = useQuery(
+    ['invoice', id],
+    (key, _id) => requsetFetchInvoice(_id),
+    { enabled: !!id },
+  );
+
   // Handle fetch Items data table or list
   const fetchItems = useQuery('items-table', () => requestFetchItems({}));
 
@@ -33,12 +39,6 @@ function Invoices({
     requestFetchCustomers({}),
   );
 
-  const fetchInvoice = useQuery(
-    ['invoice', id],
-    (key, _id) => requsetFetchInvoice(_id),
-    { enabled: !!id },
-  );
-
   const handleCancel = useCallback(() => {
     history.goBack();
   }, [history]);

client/src/containers/Sales/Invoice/withInvoiceActions.js

@@ -5,17 +5,18 @@ import {
   deleteInvoice,
   fetchInvoice,
   fetchInvoicesTable,
+  dueInvoices,
 } from 'store/Invoice/invoices.actions';
 import t from 'store/types';
 
 const mapDipatchToProps = (dispatch) => ({
   requestSubmitInvoice: (form) => dispatch(submitInvoice({ form })),
   requsetFetchInvoice: (id) => dispatch(fetchInvoice({ id })),
-  requestEditInvoice: (id, form) => dispatch(editInvoice( id, form )),
+  requestEditInvoice: (id, form) => dispatch(editInvoice(id, form)),
   requestFetchInvoiceTable: (query = {}) =>
     dispatch(fetchInvoicesTable({ query: { ...query } })),
   requestDeleteInvoice: (id) => dispatch(deleteInvoice({ id })),
-
+  requestFetchDueInvoices: (id) => dispatch(dueInvoices({ id })),
   changeInvoiceView: (id) =>
     dispatch({
       type: t.INVOICES_SET_CURRENT_VIEW,

client/src/containers/Sales/Invoice/withInvoices.js

@@ -3,21 +3,28 @@ import { getResourceViews } from 'store/customViews/customViews.selectors';
 import {
   getInvoiceCurrentPageFactory,
   getInvoicePaginationMetaFactory,
+  getInvoiceTableQueryFactory,
   getInvoiceTableQuery,
+  getdueInvoices,
 } from 'store/Invoice/invoices.selector';
 
 export default (mapState) => {
   const getInvoicesItems = getInvoiceCurrentPageFactory();
+
   const getInvoicesPaginationMeta = getInvoicePaginationMetaFactory();
+  const getInvoiceTableQuery = getInvoiceTableQueryFactory();
+
   const mapStateToProps = (state, props) => {
     const query = getInvoiceTableQuery(state, props);
+
     const mapped = {
       invoicesCurrentPage: getInvoicesItems(state, props, query),
       invoicesViews: getResourceViews(state, props, 'sales_invoices'),
-      invoicesItems: state.sales_invoices.items,
+      invoicesItems: state.salesInvoices.items,
       invoicesTableQuery: query,
       invoicesPageination: getInvoicesPaginationMeta(state, props, query),
-      invoicesLoading: state.sales_invoices.loading,
+      invoicesLoading: state.salesInvoices.loading,
+      dueInvoices: getdueInvoices(state, props),
     };
     return mapState ? mapState(mapped, state, props) : mapped;
   };