Merge branch 'develop'

lib/constants.dart

@@ -496,6 +496,7 @@ const String kSettingsExpenseCategoryEdit = 'expense_category/edit';
 const String kSettingsTaskStatuses = 'task_status';
 const String kSettingsTaskStatusView = 'task_status/view';
 const String kSettingsTaskStatusEdit = 'task_status/edit';
+const String kSettingsBankAccountSettings = 'bank_account_settings';
 const String kSettingsBankAccounts = 'bank_accounts';
 const String kSettingsBankAccountsView = 'bank_accounts/view';
 

lib/data/models/account_model.dart

@@ -131,7 +131,7 @@ abstract class AccountEntity
     ..trialDaysLeft = 0
     ..hostedClientCount = 0
     ..hostedCompanyCount = 1
-    ..accountSmsVerified = false
+    ..accountSmsVerified = true
     ..setReactAsDefaultAP = false;
 
   static Serializer<AccountEntity> get serializer => _$accountEntitySerializer;

lib/data/models/bank_account_model.dart

@@ -4,6 +4,7 @@ import 'package:built_value/serializer.dart';
 import 'package:invoiceninja_flutter/redux/app/app_state.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/utils/formatting.dart';
+import 'package:invoiceninja_flutter/utils/strings.dart';
 
 part 'bank_account_model.g.dart';
 
@@ -44,8 +45,9 @@ abstract class BankAccountItemResponse
 }
 
 class BankAccountFields {
-  // STARTER: fields - do not remove comment
   static const String name = 'name';
+  static const String type = 'type';
+  static const String balance = 'balance';
 }
 
 abstract class BankAccountEntity extends Object
@@ -123,9 +125,18 @@ abstract class BankAccountEntity extends Object
     switch (sortField) {
       // STARTER: sort switch - do not remove comment
       case BankAccountFields.name:
-        response = bankAccountA.name.compareTo(bankAccountB.name);
+        response = bankAccountA.name
+            .toLowerCase()
+            .compareTo(bankAccountB.name.toLowerCase());
+        break;
+      case BankAccountFields.balance:
+        response = bankAccountA.balance.compareTo(bankAccountB.balance);
+        break;
+      case BankAccountFields.type:
+        response = bankAccountA.type
+            .toLowerCase()
+            .compareTo(bankAccountB.type.toLowerCase());
         break;
-
       default:
         print('## ERROR: sort by bankAccount.$sortField is not implemented');
         break;
@@ -141,34 +152,34 @@ abstract class BankAccountEntity extends Object
 
   @override
   bool matchesFilter(String filter) {
-    if (filter == null || filter.isEmpty) {
-      return true;
-    }
-
-    filter = filter.toLowerCase();
-
-    return false;
+    return matchesStrings(
+      haystacks: [
+        name,
+        type,
+      ],
+      needle: filter,
+    );
   }
 
   @override
   String matchesFilterValue(String filter) {
-    if (filter == null || filter.isEmpty) {
-      return null;
-    }
-
-    filter = filter.toLowerCase();
-
-    return null;
+    return matchesStringsValue(
+      haystacks: [
+        name,
+        type,
+      ],
+      needle: filter,
+    );
   }
 
   @override
-  String get listDisplayName => null;
+  String get listDisplayName => name;
 
   @override
-  double get listDisplayAmount => null;
+  double get listDisplayAmount => balance;
 
   @override
-  FormatNumberType get listDisplayAmountType => null;
+  FormatNumberType get listDisplayAmountType => FormatNumberType.money;
 
   static Serializer<BankAccountEntity> get serializer =>
       _$bankAccountEntitySerializer;

lib/data/models/company_model.dart

@@ -145,6 +145,7 @@ abstract class CompanyEntity extends Object
       clientRegistrationFields: BuiltList<RegistrationFieldEntity>(),
       purchaseOrders: BuiltList<InvoiceEntity>(),
       bankAccounts: BuiltList<BankAccountEntity>(),
+      transactions: BuiltList<TransactionEntity>(),
     );
   }
 
@@ -328,6 +329,9 @@ abstract class CompanyEntity extends Object
   @BuiltValueField(wireName: 'bank_integrations')
   BuiltList<BankAccountEntity> get bankAccounts;
 
+  @BuiltValueField(wireName: 'bank_transactions')
+  BuiltList<TransactionEntity> get transactions;
+
   BuiltList<TaskEntity> get tasks;
 
   BuiltList<ProjectEntity> get projects;
@@ -596,6 +600,7 @@ abstract class CompanyEntity extends Object
           ..quotes.clear()
           ..purchaseOrders.clear()
           ..bankAccounts.clear()
+          ..transactions.clear()
           ..credits.clear()
           ..tasks.clear()
           ..projects.clear()
@@ -678,7 +683,8 @@ abstract class CompanyEntity extends Object
     ..recurringExpenses.replace(BuiltList<ExpenseEntity>())
     ..clientRegistrationFields.replace(BuiltList<RegistrationFieldEntity>())
     ..purchaseOrders.replace(BuiltList<InvoiceEntity>())
-    ..bankAccounts.replace(BuiltList<BankAccountEntity>());
+    ..bankAccounts.replace(BuiltList<BankAccountEntity>())
+    ..transactions.replace(BuiltList<BankAccountEntity>());
 
   static Serializer<CompanyEntity> get serializer => _$companyEntitySerializer;
 }

lib/data/models/entities.dart

@@ -42,6 +42,8 @@ class EntityType extends EnumClass {
   static const EntityType invoiceItem = _$invoiceItem;
   static const EntityType design = _$design;
   // STARTER: entity type - do not remove comment
+  static const EntityType transaction = _$transaction;
+
   static const EntityType bankAccount = _$bankAccount;
 
   static const EntityType recurringExpense = _$recurringExpense;

lib/data/models/expense_model.dart

@@ -184,6 +184,7 @@ abstract class ExpenseEntity extends Object
     ..date = convertDateTimeToSqlDate()
     ..documents.clear()
     ..transactionReference = ''
+    ..transactionId = ''
     ..paymentTypeId = ''
     ..paymentDate = '');
 

lib/data/models/models.dart

@@ -40,6 +40,7 @@ export 'package:invoiceninja_flutter/data/models/task_status_model.dart';
 export 'package:invoiceninja_flutter/data/models/user_model.dart';
 export 'package:invoiceninja_flutter/data/models/vendor_model.dart';
 export 'package:invoiceninja_flutter/data/models/bank_account_model.dart';
+export 'package:invoiceninja_flutter/data/models/transaction_model.dart';
 // STARTER: export - do not remove comment
 
 part 'models.g.dart';

lib/data/models/serializers.dart

@@ -48,9 +48,9 @@ import 'package:invoiceninja_flutter/redux/ui/ui_state.dart';
 import 'package:invoiceninja_flutter/redux/user/user_state.dart';
 import 'package:invoiceninja_flutter/redux/vendor/vendor_state.dart';
 import 'package:invoiceninja_flutter/redux/webhook/webhook_state.dart';
-
-// STARTER: import - do not remove comment
+import 'package:invoiceninja_flutter/redux/transaction/transaction_state.dart';
 import 'package:invoiceninja_flutter/redux/bank_account/bank_account_state.dart';
+// STARTER: import - do not remove comment
 
 part 'serializers.g.dart';
 
@@ -115,6 +115,10 @@ part 'serializers.g.dart';
   TaxRateItemResponse,
   TaxRateListResponse,
   // STARTER: serializers - do not remove comment
+  TransactionEntity,
+  TransactionListResponse,
+  TransactionItemResponse,
+
   BankAccountEntity,
   BankAccountListResponse,
   BankAccountItemResponse,