QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-17 21:30:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
a.bouhuolia
2021-08-21 19:00:31 +02:00
parent 79c1b2ab67 7234bc4757
commit 42c0d6be95
29 changed files with 663 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/components/DialogsContainer.js
View File

@@ -15,6 +15,8 @@ import QuickPaymentReceiveFormDialog from 'containers/Dialogs/QuickPaymentReceiv
import QuickPaymentMadeFormDialog from 'containers/Dialogs/QuickPaymentMadeFormDialog';
import AllocateLandedCostDialog from 'containers/Dialogs/AllocateLandedCostDialog';
import InvoicePdfPreviewDialog from 'containers/Dialogs/InvoicePdfPreviewDialog';
import EstimatePdfPreviewDialog from 'containers/Dialogs/EstimatePdfPreviewDialog';
import ReceiptPdfPreviewDialog from '../containers/Dialogs/ReceiptPdfPreviewDialog';
/**
* Dialogs container.
@@ -35,7 +37,9 @@ export default function DialogsContainer() {
<QuickPaymentReceiveFormDialog dialogName={'quick-payment-receive'} />
<QuickPaymentMadeFormDialog dialogName={'quick-payment-made'} />
<AllocateLandedCostDialog dialogName={'allocate-landed-cost'} />
<InvoicePdfPreviewDialog dialog={'invoice-pdf-preview'} />
<InvoicePdfPreviewDialog dialogName={'invoice-pdf-preview'} />
<EstimatePdfPreviewDialog dialogName={'estimate-pdf-preview'} />
<ReceiptPdfPreviewDialog dialogName={'receipt-pdf-preview'} />
</div>
);
}

2
client/src/components/DrawersContainer.js
View File

@@ -11,6 +11,7 @@ import InvoiceDetailDrawer from 'containers/Drawers/InvoiceDetailDrawer';
import ReceiptDetailDrawer from 'containers/Drawers/ReceiptDetailDrawer';
import PaymentReceiveDetailDrawer from 'containers/Drawers/PaymentReceiveDetailDrawer';
import PaymentMadeDetailDrawer from 'containers/Drawers/PaymentMadeDetailDrawer';
import EstimateDetailDrawer from '../containers/Drawers/EstimateDetailDrawer';
export default function DrawersContainer() {
return (
@@ -24,6 +25,7 @@ export default function DrawersContainer() {
<ExpenseDrawer name={'expense-drawer'} />
<BillDrawer name={'bill-drawer'} />
<InvoiceDetailDrawer name={'invoice-detail-drawer'} />
<EstimateDetailDrawer name={'estimate-detail-drawer'} />
<ReceiptDetailDrawer name={'receipt-detail-drawer'} />
<PaymentReceiveDetailDrawer name={'payment-receive-detail-drawer'} />
<PaymentMadeDetailDrawer name={'payment-made-detail-drawer'} />

50
client/src/containers/Dialogs/EstimatePdfPreviewDialog/EstimatePdfPreviewDialogContent.js Normal file
View File

@@ -0,0 +1,50 @@
import React from 'react';
import { AnchorButton } from '@blueprintjs/core';
import { DialogContent, PdfDocumentPreview, T } from 'components';
import { usePdfEstimate } from 'hooks/query';
import withDialogActions from 'containers/Dialog/withDialogActions';
import { compose } from 'utils';
function EstimatePdfPreviewDialogContent({
subscriptionForm: { estimateId },
dialogName,
// #withDialogActions
closeDialog,
}) {
const { isLoading, pdfUrl } = usePdfEstimate(estimateId);
return (
<DialogContent>
<div class="dialog__header-actions">
<AnchorButton
href={pdfUrl}
target={'__blank'}
minimal={true}
outlined={true}
>
<T id={'pdf_preview.preview.button'} />
</AnchorButton>
<AnchorButton
href={pdfUrl}
download={'estimate.pdf'}
minimal={true}
outlined={true}
>
<T id={'pdf_preview.download.button'} />
</AnchorButton>
</div>
<PdfDocumentPreview
height={760}
width={1000}
isLoading={isLoading}
url={pdfUrl}
/>
</DialogContent>
);
}
export default compose(withDialogActions)(EstimatePdfPreviewDialogContent);

44
client/src/containers/Dialogs/EstimatePdfPreviewDialog/index.js Normal file
View File

@@ -0,0 +1,44 @@
import React from 'react';
import classNames from 'classnames';
import { T, Dialog, DialogSuspense } from 'components';
import { CLASSES } from 'common/classes';
import withDialogRedux from 'components/DialogReduxConnect';
import { compose } from 'utils';
// Lazy loading the content.
const PdfPreviewDialogContent = React.lazy(() =>
import('./EstimatePdfPreviewDialogContent'),
);
/**
* Estimate PDF preview dialog.
*/
function EstimatePdfPreviewDialog({
dialogName,
payload = { estimateId: null },
isOpen,
}) {
return (
<Dialog
name={dialogName}
title={<T id={'estimate_preview.dialog.title'} />}
className={classNames(CLASSES.DIALOG_PDF_PREVIEW)}
autoFocus={true}
canEscapeKeyClose={true}
isOpen={isOpen}
style={{ width: '1000px' }}
>
<DialogSuspense>
<PdfPreviewDialogContent
dialogName={dialogName}
subscriptionForm={payload}
/>
</DialogSuspense>
</Dialog>
);
}
export default compose(withDialogRedux())(EstimatePdfPreviewDialog);

9
client/src/containers/Dialogs/InvoicePdfPreviewDialog/InvoicePdfPreviewDialogContent.js
View File

@@ -8,17 +8,18 @@ import withDialogActions from 'containers/Dialog/withDialogActions';
import { compose } from 'utils';
function InvoicePdfPreviewDialogContent({
subscriptionForm: { invoiceId },
// #withDialog
closeDialog,
}) {
const { isLoading, pdfUrl } = usePdfInvoice(1);
const { isLoading, pdfUrl } = usePdfInvoice(invoiceId);
return (
<DialogContent>
<div class="dialog__header-actions">
<AnchorButton
href={pdfUrl}
download={'invoice.pdf'}
target={'__blank'}
minimal={true}
outlined={true}
>
@@ -27,7 +28,7 @@ function InvoicePdfPreviewDialogContent({
<AnchorButton
href={pdfUrl}
target={'__blank'}
download={'invoice.pdf'}
minimal={true}
outlined={true}
>
@@ -45,4 +46,4 @@ function InvoicePdfPreviewDialogContent({
);
}
export default compose(withDialogActions)(InvoicePdfPreviewDialogContent);
export default compose(withDialogActions)(InvoicePdfPreviewDialogContent);

49
client/src/containers/Dialogs/ReceiptPdfPreviewDialog/ReceiptPdfPreviewDialogContent.js Normal file
View File

@@ -0,0 +1,49 @@
import React from 'react';
import { AnchorButton } from '@blueprintjs/core';
import { DialogContent, PdfDocumentPreview, T } from 'components';
import { usePdfReceipt } from 'hooks/query';
import withDialogActions from 'containers/Dialog/withDialogActions';
import { compose } from 'utils';
function ReceiptPdfPreviewDialogContent({
subscriptionForm: { receiptId },
// #withDialogActions
closeDialog,
}) {
const { isLoading, pdfUrl } = usePdfReceipt(receiptId);
return (
<DialogContent>
<div class="dialog__header-actions">
<AnchorButton
href={pdfUrl}
target={'__blank'}
minimal={true}
outlined={true}
>
<T id={'pdf_preview.preview.button'} />
</AnchorButton>
<AnchorButton
href={pdfUrl}
download={'receipt.pdf'}
minimal={true}
outlined={true}
>
<T id={'pdf_preview.download.button'} />
</AnchorButton>
</div>
<PdfDocumentPreview
height={760}
width={1000}
isLoading={isLoading}
url={pdfUrl}
/>
</DialogContent>
);
}
export default compose(withDialogActions)(ReceiptPdfPreviewDialogContent);

43
client/src/containers/Dialogs/ReceiptPdfPreviewDialog/index.js Normal file
View File

@@ -0,0 +1,43 @@
import React from 'react';
import classNames from 'classnames';
import { T, Dialog, DialogSuspense } from 'components';
import { CLASSES } from 'common/classes';
import withDialogRedux from 'components/DialogReduxConnect';
import { compose } from 'utils';
// Lazy loading the content.
const PdfPreviewDialogContent = React.lazy(() =>
import('./ReceiptPdfPreviewDialogContent'),
);
/**
* Receipt Pdf preview dialog.
*/
function ReceiptPdfPreviewDialog({
dialogName,
payload = { receiptId: null },
isOpen,
}) {
return (
<Dialog
name={dialogName}
title={<T id={'receipt_preview.dialog.title'} />}
className={classNames(CLASSES.DIALOG_PDF_PREVIEW)}
autoFocus={true}
canEscapeKeyClose={true}
isOpen={isOpen}
style={{ width: '1000px' }}
>
<DialogSuspense>
<PdfPreviewDialogContent
dialogName={dialogName}
subscriptionForm={payload}
/>
</DialogSuspense>
</Dialog>
);
}
export default compose(withDialogRedux())(ReceiptPdfPreviewDialog);

21
client/src/containers/Drawers/EstimateDetailDrawer/EstimateDetail.js Normal file
View File

@@ -0,0 +1,21 @@
import React from 'react';
import { Tabs, Tab } from '@blueprintjs/core';
import intl from 'react-intl-universal';
import EstimateDetailTab from './EstimateDetailTab';
/**
* Estimate view detail
*/
export default function EstimateDetail() {
return (
<div className="view-detail-drawer">
<Tabs animate={true} large={true}>
<Tab
title={intl.get('details')}
id={'details'}
panel={<EstimateDetailTab />}
/>
</Tabs>
</div>
);
}

20
client/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailDrawerContent.js Normal file
View File

@@ -0,0 +1,20 @@
import React from 'react';
import 'style/components/Drawers/ViewDetail/ViewDetail.scss';
import EstimateDetail from './EstimateDetail';
import { EstimateDetailDrawerProvider } from './EstimateDetailDrawerProvider';
/**
* Estimate detail drawer content.
*/
export default function EstimateDetailDrawerContent({
// #ownProp
estimate,
}) {
return (
<EstimateDetailDrawerProvider estimateId={estimate}>
<EstimateDetail />
</EstimateDetailDrawerProvider>
);
}

30
client/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailDrawerProvider.js Normal file
View File

@@ -0,0 +1,30 @@
import React from 'react';
import intl from 'react-intl-universal';
import { DrawerHeaderContent, DashboardInsider } from 'components';
const EstimateDetailDrawerContext = React.createContext();
/**
* Estimate detail provider.
*/
function EstimateDetailDrawerProvider({ estimateId, ...props }) {
const provider = {
estimateId,
};
return (
<DashboardInsider>
<DrawerHeaderContent
name="estimate-detail-drawer"
title={intl.get('estimate_details')}
/>
<EstimateDetailDrawerContext.Provider value={provider} {...props} />
</DashboardInsider>
);
}
const useEstimateDetailDrawerContext = () =>
React.useContext(EstimateDetailDrawerContext);
export { EstimateDetailDrawerProvider, useEstimateDetailDrawerContext };

89
client/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailTab.js Normal file
View File

@@ -0,0 +1,89 @@
import React from 'react';
import { useHistory } from 'react-router-dom';
import {
Button,
NavbarGroup,
Classes,
NavbarDivider,
Intent,
} from '@blueprintjs/core';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import { useEstimateDetailDrawerContext } from './EstimateDetailDrawerProvider';
import withDialogActions from 'containers/Dialog/withDialogActions';
import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { Icon, FormattedMessage as T } from 'components';
import { safeCallback, compose } from 'utils';
function EstimateDetailTab({
// #withDialogActions
openDialog,
// #withAlertsActions
openAlert,
// #withDrawerActions
closeDrawer,
}) {
const history = useHistory();
const { estimateId } = useEstimateDetailDrawerContext();
// Handle edit sale estimate.
const onEditEstimate = () => {
return estimateId
? (history.push(`/estimates/${estimateId}/edit`),
closeDrawer('estimate-detail-drawer'))
: null;
};
// Handle delete sale estimate.
const onDeleteEstimate = () => {
return estimateId
? (openAlert('estimate-delete', { estimateId }),
closeDrawer('estimate-detail-drawer'))
: null;
};
// Handle print estimate.
const onPrintEstimate = () => {
openDialog('estimate-pdf-preview', { estimateId });
};
return (
<DashboardActionsBar>
<NavbarGroup>
<Button
className={Classes.MINIMAL}
icon={<Icon icon="pen-18" />}
text={<T id={'edit_estimate'} />}
onClick={safeCallback(onEditEstimate)}
/>
<NavbarDivider />
<Button
className={Classes.MINIMAL}
icon={<Icon icon="print-16" />}
text={<T id={'print'} />}
onClick={safeCallback(onPrintEstimate)}
/>
<Button
className={Classes.MINIMAL}
icon={<Icon icon={'trash-16'} iconSize={16} />}
text={<T id={'delete'} />}
intent={Intent.DANGER}
onClick={safeCallback(onDeleteEstimate)}
/>
</NavbarGroup>
</DashboardActionsBar>
);
}
export default compose(
withDialogActions,
withAlertsActions,
withDrawerActions,
)(EstimateDetailTab);

26
client/src/containers/Drawers/EstimateDetailDrawer/index.js Normal file
View File

@@ -0,0 +1,26 @@
import React from 'react';
import { Drawer, DrawerSuspense } from 'components';
import withDrawers from 'containers/Drawer/withDrawers';
import { compose } from 'utils';
const EstimateDetailDrawerContent = React.lazy(() =>
import('./EstimateDetailDrawerContent'),
);
function EstimateDetailDrawer({
name,
// #withDrawer
isOpen,
payload: { estimateId },
}) {
return (
<Drawer isOpen={isOpen} name={name} size={'750px'}>
<DrawerSuspense>
<EstimateDetailDrawerContent estimate={estimateId} />
</DrawerSuspense>
</Drawer>
);
}
export default compose(withDrawers())(EstimateDetailDrawer);

9
client/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetail.js
View File

@@ -3,13 +3,14 @@ import { Tabs, Tab } from '@blueprintjs/core';
import intl from 'react-intl-universal';
import JournalEntriesTable from '../../JournalEntriesTable/JournalEntriesTable';
import InvoiceDetailTab from './InvoiceDetailTab';
import { useInvoiceDetailDrawerContext } from './InvoiceDetailDrawerProvider';
/**
* Invoice view detail.
*/
export default function InvoiceDetail() {
const { transactions } = useInvoiceDetailDrawerContext();
const { transactions, invoiceId } = useInvoiceDetailDrawerContext();
return (
<div className="view-detail-drawer">
@@ -19,7 +20,11 @@ export default function InvoiceDetail() {
defaultSelectedTabId="journal_entries"
renderActiveTabPanelOnly={false}
>
<Tab title={intl.get('details')} disabled={true} />
<Tab
title={intl.get('details')}
id={'details'}
panel={<InvoiceDetailTab invoiceId={invoiceId} />}
/>
<Tab
title={intl.get('journal_entries')}
id={'journal_entries'}

1
client/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailDrawerProvider.js
View File

@@ -23,6 +23,7 @@ function InvoiceDetailDrawerProvider({ invoiceId, ...props }) {
//provider.
const provider = {
transactions,
invoiceId,
};
return (
<DashboardInsider loading={isTransactionLoading}>

89
client/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailTab.js Normal file
View File

@@ -0,0 +1,89 @@
import React from 'react';
import { useHistory } from 'react-router-dom';
import {
Button,
NavbarGroup,
Classes,
NavbarDivider,
Intent,
} from '@blueprintjs/core';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import { useInvoiceDetailDrawerContext } from './InvoiceDetailDrawerProvider';
import withDialogActions from 'containers/Dialog/withDialogActions';
import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { Icon, FormattedMessage as T } from 'components';
import { safeCallback, compose } from 'utils';
function InvoiceDetailTab({
invoiceId,
// #withDialogActions
openDialog,
// #withAlertsActions
openAlert,
// #withDrawerActions
closeDrawer,
}) {
const history = useHistory();
// Handle edit sale invoice.
const onEditInvoice = () => {
return invoiceId
? (history.push(`/invoices/${invoiceId}/edit`),
closeDrawer('invoice-detail-drawer'))
: null;
};
// Handle delete sale invoice.
const onDeleteInvoice = () => {
return invoiceId
? (openAlert('invoice-delete', { invoiceId }),
closeDrawer('invoice-detail-drawer'))
: null;
};
// Handle print invoices.
const onPrintInvoice = () => {
openDialog('invoice-pdf-preview', { invoiceId });
};
return (
<DashboardActionsBar>
<NavbarGroup>
<Button
className={Classes.MINIMAL}
icon={<Icon icon="pen-18" />}
text={<T id={'edit_invoice'} />}
onClick={safeCallback(onEditInvoice)}
/>
<NavbarDivider />
<Button
className={Classes.MINIMAL}
icon={<Icon icon="print-16" />}
text={<T id={'print'} />}
onClick={safeCallback(onPrintInvoice)}
/>
<Button
className={Classes.MINIMAL}
icon={<Icon icon={'trash-16'} iconSize={16} />}
text={<T id={'delete'} />}
intent={Intent.DANGER}
onClick={safeCallback(onDeleteInvoice)}
/>
</NavbarGroup>
</DashboardActionsBar>
);
}
export default compose(
withDialogActions,
withDrawerActions,
withAlertsActions,
)(InvoiceDetailTab);

9
client/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetail.js
View File

@@ -3,18 +3,23 @@ import { Tabs, Tab } from '@blueprintjs/core';
import intl from 'react-intl-universal';
import JournalEntriesTable from '../../JournalEntriesTable/JournalEntriesTable';
import ReceiptDetailTab from './ReceiptDetailTab';
import { useReceiptDetailDrawerContext } from './ReceiptDetailDrawerProvider';
/**
* Receipt view detail.
*/
export default function ReceiptDetail() {
const { transactions } = useReceiptDetailDrawerContext();
const { transactions, receiptId } = useReceiptDetailDrawerContext();
return (
<div className="view-detail-drawer">
<Tabs animate={true} large={true} defaultSelectedTabId="journal_entries">
<Tab title={intl.get('details')} id={'details'} disabled={true} />
<Tab
title={intl.get('details')}
id={'details'}
panel={<ReceiptDetailTab receiptId={receiptId} />}
/>
<Tab
title={intl.get('journal_entries')}
id={'journal_entries'}

1
client/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailDrawerProvider.js
View File

@@ -25,6 +25,7 @@ function ReceiptDetailDrawerProvider({ receiptId, ...props }) {
//provider.
const provider = {
transactions,
receiptId,
};
return (

85
client/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailTab.js Normal file
View File

@@ -0,0 +1,85 @@
import React from 'react';
import { useHistory } from 'react-router-dom';
import {
Button,
NavbarGroup,
Classes,
NavbarDivider,
Intent,
} from '@blueprintjs/core';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import withDialogActions from 'containers/Dialog/withDialogActions';
import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { Icon, FormattedMessage as T } from 'components';
import { safeCallback, compose } from 'utils';
function ReceiptDetailTab({
receiptId,
// #withDialogActions
openDialog,
// #withAlertsActions
openAlert,
// #withDrawerActions
closeDrawer,
}) {
const history = useHistory();
// Handle edit sale receipt.
const onEditReceipt = () => {
return receiptId
? (history.push(`/receipts/${receiptId}/edit`),
closeDrawer('receipt-detail-drawer'))
: null;
};
// Handle delete sale receipt.
const onDeleteReceipt = () => {
return receiptId
? (openAlert('receipt-delete', { receiptId }),
closeDrawer('receipt-detail-drawer'))
: null;
};
// Handle print receipt.
const onPrintReceipt = () => {
openDialog('receipt-pdf-preview', { receiptId });
};
return (
<DashboardActionsBar>
<NavbarGroup>
<Button
className={Classes.MINIMAL}
icon={<Icon icon="pen-18" />}
text={<T id={'edit_receipt'} />}
onClick={safeCallback(onEditReceipt)}
/>
<NavbarDivider />
<Button
className={Classes.MINIMAL}
icon={<Icon icon="print-16" />}
text={<T id={'print'} />}
onClick={safeCallback(onPrintReceipt)}
/>
<Button
className={Classes.MINIMAL}
icon={<Icon icon={'trash-16'} iconSize={16} />}
text={<T id={'delete'} />}
intent={Intent.DANGER}
onClick={safeCallback(onDeleteReceipt)}
/>
</NavbarGroup>
</DashboardActionsBar>
);
}
export default compose(
withDialogActions,
withDrawerActions,
withAlertsActions,
)(ReceiptDetailTab);

17
client/src/containers/Sales/Estimates/EstimatesLanding/EstimatesDataTable.js
View File

@@ -12,6 +12,7 @@ import withEstimatesActions from './withEstimatesActions';
import withSettings from 'containers/Settings/withSettings';
import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
import withDialogActions from 'containers/Dialog/withDialogActions';
import { useEstimatesListContext } from './EstimatesListProvider';
import { ActionsMenu, useEstiamtesTableColumns } from './components';
@@ -28,6 +29,9 @@ function EstimatesDataTable({
// #withDrawerActions
openDrawer,
// #withDialogAction
openDialog,
}) {
const history = useHistory();
@@ -77,6 +81,16 @@ function EstimatesDataTable({
history.push(`/invoices/new?from_estimate_id=${id}`, { action: id });
};
// Handle view detail estimate.
const handleViewDetailEstimate = ({ id }) => {
openDrawer('estimate-detail-drawer', { estimateId: id });
};
// Handle print estimate.
const handlePrintEstimate = ({ id }) => {
openDialog('estimate-pdf-preview', { estimateId: id });
};
// Handles fetch data.
const handleFetchData = useCallback(
({ pageIndex, pageSize, sortBy }) => {
@@ -120,6 +134,8 @@ function EstimatesDataTable({
onDelete: handleDeleteEstimate,
onDrawer: handleDrawerEstimate,
onConvert: handleConvertToInvoice,
onViewDetails: handleViewDetailEstimate,
onPrint: handlePrintEstimate,
}}
/>
);
@@ -129,6 +145,7 @@ export default compose(
withEstimatesActions,
withAlertsActions,
withDrawerActions,
withDialogActions,
withSettings(({ organizationSettings }) => ({
baseCurrency: organizationSettings?.baseCurrency,
})),

14
client/src/containers/Sales/Estimates/EstimatesLanding/components.js
View File

@@ -58,15 +58,16 @@ export function ActionsMenu({
onDelete,
onDrawer,
onConvert,
onViewDetails,
onPrint,
},
}) {
return (
<Menu>
<MenuItem
icon={<Icon icon="reader-18" />}
text={intl.get('view_details')}
onClick={safeCallback(onViewDetails, original)}
/>
<MenuDivider />
<MenuItem
@@ -119,6 +120,11 @@ export function ActionsMenu({
text={intl.get('estimate_paper')}
onClick={safeCallback(onDrawer, original)}
/>
<MenuItem
icon={<Icon icon={'print-16'} iconSize={16} />}
text={intl.get('print')}
onClick={safeCallback(onPrint, original)}
/>
<MenuItem
text={intl.get('delete_estimate')}
intent={Intent.DANGER}
@@ -149,8 +155,6 @@ function ActionsCell(props) {
}
export function useEstiamtesTableColumns() {
return React.useMemo(
() => [
{
@@ -204,7 +208,7 @@ export function useEstiamtesTableColumns() {
accessor: 'reference',
width: 90,
className: 'reference',
}
},
],
[],
);

6
client/src/containers/Sales/Invoices/InvoicesLanding/InvoicesDataTable.js
View File

@@ -85,6 +85,11 @@ function InvoicesDataTable({
openDrawer('invoice-detail-drawer', { invoiceId: id });
};
// Handle print invoices.
const handlePrintInvoice = ({ id }) => {
openDialog('invoice-pdf-preview', { invoiceId: id });
};
// Handles fetch data once the table state change.
const handleDataTableFetchData = useCallback(
({ pageSize, pageIndex, sortBy }) => {
@@ -130,6 +135,7 @@ function InvoicesDataTable({
onDrawer: handleDrawerInvoice,
onQuick: handleQuickPaymentReceive,
onViewDetails: handleViewDetailInvoice,
onPrint: handlePrintInvoice,
baseCurrency,
}}
/>

15
client/src/containers/Sales/Invoices/InvoicesLanding/components.js
View File

@@ -93,7 +93,15 @@ export const handleDeleteErrors = (errors) => {
};
export function ActionsMenu({
payload: { onEdit, onDeliver, onDelete, onDrawer, onQuick, onViewDetails },
payload: {
onEdit,
onDeliver,
onDelete,
onDrawer,
onQuick,
onViewDetails,
onPrint,
},
row: { original },
}) {
return (
@@ -128,6 +136,11 @@ export function ActionsMenu({
text={intl.get('invoice_paper')}
onClick={safeCallback(onDrawer, original)}
/>
<MenuItem
icon={<Icon icon={'print-16'} iconSize={16} />}
text={intl.get('print')}
onClick={safeCallback(onPrint, original)}
/>
<MenuItem
text={intl.get('delete_invoice')}
intent={Intent.DANGER}

11
client/src/containers/Sales/Receipts/ReceiptsLanding/ReceiptsTable.js
View File

@@ -10,6 +10,7 @@ import TableSkeletonHeader from 'components/Datatable/TableHeaderSkeleton';
import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
import withDialogActions from 'containers/Dialog/withDialogActions';
import withReceipts from './withReceipts';
import withReceiptsActions from './withReceiptsActions';
import withSettings from 'containers/Settings/withSettings';
@@ -35,6 +36,9 @@ function ReceiptsDataTable({
// #withDrawerActions
openDrawer,
// #withDialogAction
openDialog,
}) {
const history = useHistory();
@@ -75,6 +79,11 @@ function ReceiptsDataTable({
openDrawer('receipt-detail-drawer', { receiptId: id });
};
// Handle print receipt.
const handlePrintInvoice = ({ id }) => {
openDialog('receipt-pdf-preview', { receiptId: id });
};
// Handles the datable fetch data once the state changing.
const handleDataTableFetchData = useCallback(
({ sortBy, pageIndex, pageSize }) => {
@@ -118,6 +127,7 @@ function ReceiptsDataTable({
onClose: handleCloseReceipt,
onDrawer: handleDrawerReceipt,
onViewDetails: handleViewDetailReceipt,
onPrint: handlePrintInvoice,
baseCurrency,
}}
/>
@@ -128,6 +138,7 @@ export default compose(
withAlertsActions,
withReceiptsActions,
withDrawerActions,
withDialogActions,
withReceipts(({ receiptTableState }) => ({
receiptTableState,
})),

7
client/src/containers/Sales/Receipts/ReceiptsLanding/components.js
View File

@@ -16,7 +16,7 @@ import { Choose, Money, Icon, If } from 'components';
import moment from 'moment';
export function ActionsMenu({
payload: { onEdit, onDelete, onClose, onDrawer, onViewDetails },
payload: { onEdit, onDelete, onClose, onDrawer, onViewDetails, onPrint },
row: { original: receipt },
}) {
return (
@@ -44,6 +44,11 @@ export function ActionsMenu({
text={intl.get('receipt_paper')}
onClick={safeCallback(onDrawer, receipt)}
/>
<MenuItem
icon={<Icon icon={'print-16'} iconSize={16} />}
text={intl.get('print')}
onClick={safeCallback(onPrint, receipt)}
/>
<MenuItem
text={intl.get('delete_receipt')}
intent={Intent.DANGER}

10
client/src/hooks/query/estimates.js
View File

@@ -1,6 +1,8 @@
import { useQueryClient, useMutation } from 'react-query';
import { useRequestQuery } from '../useQueryRequest';
import useApiRequest from '../useRequest';
import { useRequestPdf } from '../useRequestPdf';
import { transformPagination } from 'utils';
import t from './types';
@@ -170,6 +172,14 @@ export function useRejectEstimate(props) {
});
}
/**
* Retrieve the estimate pdf document data,
*/
export function usePdfEstimate(estimateId) {
return useRequestPdf(`sales/estimates/${estimateId}`);
}
export function useRefreshEstimates() {
const queryClient = useQueryClient();

2
client/src/hooks/query/invoices.js
View File

@@ -162,7 +162,7 @@ export function useInvoice(invoiceId, props, requestProps) {
* Retrieve the invoice pdf document data.
*/
export function usePdfInvoice(invoiceId) {
return useRequestPdf(`/sales/invoices/${invoiceId}`);
return useRequestPdf(`sales/invoices/${invoiceId}`);
}
/**

8
client/src/hooks/query/receipts.js
View File

@@ -1,5 +1,6 @@
import { useQueryClient, useMutation } from 'react-query';
import { useRequestQuery } from '../useQueryRequest';
import { useRequestPdf } from '../useRequestPdf';
import useApiRequest from '../useRequest';
import { transformPagination } from 'utils';
import t from './types';
@@ -142,6 +143,13 @@ export function useReceipt(id, props) {
);
}
/**
* Retrieve the receipt pdf document data.
*/
export function usePdfReceipt(ReceiptId) {
return useRequestPdf(`sales/receipts/${ReceiptId}`);
}
export function useRefreshReceipts() {
const queryClient = useQueryClient();

5
client/src/lang/ar-ly/index.json
View File

@@ -1219,6 +1219,9 @@
"pdf_preview.dialog.title": "PDF Preview",
"pdf_preview.download.button": "Download",
"pdf_preview.preview.button": "Preview",
"invoice_preview.dialog.title": "Invoice PDF Preview"
"invoice_preview.dialog.title": "Invoice PDF Preview",
"estimate_preview.dialog.title": "Estimate PDF Preview",
"receipt_preview.dialog.title":"Receipt PDF Preview"
}

4
client/src/lang/en/index.json
View File

@@ -1206,5 +1206,7 @@
"pdf_preview.dialog.title": "PDF Preview",
"pdf_preview.download.button": "Download",
"pdf_preview.preview.button": "Preview",
"invoice_preview.dialog.title": "Invoice PDF Preview"
"invoice_preview.dialog.title": "Invoice PDF Preview",
"estimate_preview.dialog.title":"Estimate PDF Preview",
"receipt_preview.dialog.title":"Receipt PDF Preview"
}