Fix EntriesItemTable & FloatingActions

client/src/containers/Sales/Estimate/EntriesItemsTable.js

@@ -9,7 +9,7 @@ import DataTable from 'components/DataTable';
 import {
   InputGroupCell,
   MoneyFieldCell,
-  EstimatesListFieldCell,
+  ItemsListCell,
   PercentFieldCell,
   DivFieldCell,
 } from 'components/DataTableCells';
@@ -75,7 +75,7 @@ const ItemHeaderCell = () => {
   );
 };
 
-function EstimateTable({
+function EntriesItemsTable({
   //#withitems
   itemsCurrentPage,
 
@@ -108,7 +108,8 @@ function EstimateTable({
         Header: ItemHeaderCell,
         id: 'item_id',
         accessor: 'item_id',
-        Cell: EstimatesListFieldCell,
+        Cell: ItemsListCell,
+        // ItemsListCell
         disableSortBy: true,
         width: 180,
       },
@@ -235,7 +236,7 @@ function EstimateTable({
         data={rows}
         rowClassNames={rowClassNames}
         payload={{
-          products: itemsCurrentPage,
+          items: itemsCurrentPage,
           errors: errors.entries || [],
           updateData: handleUpdateData,
           removeRow: handleRemoveRow,
@@ -267,4 +268,4 @@ export default compose(
   withItems(({ itemsCurrentPage }) => ({
     itemsCurrentPage,
   })),
-)(EstimateTable);
+)(EntriesItemsTable);

client/src/containers/Sales/Estimate/EstimateFloatingActions.js

@@ -3,7 +3,7 @@ import { Intent, Button } from '@blueprintjs/core';
 import { FormattedMessage as T } from 'react-intl';
 import { queryCache } from 'react-query';
 
-export default function EstimateFormFooter({
+export default function EstimateFloatingActions({
   formik: { isSubmitting, resetForm },
   onSubmitClick,
   onCancelClick,

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

@@ -15,8 +15,8 @@ import classNames from 'classnames';
 
 import { CLASSES } from 'common/classes';
 import EstimateFormHeader from './EstimateFormHeader';
-import EstimatesItemsTable from './EntriesItemsTable';
-import EstimateFormFooter from './EstimateFormFooter';
+import EntriesItemsTable from './EntriesItemsTable';
+import EstimateFloatingActions from './EstimateFloatingActions';
 
 import withEstimateActions from './withEstimateActions';
 import withEstimateDetail from './withEstimateDetail';
@@ -308,7 +308,7 @@ const EstimateForm = ({
     )}>
       <form onSubmit={formik.handleSubmit}>
         <EstimateFormHeader formik={formik} />
-        <EstimatesItemsTable
+        <EntriesItemsTable
           entries={formik.values.entries}
           onClickAddNewRow={handleClickAddNewRow}
           onClickClearAllLines={handleClearAllLines}
@@ -349,7 +349,7 @@ const EstimateForm = ({
           </Row>
         </div>
       </form>
-      <EstimateFormFooter
+      <EstimateFloatingActions
         formik={formik}
         onSubmitClick={handleSubmitClick}
         estimate={estimate}

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { Intent, Button } from '@blueprintjs/core';
 import { FormattedMessage as T } from 'react-intl';
 
-export default function EstimateFormFooter({
+export default function InvoiceFloatingActions({
   formik: { isSubmitting },
   onSubmitClick,
   onCancelClick,

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

@@ -14,8 +14,8 @@ import { pick } from 'lodash';
 import { Row, Col } from 'react-grid-system';
 
 import InvoiceFormHeader from './InvoiceFormHeader';
-import EstimatesItemsTable from 'containers/Sales/Estimate/EntriesItemsTable';
-import InvoiceFormFooter from './InvoiceFormFooter';
+import EntriesItemsTable from 'containers/Sales/Estimate/EntriesItemsTable';
+import InvoiceFloatingActions from './InvoiceFloatingActions';
 
 import withInvoiceActions from './withInvoiceActions';
 import withInvoiceDetail from './withInvoiceDetail';
@@ -310,7 +310,7 @@ function InvoiceForm({
     <div className={'invoice-form'}>
       <form onSubmit={formik.handleSubmit}>
         <InvoiceFormHeader formik={formik} />
-        <EstimatesItemsTable
+        <EntriesItemsTable
           entries={formik.values.entries}
           onClickAddNewRow={handleClickAddNewRow}
           onClickClearAllLines={handleClearAllLines}
@@ -349,7 +349,7 @@ function InvoiceForm({
         </Row>
       </form>
 
-      <InvoiceFormFooter
+      <InvoiceFloatingActions
         formik={formik}
         onSubmitClick={handleSubmitClick}
         invoice={invoice}

client/src/containers/Sales/PaymentReceive/PaymentReceiveForm.js

@@ -16,7 +16,7 @@ import { pick, values } from 'lodash';
 
 import PaymentReceiveHeader from './PaymentReceiveFormHeader';
 import PaymentReceiveItemsTable from './PaymentReceiveItemsTable';
-import PaymentReceiveFooter from './PaymentReceiveFormFooter';
+import PaymentReceiveFloatingActions from './PaymentReceiveFloatingActions';
 
 import withDashboardActions from 'containers/Dashboard/withDashboardActions';
 import withMediaActions from 'containers/Media/withMediaActions';
@@ -320,7 +320,7 @@ function PaymentReceiveForm({
         /> */}
       </form>
 
-      <PaymentReceiveFooter
+      <PaymentReceiveFloatingActions
         formik={formik}
         onSubmitClick={handleSubmitClick}
         paymentReceive={paymentReceive}

client/src/containers/Sales/PaymentReceive/PaymentReceiveItemsTable.js

@@ -10,7 +10,7 @@ import { compose, formattedAmount, transformUpdatedRows } from 'utils';
 import {
   InputGroupCell,
   MoneyFieldCell,
-  EstimatesListFieldCell,
+  ItemsListCell,
   DivFieldCell,
   EmptyDiv,
 } from 'components/DataTableCells';

client/src/containers/Sales/Receipt/ReceiptForm.js

@@ -15,8 +15,8 @@ import { pick } from 'lodash';
 import { Row, Col } from 'react-grid-system';
 
 import ReceiptFromHeader from './ReceiptFormHeader';
-import EstimatesItemsTable from 'containers/Sales/Estimate/EntriesItemsTable';
-import ReceiptFormFooter from './ReceiptFormFooter';
+import EntriesItemsTable from 'containers/Sales/Estimate/EntriesItemsTable';
+import ReceiptReceiveFloatingActions from './ReceiptReceiveFloatingActions';
 
 import withReceiptActions from './withReceiptActions';
 import withReceiptDetail from './withReceiptDetail';
@@ -309,7 +309,7 @@ function ReceiptForm({
       <form onSubmit={formik.handleSubmit}>
         <ReceiptFromHeader formik={formik} />
 
-        <EstimatesItemsTable
+        <EntriesItemsTable
           entries={formik.values.entries}
           onClickAddNewRow={handleClickAddNewRow}
           onClickClearAllLines={handleClearAllLines}
@@ -348,7 +348,7 @@ function ReceiptForm({
           </Col>
         </Row>
       </form>
-      <ReceiptFormFooter
+      <ReceiptReceiveFloatingActions
         formik={formik}
         onSubmitClick={handleSubmitClick}
         receipt={receipt}

client/src/containers/Sales/Receipt/ReceiptReceiveFloatingActions.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { Intent, Button } from '@blueprintjs/core';
 import { FormattedMessage as T } from 'react-intl';
 
-export default function ReceiptFormFooter({
+export default function ReceiptReceiveFloatingActions({
   formik: { isSubmitting },
   onSubmitClick,
   onCancelClick,