From 8d4467ce20bbb940289f731c88fdb6b1a87ec62a Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 13 Sep 2022 16:58:46 +0300 Subject: [PATCH] Transactions --- lib/ui/app/main_screen.dart | 11 +++++++++++ lib/utils/i18n.dart | 5 +++++ starter.sh | 4 ++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/ui/app/main_screen.dart b/lib/ui/app/main_screen.dart index 791a2ea06..835010daf 100644 --- a/lib/ui/app/main_screen.dart +++ b/lib/ui/app/main_screen.dart @@ -15,6 +15,8 @@ import 'package:invoiceninja_flutter/ui/purchase_order/purchase_order_screen_vm. import 'package:invoiceninja_flutter/ui/purchase_order/view/purchase_order_view_vm.dart'; import 'package:invoiceninja_flutter/ui/settings/bank_accounts_vm.dart'; import 'package:invoiceninja_flutter/ui/settings/payment_settings_vm.dart'; +import 'package:invoiceninja_flutter/ui/transaction/transaction_screen.dart'; +import 'package:invoiceninja_flutter/ui/transaction/transaction_screen_vm.dart'; import 'package:invoiceninja_flutter/utils/platforms.dart'; import 'package:redux/redux.dart'; @@ -209,6 +211,12 @@ class MainScreen extends StatelessWidget { editingFilterEntity: editingFilterEntity, ); break; + case TransactionScreen.route: + screen = EntityScreens( + entityType: EntityType.transaction, + editingFilterEntity: editingFilterEntity, + ); + break; case RecurringExpenseScreen.route: screen = EntityScreens( entityType: EntityType.recurringExpense, @@ -706,6 +714,9 @@ class EntityScreens extends StatelessWidget { case EntityType.recurringExpense: listWidget = RecurringExpenseScreenBuilder(); break; + case EntityType.transaction: + listWidget = TransactionScreenBuilder(); + break; default: print('## ERROR: list widget not implemented for $entityType'); break; diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart index 07faa6a64..2029c1737 100644 --- a/lib/utils/i18n.dart +++ b/lib/utils/i18n.dart @@ -27,6 +27,7 @@ mixin LocalizationsProvider on LocaleCodeAware { 'removed_transaction': 'Successfully removed transaction', 'restored_transaction': 'Successfully restored transaction', 'search_transaction': 'Search Transaction', + 'search_transactions': 'Search :count Transaction', 'bank_account': 'Bank Account', 'bank_accounts': 'Bank Accounts', 'archived_bank_account': 'Successfully archived bank account', @@ -87282,6 +87283,10 @@ mixin LocalizationsProvider on LocaleCodeAware { _localizedValues[localeCode]['search_transaction'] ?? _localizedValues['en']['search_transaction']; + String get searchTransactions => + _localizedValues[localeCode]['search_transactions'] ?? + _localizedValues['en']['search_transactions']; + // STARTER: lang field - do not remove comment String lookup(String key) { diff --git a/starter.sh b/starter.sh index 50c3add5f..2cefc926a 100644 --- a/starter.sh +++ b/starter.sh @@ -433,11 +433,11 @@ else sed -i -e "s/$comment/$comment${lineBreak}$code/g" ./lib/redux/app/app_actions.dart comment="STARTER: lang key - do not remove comment" - code="'${module_snake}': '${Module}', '${modules_snake}': '${Modules}', 'new_${module_snake}': 'New ${Module}', 'edit_${module_snake}': 'Edit ${Module}', 'created_${module_snake}': 'Successfully created ${module_snake}', 'updated_${module_snake}': 'Successfully updated ${module_snake}', 'archived_${module_snake}': 'Successfully archived ${module_snake}', 'deleted_${module_snake}': 'Successfully deleted ${module_snake}', 'removed_${module_snake}': 'Successfully removed ${module_snake}', 'restored_${module_snake}': 'Successfully restored ${module_snake}', 'search_${module_snake}': 'Search ${Module}',${lineBreak}" + code="'${module_snake}': '${Module}', '${modules_snake}': '${Modules}', 'new_${module_snake}': 'New ${Module}', 'edit_${module_snake}': 'Edit ${Module}', 'created_${module_snake}': 'Successfully created ${module_snake}', 'updated_${module_snake}': 'Successfully updated ${module_snake}', 'archived_${module_snake}': 'Successfully archived ${module_snake}', 'deleted_${module_snake}': 'Successfully deleted ${module_snake}', 'removed_${module_snake}': 'Successfully removed ${module_snake}', 'restored_${module_snake}': 'Successfully restored ${module_snake}', 'search_${module_snake}': 'Search ${Module}', 'search_${modules_snake}': 'Search ${Modules}',${lineBreak}" sed -i -e "s/$comment/$comment${lineBreak}$code/g" ./lib/utils/i18n.dart comment="STARTER: lang field - do not remove comment" - code="String get ${module_camel} => _localizedValues[localeCode]['${module_snake}'] ?? _localizedValues['en']['${module_snake}']; String get ${modules_camel} => _localizedValues[localeCode]['${modules_snake}'] ?? _localizedValues['en']['${modules_snake}']; String get new${Module} => _localizedValues[localeCode]['new_${module_snake}'] ?? _localizedValues['en']['new_${module_snake}']; String get created${Module} => _localizedValues[localeCode]['created_${module_snake}'] ?? _localizedValues['en']['created_${module_snake}']; String get updated${Module} => _localizedValues[localeCode]['updated_${module_snake}'] ?? _localizedValues['en']['updated_${module_snake}']; String get archived${Module} => _localizedValues[localeCode]['archived_${module_snake}'] ?? _localizedValues['en']['archived_${module_snake}']; String get deleted${Module} => _localizedValues[localeCode]['deleted_${module_snake}'] ?? _localizedValues['en']['deleted_${module_snake}']; String get restored${Module} => _localizedValues[localeCode]['restored_${module_snake}'] ?? _localizedValues['en']['restored_${module_snake}']; String get edit${Module} => _localizedValues[localeCode]['edit_${module_snake}'] ?? _localizedValues['en']['edit_${module_snake}'];${lineBreak} String get search${Module} => _localizedValues[localeCode]['search_${module_snake}'] ?? _localizedValues['en']['search_${module_snake}'];${lineBreak}" + code="String get ${module_camel} => _localizedValues[localeCode]['${module_snake}'] ?? _localizedValues['en']['${module_snake}']; String get ${modules_camel} => _localizedValues[localeCode]['${modules_snake}'] ?? _localizedValues['en']['${modules_snake}']; String get new${Module} => _localizedValues[localeCode]['new_${module_snake}'] ?? _localizedValues['en']['new_${module_snake}']; String get created${Module} => _localizedValues[localeCode]['created_${module_snake}'] ?? _localizedValues['en']['created_${module_snake}']; String get updated${Module} => _localizedValues[localeCode]['updated_${module_snake}'] ?? _localizedValues['en']['updated_${module_snake}']; String get archived${Module} => _localizedValues[localeCode]['archived_${module_snake}'] ?? _localizedValues['en']['archived_${module_snake}']; String get deleted${Module} => _localizedValues[localeCode]['deleted_${module_snake}'] ?? _localizedValues['en']['deleted_${module_snake}']; String get restored${Module} => _localizedValues[localeCode]['restored_${module_snake}'] ?? _localizedValues['en']['restored_${module_snake}']; String get edit${Module} => _localizedValues[localeCode]['edit_${module_snake}'] ?? _localizedValues['en']['edit_${module_snake}'];${lineBreak} String get search${Module} => _localizedValues[localeCode]['search_${module_snake}'] ?? _localizedValues['en']['search_${module_snake}'];${lineBreak} String get search${Module} => _localizedValues[localeCode]['search_${modules_snake}'] ?? _localizedValues['en']['search_${modules_snake}'];${lineBreak}" sed -i -e "s/$comment/$comment${lineBreak}$code/g" ./lib/utils/i18n.dart comment="STARTER: entity type - do not remove comment"