From 3bedf98c4292104eb4abead43d8331c47a764c9f Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 6 Sep 2021 16:09:42 +0300 Subject: [PATCH] Recurring --- lib/ui/expense/view/expense_view_overview.dart | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/ui/expense/view/expense_view_overview.dart b/lib/ui/expense/view/expense_view_overview.dart index 15fd05842..977583ecb 100644 --- a/lib/ui/expense/view/expense_view_overview.dart +++ b/lib/ui/expense/view/expense_view_overview.dart @@ -1,4 +1,7 @@ +import 'dart:math'; + import 'package:invoiceninja_flutter/colors.dart'; +import 'package:invoiceninja_flutter/constants.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/ui/app/FieldGrid.dart'; import 'package:invoiceninja_flutter/ui/app/entities/entity_list_tile.dart'; @@ -108,7 +111,17 @@ class ExpenseOverview extends StatelessWidget { } final fields = { - localization.date: formatDate(expense.date, context), + if (expense.isRecurring) + localization.frequency: + localization.lookup(kFrequencies[expense.frequencyId]), + if (expense.isRecurring) + localization.sendDate: formatDate(expense.nextSendDate, context), + if (expense.isRecurring) + localization.remainingCycles: expense.remainingCycles == -1 + ? localization.endless + : '${expense.remainingCycles}', + if (!expense.isRecurring) + localization.date: formatDate(expense.date, context), localization.transactionReference: expense.transactionReference, localization.tax: tax, localization.paymentDate: formatDate(expense.paymentDate, context),