From c2650c76e8633369080e7c2a2cd7322494128c4c Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Tue, 23 Nov 2021 20:03:26 +0200
Subject: [PATCH] feat: add invoice ability.
---
.../InvoiceDetailActionsBar.js | 86 +++++++++++--------
.../InvoicesLanding/InvoicesActionsBar.js | 20 +++--
.../Invoices/InvoicesLanding/components.js | 70 +++++++++------
3 files changed, 106 insertions(+), 70 deletions(-)
diff --git a/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailActionsBar.js b/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailActionsBar.js
index b4fa903b7..24052211c 100644
--- a/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailActionsBar.js
+++ b/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailActionsBar.js
@@ -16,7 +16,12 @@ import withDialogActions from 'containers/Dialog/withDialogActions';
import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
-import { If, Icon, FormattedMessage as T } from 'components';
+import { If, Can, Icon, FormattedMessage as T } from 'components';
+import {
+ Invoice_Abilities,
+ PaymentReceive,
+ AbilitySubject,
+} from '../../../common/abilityOption';
import { compose } from 'utils';
@@ -78,43 +83,54 @@ function InvoiceDetailActionsBar({
return (
- }
- text={}
- onClick={handleEditInvoice}
- />
-
-
+
}
- text={}
- onClick={handleQuickPaymentInvoice}
+ icon={}
+ text={}
+ onClick={handleEditInvoice}
/>
-
-
- }
- text={}
- onClick={handlePrintInvoice}
- />
- }
- text={}
- intent={Intent.DANGER}
- onClick={handleDeleteInvoice}
- />
-
-
+
+
+
+
+
+ }
+ text={}
+ onClick={handleQuickPaymentInvoice}
+ />
+
+
+
+
+ }
+ text={}
+ onClick={handlePrintInvoice}
+ />
+
+
+ }
+ text={}
+ intent={Intent.DANGER}
+ onClick={handleDeleteInvoice}
+ />
+
+
+
+
+
);
diff --git a/src/containers/Sales/Invoices/InvoicesLanding/InvoicesActionsBar.js b/src/containers/Sales/Invoices/InvoicesLanding/InvoicesActionsBar.js
index 6b03ab3a7..c91b96e96 100644
--- a/src/containers/Sales/Invoices/InvoicesLanding/InvoicesActionsBar.js
+++ b/src/containers/Sales/Invoices/InvoicesLanding/InvoicesActionsBar.js
@@ -18,7 +18,11 @@ import {
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
-import { If, DashboardActionViewsList } from 'components';
+import { Can, If, DashboardActionViewsList } from 'components';
+import {
+ Invoice_Abilities,
+ AbilitySubject,
+} from '../../../../common/abilityOption';
import { useRefreshInvoices } from 'hooks/query/invoices';
import { useInvoicesListContext } from './InvoicesListProvider';
@@ -84,12 +88,14 @@ function InvoiceActionsBar({
onChange={handleTabChange}
/>
- }
- text={}
- onClick={handleClickNewInvoice}
- />
+
+ }
+ text={}
+ onClick={handleClickNewInvoice}
+ />
+
{
return (
@@ -55,7 +61,6 @@ export const statusAccessor = (row) => {
})}
-
- }
- text={intl.get('edit_invoice')}
- onClick={safeCallback(onEdit, original)}
- />
-
+
+
}
- text={intl.get('mark_as_delivered')}
- onClick={safeCallback(onDeliver, original)}
+ icon={}
+ text={intl.get('edit_invoice')}
+ onClick={safeCallback(onEdit, original)}
/>
-
-
+
+
+ }
+ text={intl.get('mark_as_delivered')}
+ onClick={safeCallback(onDeliver, original)}
+ />
+
+
+
+
+ }
+ text={intl.get('add_payment')}
+ onClick={safeCallback(onQuick, original)}
+ />
+
+
+
}
- text={intl.get('add_payment')}
- onClick={safeCallback(onQuick, original)}
+ icon={}
+ text={intl.get('print')}
+ onClick={safeCallback(onPrint, original)}
/>
-
- }
- text={intl.get('print')}
- onClick={safeCallback(onPrint, original)}
- />
- }
- />
+
+
+ }
+ />
+
);
}