diff --git a/packages/server/src/interfaces/Ledger.ts b/packages/server/src/interfaces/Ledger.ts index 4e021718a..8af6ac8b8 100644 --- a/packages/server/src/interfaces/Ledger.ts +++ b/packages/server/src/interfaces/Ledger.ts @@ -41,6 +41,8 @@ export interface ILedgerEntry { index: number; indexGroup?: number; + note?: string; + userId?: number; itemId?: number; branchId?: number; diff --git a/packages/server/src/services/Accounting/utils.ts b/packages/server/src/services/Accounting/utils.ts index 081a0d14c..45a3de94e 100644 --- a/packages/server/src/services/Accounting/utils.ts +++ b/packages/server/src/services/Accounting/utils.ts @@ -21,6 +21,8 @@ export const transformLedgerEntryToTransaction = ( transactionNumber: entry.transactionNumber, referenceNumber: entry.referenceNumber, + note: entry.note, + index: entry.index, indexGroup: entry.indexGroup, diff --git a/packages/server/src/services/Cashflow/CashflowTransactionJournalEntries.ts b/packages/server/src/services/Cashflow/CashflowTransactionJournalEntries.ts index 93d23e3b1..21df84f34 100644 --- a/packages/server/src/services/Cashflow/CashflowTransactionJournalEntries.ts +++ b/packages/server/src/services/Cashflow/CashflowTransactionJournalEntries.ts @@ -25,8 +25,8 @@ export default class CashflowTransactionJournalEntries { /** * Retrieves the common entry of cashflow transaction. - * @param {ICashflowTransaction} cashflowTransaction - * @returns {} + * @param {ICashflowTransaction} cashflowTransaction + * @returns {Partial} */ private getCommonEntry = (cashflowTransaction: ICashflowTransaction) => { const { entries, ...transaction } = cashflowTransaction; @@ -41,7 +41,9 @@ export default class CashflowTransactionJournalEntries { ), transactionId: transaction.id, transactionNumber: transaction.transactionNumber, - referenceNo: transaction.referenceNo, + referenceNumber: transaction.referenceNo, + + note: transaction.description, branchId: cashflowTransaction.branchId, userId: cashflowTransaction.userId, @@ -76,9 +78,9 @@ export default class CashflowTransactionJournalEntries { /** * Retrieves the cashflow credit GL entry. - * @param {ICashflowTransaction} cashflowTransaction - * @param {ICashflowTransactionLine} entry - * @param {number} index + * @param {ICashflowTransaction} cashflowTransaction + * @param {ICashflowTransactionLine} entry + * @param {number} index * @returns {ILedgerEntry} */ private getCashflowCreditGLEntry = ( @@ -102,10 +104,10 @@ export default class CashflowTransactionJournalEntries { /** * Retrieves the cashflow transaction GL entry. - * @param {ICashflowTransaction} cashflowTransaction - * @param {ICashflowTransactionLine} entry - * @param {number} index - * @returns + * @param {ICashflowTransaction} cashflowTransaction + * @param {ICashflowTransactionLine} entry + * @param {number} index + * @returns {ILedgerEntry[]} */ private getJournalEntries = ( cashflowTransaction: ICashflowTransaction @@ -118,7 +120,7 @@ export default class CashflowTransactionJournalEntries { /** * Retrieves the cashflow GL ledger. - * @param {ICashflowTransaction} cashflowTransaction + * @param {ICashflowTransaction} cashflowTransaction * @returns {Ledger} */ private getCashflowLedger = (cashflowTransaction: ICashflowTransaction) => { @@ -130,6 +132,7 @@ export default class CashflowTransactionJournalEntries { * Write the journal entries of the given cashflow transaction. * @param {number} tenantId * @param {ICashflowTransaction} cashflowTransaction + * @return {Promise} */ public writeJournalEntries = async ( tenantId: number, @@ -153,6 +156,7 @@ export default class CashflowTransactionJournalEntries { * Delete the journal entries. * @param {number} tenantId - Tenant id. * @param {number} cashflowTransactionId - Cashflow transaction id. + * @return {Promise} */ public revertJournalEntries = async ( tenantId: number, diff --git a/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx b/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx index 06ccffea0..11d371cac 100644 --- a/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx +++ b/packages/webapp/src/containers/CashFlow/MoneyInDialog/OtherIncome/OtherIncomeFormFields.tsx @@ -106,11 +106,13 @@ export default function OtherIncomeFormFields() { )} + {/*------------ Transaction number -----------*/} + {/*------------ amount -----------*/} {({ diff --git a/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerDetails.tsx b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerDetails.tsx index 4dec0dae4..22544b57b 100644 --- a/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerDetails.tsx +++ b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerDetails.tsx @@ -1,12 +1,13 @@ // @ts-nocheck import React from 'react'; -import { Card } from '@/components'; +import { Card, CommercialDocBox } from '@/components'; import CashflowTransactionDrawerActionBar from './CashflowTransactionDrawerActionBar'; import CashflowTransactionDrawerHeader from './CashflowTransactionDrawerHeader'; import CashflowTransactionDrawerTable from './CashflowTransactionDrawerTable'; -import CashflowTransactionDrawerFooter from './CashflowTransactionDrawerFooter'; +import CashflowTransactionDrawerTableFooter from './CashflowTransactionDrawerTableFooter'; +import { CashflowTransactionDrawerFooter } from './CashflowTransactionDrawerFooter'; /** * Cashflow transaction view details. */ @@ -16,11 +17,12 @@ export default function CashflowTransactionDrawerDetails() {
- + + - +
); diff --git a/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerFooter.tsx b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerFooter.tsx index 79c6a0706..b3a7ea58f 100644 --- a/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerFooter.tsx +++ b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerFooter.tsx @@ -1,35 +1,18 @@ // @ts-nocheck import React from 'react'; +import { CommercialDocFooter, DetailsMenu, DetailItem, T } from '@/components'; import { useCashflowTransactionDrawerContext } from './CashflowTransactionDrawerProvider'; -import { T, FormatNumber } from '@/components'; -export default function CashflowTransactionDrawerFooter() { - const { - cashflowTransaction: { formatted_amount }, - } = useCashflowTransactionDrawerContext(); +export function CashflowTransactionDrawerFooter() { + const { cashflowTransaction } = useCashflowTransactionDrawerContext(); return ( -
-
-
-
- -
-
- -
-
- -
-
-
-
- -
-
{formatted_amount}
-
{formatted_amount}
-
-
-
+ + + }> + {cashflowTransaction.description} + + + ); } diff --git a/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerTableFooter.tsx b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerTableFooter.tsx new file mode 100644 index 000000000..b46f6c0fe --- /dev/null +++ b/packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerTableFooter.tsx @@ -0,0 +1,35 @@ +// @ts-nocheck +import React from 'react'; +import { useCashflowTransactionDrawerContext } from './CashflowTransactionDrawerProvider'; +import { T, FormatNumber } from '@/components'; + +export default function CashflowTransactionDrawerTableFooter() { + const { + cashflowTransaction: { formatted_amount }, + } = useCashflowTransactionDrawerContext(); + + return ( +
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
{formatted_amount}
+
{formatted_amount}
+
+
+
+ ); +} diff --git a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.tsx b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.tsx index fb1360c6d..237254652 100644 --- a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.tsx +++ b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailFooter.tsx @@ -1,6 +1,5 @@ // @ts-nocheck import React from 'react'; - import { CommercialDocFooter, T, diff --git a/packages/webapp/src/lang/en/index.json b/packages/webapp/src/lang/en/index.json index a329faa9b..ed0537d77 100644 --- a/packages/webapp/src/lang/en/index.json +++ b/packages/webapp/src/lang/en/index.json @@ -1452,6 +1452,7 @@ "cash_flow.setting_your_auto_generated_transaction_number": "Setting your auto-generated transaction number", "cash_flow_drawer.label_transaction_type": "Transaction type", "cash_flow.drawer.label_transaction_no": "Transaction number", + "cash_flow.drawer.label.statement": "Statement", "cash_flow.drawer.label_transaction": "Cash flow Transaction {number}", "cash_flow.account_transactions.no_results": "There are no deposit/withdrawal transactions on the current account.", "cash_flow_balance_in": "Balance in {name}",