From 8cbe10b334c010e16e58e4b83a1ac63ba419c8c0 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 1 Nov 2021 08:25:05 +0200
Subject: [PATCH] Add payment type to expenses lists

---
 lib/data/models/expense_model.dart    | 1 +
 lib/ui/expense/expense_presenter.dart | 5 +++++
 lib/ui/reports/expense_report.dart    | 5 +++++
 3 files changed, 11 insertions(+)

diff --git a/lib/data/models/expense_model.dart b/lib/data/models/expense_model.dart
index 736dc163d..d02bf0a80 100644
--- a/lib/data/models/expense_model.dart
+++ b/lib/data/models/expense_model.dart
@@ -64,6 +64,7 @@ class ExpenseFields {
   static const String taxAmount = 'tax_amount';
   static const String expenseDate = 'date';
   static const String paymentDate = 'payment_date';
+  static const String paymentType = 'payment_type';
   static const String exchangeRate = 'exchange_rate';
   static const String invoiceCurrencyId = 'invoice_currency_id';
   static const String taxRate1 = 'tax_rate1';
diff --git a/lib/ui/expense/expense_presenter.dart b/lib/ui/expense/expense_presenter.dart
index 3c7b1f4bf..eae160bbd 100644
--- a/lib/ui/expense/expense_presenter.dart
+++ b/lib/ui/expense/expense_presenter.dart
@@ -35,6 +35,7 @@ class ExpensePresenter extends EntityPresenter {
       ExpenseFields.categoryId,
       ExpenseFields.category,
       ExpenseFields.paymentDate,
+      ExpenseFields.paymentType,
       ExpenseFields.exchangeRate,
       ExpenseFields.invoiceCurrencyId,
       ExpenseFields.taxName1,
@@ -107,6 +108,10 @@ class ExpensePresenter extends EntityPresenter {
         return Text(state.expenseCategoryState.map[expense.categoryId]
                 ?.listDisplayName ??
             '');
+      case ExpenseFields.paymentType:
+        return Text(state.staticState.paymentTypeMap[expense.paymentTypeId]
+                ?.listDisplayName ??
+            '');
       case ExpenseFields.paymentDate:
         return Text(formatDate(expense.paymentDate, context));
       case ExpenseFields.exchangeRate:
diff --git a/lib/ui/reports/expense_report.dart b/lib/ui/reports/expense_report.dart
index d58756ee5..9e9a4db4e 100644
--- a/lib/ui/reports/expense_report.dart
+++ b/lib/ui/reports/expense_report.dart
@@ -17,6 +17,7 @@ enum ExpenseReportFields {
   currency,
   date,
   payment_date,
+  payment_type,
   tax_rate1,
   tax_rate2,
   tax_rate3,
@@ -135,6 +136,10 @@ ReportResult expenseReport(
         case ExpenseReportFields.payment_date:
           value = expense.paymentDate;
           break;
+        case ExpenseReportFields.payment_type:
+          value = staticState
+                  .paymentTypeMap[expense.paymentTypeId]?.listDisplayName ??
+              '';
           break;
         case ExpenseReportFields.tax_rate1:
           value = expense.taxRate1;