Merge remote-tracking branch 'origin/master'

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

@@ -10,7 +10,7 @@ import DataTable from 'components/DataTable';
 import {
   InputGroupCell,
   MoneyFieldCell,
-  EstimatesListFieldCell,
+  ItemsListCell,
   PercentFieldCell,
   DivFieldCell,
 } from 'components/DataTableCells';
@@ -76,7 +76,7 @@ const ItemHeaderCell = () => {
   );
 };
 
-function EstimateTable({
+function EntriesItemsTable({
   //#withitems
   itemsCurrentPage,
 
@@ -109,7 +109,8 @@ function EstimateTable({
         Header: ItemHeaderCell,
         id: 'item_id',
         accessor: 'item_id',
-        Cell: EstimatesListFieldCell,
+        Cell: ItemsListCell,
+        // ItemsListCell
         disableSortBy: true,
         width: 180,
       },
@@ -239,7 +240,7 @@ function EstimateTable({
         data={rows}
         rowClassNames={rowClassNames}
         payload={{
-          products: itemsCurrentPage,
+          items: itemsCurrentPage,
           errors: errors.entries || [],
           updateData: handleUpdateData,
           removeRow: handleRemoveRow,
@@ -270,4 +271,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}
@@ -350,7 +350,7 @@ const EstimateForm = ({
           </Row>
         </div>
       </form>
-      <EstimateFormFooter
+      <EstimateFloatingActions
         formik={formik}
         onSubmitClick={handleSubmitClick}
         estimate={estimate}