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

feat: manual journal drawer & paper footer RLT.

Browse Source
This commit is contained in:
elforjani3
2021-06-27 14:08:32 +02:00
parent c42a134b76
commit a6770c145b
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/containers/Drawers/ExpenseDrawer/index.js
View File

@@ -1,6 +1,7 @@
import React, { lazy } from 'react'; import React, { lazy } from 'react';
import { Drawer, DrawerSuspense } from 'components'; import { Drawer, DrawerSuspense } from 'components';
import withDrawers from 'containers/Drawer/withDrawers'; import withDrawers from 'containers/Drawer/withDrawers';
import intl from 'react-intl-universal';
import { compose } from 'utils'; import { compose } from 'utils';
@@ -17,7 +18,7 @@ function ExpenseDrawer({
payload: { expenseId, title }, payload: { expenseId, title },
}) { }) {
return ( return (
<Drawer isOpen={isOpen} name={name} title={'Expense'}> <Drawer isOpen={isOpen} name={name} title={intl.get('expense')}>
<DrawerSuspense> <DrawerSuspense>
<ExpenseDrawerContent expenseId={expenseId} /> <ExpenseDrawerContent expenseId={expenseId} />
</DrawerSuspense> </DrawerSuspense>

5
client/src/containers/Drawers/ManualJournalDrawer/ManualJournalDrawerProvider.js
View File

@@ -1,6 +1,7 @@
import React from 'react'; import React from 'react';
import { useJournal } from 'hooks/query'; import { useJournal } from 'hooks/query';
import { DashboardInsider, DrawerHeaderContent } from 'components'; import { DashboardInsider, DrawerHeaderContent } from 'components';
import intl from 'react-intl-universal';
const ManualJournalDrawerContext = React.createContext(); const ManualJournalDrawerContext = React.createContext();
@@ -25,7 +26,9 @@ function ManualJournalDrawerProvider({ manualJournalId, ...props }) {
<DashboardInsider loading={isJournalLoading}> <DashboardInsider loading={isJournalLoading}>
<DrawerHeaderContent <DrawerHeaderContent
name={'journal-drawer'} name={'journal-drawer'}
title={`Manual Journal ${manualJournal?.journal_number}`} title={intl.get('manual_journal_number', {
number: manualJournal?.journal_number,
})}
/> />
<ManualJournalDrawerContext.Provider value={provider} {...props} /> <ManualJournalDrawerContext.Provider value={provider} {...props} />
</DashboardInsider> </DashboardInsider>

3
client/src/containers/Drawers/PaperTemplate/PaperTemplateFooter.js
View File

@@ -1,5 +1,6 @@
import React from 'react'; import React from 'react';
import { If } from 'components'; import { If } from 'components';
import intl from 'react-intl-universal';
export default function PaperTemplateFooter({ export default function PaperTemplateFooter({
footerData: { terms_conditions }, footerData: { terms_conditions },
@@ -8,7 +9,7 @@ export default function PaperTemplateFooter({
<div className="template__terms"> <div className="template__terms">
<If condition={terms_conditions}> <If condition={terms_conditions}>
<div className="template__terms__title"> <div className="template__terms__title">
<h4>Conditions and terms</h4> <h4>{intl.get('conditions_and_terms')}</h4>
</div> </div>
<ul> <ul>

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

@@ -1102,7 +1102,7 @@
"mm_dd_yy_": "MM-DD-YY", "mm_dd_yy_": "MM-DD-YY",
"dd_mm_yy_": "DD-MM-YY", "dd_mm_yy_": "DD-MM-YY",
"yy_mm_dd_": "YY-MM-DD", "yy_mm_dd_": "YY-MM-DD",
"plan_radio_name":"{name}", "plan_radio_name": "{name}",
"customers_payments": "Customers Payments", "customers_payments": "Customers Payments",
"receiving_customer_payments_is_one_pleasant_accounting_tasks": "Receiving payments is one of your more pleasant accounting tasks. The payments transactions will appear once receive payments to invoices.", "receiving_customer_payments_is_one_pleasant_accounting_tasks": "Receiving payments is one of your more pleasant accounting tasks. The payments transactions will appear once receive payments to invoices.",
"estimate_is_used_to_create_bid_proposal_or_quote": "An estimate is used to create a bid, proposal, or quote. The estimate can later be turned into a sales order or an invoice.", "estimate_is_used_to_create_bid_proposal_or_quote": "An estimate is used to create a bid, proposal, or quote. The estimate can later be turned into a sales order or an invoice.",
@@ -1122,5 +1122,7 @@
"please_refresh_the_page": "Please refresh the page", "please_refresh_the_page": "Please refresh the page",
"waiting_to_redirect": "Waiting to redirect", "waiting_to_redirect": "Waiting to redirect",
"refresh_the_page_if_redirect_not_worked": "Refresh the page if redirect not worked.", "refresh_the_page_if_redirect_not_worked": "Refresh the page if redirect not worked.",
"payment_has_been_done_successfully":"Payment has been done successfully." "payment_has_been_done_successfully": "Payment has been done successfully.",
"manual_journal_number": "Manual journal {number}",
"conditions_and_terms":"Conditions and terms"
} }