From f304939d8d09cf6ffdfdeceb1e8b46120fe2bf2d Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Fri, 17 Sep 2021 07:34:13 +0300 Subject: [PATCH] Correct converted expense amount --- lib/data/models/expense_model.dart | 1 + lib/data/models/recurring_expense_model.dart | 1 + lib/ui/expense/expense_list_item.dart | 4 ++-- lib/ui/expense/expense_presenter.dart | 3 +++ lib/ui/recurring_expense/recurring_expense_presenter.dart | 3 +++ 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/data/models/expense_model.dart b/lib/data/models/expense_model.dart index d3b45b002..321866467 100644 --- a/lib/data/models/expense_model.dart +++ b/lib/data/models/expense_model.dart @@ -57,6 +57,7 @@ class ExpenseFields { static const String categoryId = 'category_id'; static const String category = 'category'; static const String netAmount = 'net_amount'; + static const String convertedAmount = 'converted_amount'; static const String amount = 'amount'; static const String taxAmount = 'tax_amount'; static const String expenseDate = 'date'; diff --git a/lib/data/models/recurring_expense_model.dart b/lib/data/models/recurring_expense_model.dart index 245c43f91..ddebd6228 100644 --- a/lib/data/models/recurring_expense_model.dart +++ b/lib/data/models/recurring_expense_model.dart @@ -10,6 +10,7 @@ class RecurringExpenseFields { static const String categoryId = 'category_id'; static const String category = 'category'; static const String netAmount = 'net_amount'; + static const String convertedAmount = 'converted_amount'; static const String amount = 'amount'; static const String taxAmount = 'tax_amount'; static const String paymentDate = 'payment_date'; diff --git a/lib/ui/expense/expense_list_item.dart b/lib/ui/expense/expense_list_item.dart index aff5f395e..048c043ef 100644 --- a/lib/ui/expense/expense_list_item.dart +++ b/lib/ui/expense/expense_list_item.dart @@ -169,7 +169,7 @@ class ExpenseListItem extends StatelessWidget { ), SizedBox(width: 8), Text( - formatNumber(expense.convertedAmount, context, + formatNumber(expense.amount, context, currencyId: expense.currencyId), style: textStyle, textAlign: TextAlign.end, @@ -216,7 +216,7 @@ class ExpenseListItem extends StatelessWidget { ), ), Text( - formatNumber(expense.convertedAmount, context, + formatNumber(expense.amount, context, currencyId: expense.currencyId), style: Theme.of(context).textTheme.headline6), ], diff --git a/lib/ui/expense/expense_presenter.dart b/lib/ui/expense/expense_presenter.dart index 5891ae7b4..f42cd3aa0 100644 --- a/lib/ui/expense/expense_presenter.dart +++ b/lib/ui/expense/expense_presenter.dart @@ -78,6 +78,9 @@ class ExpensePresenter extends EntityPresenter { case ExpenseFields.amount: return Text(formatNumber(expense.grossAmount, context, currencyId: expense.currencyId)); + case ExpenseFields.convertedAmount: + return Text(formatNumber(expense.convertedAmount, context, + currencyId: expense.invoiceCurrencyId)); case ExpenseFields.taxAmount: return Text(formatNumber(expense.taxAmount, context, currencyId: expense.currencyId)); diff --git a/lib/ui/recurring_expense/recurring_expense_presenter.dart b/lib/ui/recurring_expense/recurring_expense_presenter.dart index 004448ac7..1786fd4a1 100644 --- a/lib/ui/recurring_expense/recurring_expense_presenter.dart +++ b/lib/ui/recurring_expense/recurring_expense_presenter.dart @@ -79,6 +79,9 @@ class RecurringExpensePresenter extends EntityPresenter { case RecurringExpenseFields.amount: return Text(formatNumber(expense.grossAmount, context, currencyId: expense.currencyId)); + case RecurringExpenseFields.convertedAmount: + return Text(formatNumber(expense.convertedAmount, context, + currencyId: expense.invoiceCurrencyId)); case RecurringExpenseFields.taxAmount: return Text(formatNumber(expense.taxAmount, context, currencyId: expense.currencyId));