Merge branch 'develop'

invoiceninja · Dec 5, 2024 · 7494f90 · 7494f90
2 parents d3aa9e1 + e2d33d1
commit 7494f90
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/lib/ui/app/presenters/entity_presenter.dart b/lib/ui/app/presenters/entity_presenter.dart
@@ -166,6 +166,8 @@ class EntityPresenter {
       'withdrawal',
       'deposit',
       'documents',
+      'applied',
+      'refunded',
     ].contains(field);
 
     return value;

diff --git a/lib/ui/reports/payment_report.dart b/lib/ui/reports/payment_report.dart
@@ -48,6 +48,9 @@ enum PaymentReportFields {
   invoices,
   credits,
   record_state,
+  refunded,
+  applied,
+  status,
 }
 
 var memoizedPaymentReport = memo8(
@@ -277,6 +280,15 @@ ReportResult paymentReport(
           value = AppLocalization.of(navigatorKey.currentContext!)!
               .lookup(payment.entityState);
           break;
+        case PaymentReportFields.refunded:
+          value = payment.refunded;
+          break;
+        case PaymentReportFields.applied:
+          value = payment.applied;
+          break;
+        case PaymentReportFields.status:
+          value = kPaymentStatuses[payment.calculatedStatusId] ?? '';
+          break;
       }
 
       if (!ReportResult.matchField(