Merge branch 'master' of https://github.com/abouolia/Ratteb

client/src/containers/Sales/Invoices/InvoiceDetails/InvoiceDrawer.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import DrawerTemplate from 'containers/Drawers/DrawerTemplate';
-import PaperTemplate from 'containers/Drawers/PaperTemplate';
+import PaperTemplate from 'containers/Drawers/PaperTemplate/PaperTemplate';
 import withDrawers from 'containers/Drawer/withDrawers';
 import withDrawerActions from 'containers/Drawer/withDrawerActions';
 

client/src/containers/Sales/Invoices/InvoicesLanding/InvoicesDataTable.js

@@ -9,10 +9,11 @@ import TableSkeletonRows from 'components/Datatable/TableSkeletonRows';
 import TableSkeletonHeader from 'components/Datatable/TableHeaderSkeleton';
 
 import withDashboardActions from 'containers/Dashboard/withDashboardActions';
-import withInvoices from './withInvoices'; 
+import withInvoices from './withInvoices';
 import withInvoiceActions from './withInvoiceActions';
 import withSettings from 'containers/Settings/withSettings';
 import withAlertsActions from 'containers/Alert/withAlertActions';
+import withDrawerActions from 'containers/Drawer/withDrawerActions';
 
 import { useInvoicesTableColumns, ActionsMenu } from './components';
 import { useInvoicesListContext } from './InvoicesListProvider';
@@ -32,6 +33,9 @@ function InvoicesDataTable({
 
   // #withAlertsActions
   openAlert,
+  
+  // #withDrawerActions
+  openDrawer,
 }) {
   const history = useHistory();
 
@@ -62,6 +66,11 @@ function InvoicesDataTable({
     history.push(`/invoices/${invoice.id}/edit`);
   };
 
+  // Handle drawer invoice.
+  const handleDrawerInvoice = () => {
+    openDrawer('invoice-drawer', {});
+  };
+
   // Handles fetch data once the table state change.
   const handleDataTableFetchData = useCallback(
     ({ pageSize, pageIndex, sortBy }) => {
@@ -104,6 +113,7 @@ function InvoicesDataTable({
         onDelete: handleDeleteInvoice,
         onDeliver: handleDeliverInvoice,
         onEdit: handleEditInvoice,
+        onDrawer: handleDrawerInvoice,
         baseCurrency,
       }}
     />
@@ -114,6 +124,7 @@ export default compose(
   withDashboardActions,
   withInvoiceActions,
   withAlertsActions,
+  withDrawerActions,
   withInvoices(({ invoicesTableState }) => ({ invoicesTableState })),
   withSettings(({ organizationSettings }) => ({
     baseCurrency: organizationSettings?.baseCurrency,

client/src/containers/Sales/Invoices/InvoicesLanding/components.js

@@ -8,7 +8,7 @@ import {
   ProgressBar,
   Popover,
   Position,
-  Button
+  Button,
 } from '@blueprintjs/core';
 import { FormattedMessage as T, useIntl } from 'react-intl';
 import moment from 'moment';
@@ -18,11 +18,9 @@ import { Money, AppToaster } from 'components';
 import { formatMessage } from 'services/intl';
 import { safeCallback } from 'utils';
 
-
 const calculateStatus = (paymentAmount, balanceAmount) => {
   return round(paymentAmount / balanceAmount, 2);
-}
-  
+};
 
 export const statusAccessor = (row) => {
   return (
@@ -95,7 +93,7 @@ export const handleDeleteErrors = (errors) => {
 };
 
 export function ActionsMenu({
-  payload: { onEdit, onDeliver, onDelete },
+  payload: { onEdit, onDeliver, onDelete, onDrawer },
   row: { original },
 }) {
   const { formatMessage } = useIntl();
@@ -119,6 +117,10 @@ export function ActionsMenu({
           onClick={safeCallback(onDeliver, original)}
         />
       </If>
+      <MenuItem
+        text={formatMessage({ id: 'invoice_paper' })}
+        onClick={() => onDrawer()}
+      />
       <MenuItem
         text={formatMessage({ id: 'delete_invoice' })}
         intent={Intent.DANGER}