diff --git a/lib/data/models/transaction_model.dart b/lib/data/models/transaction_model.dart index 0ccc725bf..0cd895eef 100644 --- a/lib/data/models/transaction_model.dart +++ b/lib/data/models/transaction_model.dart @@ -54,6 +54,7 @@ class TransactionFields { static const String currency = 'currency'; static const String vendor = 'vendor'; static const String category = 'category'; + static const String payment = 'payment'; static const String bankAccountId = 'bank_account_id'; static const String bankAccount = 'bank_account'; static const String invoiceIds = 'invoice_ids'; diff --git a/lib/ui/reports/reports_screen_vm.dart b/lib/ui/reports/reports_screen_vm.dart index 59ecc0f6d..91dcb07c9 100644 --- a/lib/ui/reports/reports_screen_vm.dart +++ b/lib/ui/reports/reports_screen_vm.dart @@ -359,6 +359,7 @@ class ReportsScreenVM { state.expenseCategoryState.map, state.invoiceState.map, state.bankAccountState.map, + state.paymentState.map, state.staticState, ); } diff --git a/lib/ui/reports/transaction_report.dart b/lib/ui/reports/transaction_report.dart index ab8a0fa66..96dca631b 100644 --- a/lib/ui/reports/transaction_report.dart +++ b/lib/ui/reports/transaction_report.dart @@ -21,6 +21,7 @@ enum TransactionReportFields { withdrawal, vendor, category, + payment, bankAccount, invoices, expenseNumber, @@ -31,7 +32,7 @@ enum TransactionReportFields { updated_at, } -var memoizedTransactionReport = memo9(( +var memoizedTransactionReport = memo10(( UserCompanyEntity userCompany, ReportsUIState reportsUIState, BuiltMap transactionMap, @@ -40,6 +41,7 @@ var memoizedTransactionReport = memo9(( BuiltMap categoryMap, BuiltMap invoiceMap, BuiltMap bankAccountMap, + BuiltMap paymentMap, StaticState staticState, ) => transactionReport( @@ -51,6 +53,7 @@ var memoizedTransactionReport = memo9(( categoryMap, invoiceMap, bankAccountMap, + paymentMap, staticState, )); @@ -63,6 +66,7 @@ ReportResult transactionReport( BuiltMap categoryMap, BuiltMap invoiceMap, BuiltMap bankAccountMap, + BuiltMap paymentMap, StaticState staticState, ) { final List> data = []; @@ -142,6 +146,9 @@ ReportResult transactionReport( case TransactionReportFields.bankAccount: value = bankAccountMap[transaction.bankAccountId]?.name ?? ''; break; + case TransactionReportFields.payment: + value = paymentMap[transaction.paymentId]?.number ?? ''; + break; case TransactionReportFields.defaultCategory: value = transaction.category; break; diff --git a/lib/ui/transaction/transaction_presenter.dart b/lib/ui/transaction/transaction_presenter.dart index 38e6715f3..f8dc98636 100644 --- a/lib/ui/transaction/transaction_presenter.dart +++ b/lib/ui/transaction/transaction_presenter.dart @@ -32,6 +32,7 @@ class TransactionPresenter extends EntityPresenter { TransactionFields.amount, TransactionFields.vendor, TransactionFields.category, + TransactionFields.payment, TransactionFields.defaultCategory, ]; } @@ -83,6 +84,9 @@ class TransactionPresenter extends EntityPresenter { state.bankAccountState.get(transaction.bankAccountId); return LinkTextRelatedEntity( entity: bankAccount, relation: transaction); + case TransactionFields.payment: + final payment = state.paymentState.get(transaction.paymentId); + return LinkTextRelatedEntity(entity: payment, relation: transaction); case TransactionFields.invoices: return ConstrainedBox( constraints: BoxConstraints(maxWidth: kTableColumnWidthMax),