From 150a1194559b5a1e051e62dbe9daa8cc10bd0ca9 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 2 Jan 2020 17:22:33 +0200
Subject: [PATCH] Fix invoice actions

---
 lib/data/models/invoice_model.dart         |  4 +++-
 lib/data/models/invoice_model.g.dart       | 13 ++++++-------
 lib/data/models/project_model.dart         |  3 ++-
 lib/data/repositories/auth_repository.dart |  2 ++
 lib/main.dart                              |  5 +++++
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart
index bd05959be..ec5fd895d 100644
--- a/lib/data/models/invoice_model.dart
+++ b/lib/data/models/invoice_model.dart
@@ -66,7 +66,7 @@ class InvoiceFields {
 }
 
 abstract class InvoiceEntity extends Object
-    with BaseEntity, SelectableEntity, CalculateInvoiceTotal
+    with BaseEntity, SelectableEntity, CalculateInvoiceTotal, BelongsToClient
     implements Built<InvoiceEntity, InvoiceEntityBuilder> {
   factory InvoiceEntity(
       {String id, bool isQuote = false, AppState state, ClientEntity client}) {
@@ -148,6 +148,7 @@ abstract class InvoiceEntity extends Object
 
   double get balance;
 
+  @override
   @nullable
   @BuiltValueField(wireName: 'client_id')
   String get clientId;
@@ -600,6 +601,7 @@ abstract class InvoiceItemEntity
   @BuiltValueField(wireName: 'tax_rate3')
   double get taxRate3;
 
+  @nullable
   @BuiltValueField(wireName: 'invoice_item_type_id')
   String get invoiceItemTypeId;
 
diff --git a/lib/data/models/invoice_model.g.dart b/lib/data/models/invoice_model.g.dart
index 491872d17..793a25ca8 100644
--- a/lib/data/models/invoice_model.g.dart
+++ b/lib/data/models/invoice_model.g.dart
@@ -594,9 +594,6 @@ class _$InvoiceItemEntitySerializer
       'tax_rate3',
       serializers.serialize(object.taxRate3,
           specifiedType: const FullType(double)),
-      'invoice_item_type_id',
-      serializers.serialize(object.invoiceItemTypeId,
-          specifiedType: const FullType(String)),
       'custom_value1',
       serializers.serialize(object.customValue1,
           specifiedType: const FullType(String)),
@@ -610,6 +607,12 @@ class _$InvoiceItemEntitySerializer
       serializers.serialize(object.createdAt,
           specifiedType: const FullType(int)),
     ];
+    if (object.invoiceItemTypeId != null) {
+      result
+        ..add('invoice_item_type_id')
+        ..add(serializers.serialize(object.invoiceItemTypeId,
+            specifiedType: const FullType(String)));
+    }
     if (object.customValue3 != null) {
       result
         ..add('custom_value3')
@@ -1943,10 +1946,6 @@ class _$InvoiceItemEntity extends InvoiceItemEntity {
     if (taxRate3 == null) {
       throw new BuiltValueNullFieldError('InvoiceItemEntity', 'taxRate3');
     }
-    if (invoiceItemTypeId == null) {
-      throw new BuiltValueNullFieldError(
-          'InvoiceItemEntity', 'invoiceItemTypeId');
-    }
     if (customValue1 == null) {
       throw new BuiltValueNullFieldError('InvoiceItemEntity', 'customValue1');
     }
diff --git a/lib/data/models/project_model.dart b/lib/data/models/project_model.dart
index 04fbbd6ba..af4ba243f 100644
--- a/lib/data/models/project_model.dart
+++ b/lib/data/models/project_model.dart
@@ -50,7 +50,7 @@ class ProjectFields {
 }
 
 abstract class ProjectEntity extends Object
-    with BaseEntity, SelectableEntity
+    with BaseEntity, SelectableEntity, BelongsToClient
     implements Built<ProjectEntity, ProjectEntityBuilder> {
   factory ProjectEntity({String id, AppState state}) {
     return _$ProjectEntity._(
@@ -86,6 +86,7 @@ abstract class ProjectEntity extends Object
 
   String get name;
 
+  @override
   @BuiltValueField(wireName: 'client_id')
   String get clientId;
 
diff --git a/lib/data/repositories/auth_repository.dart b/lib/data/repositories/auth_repository.dart
index cddfb08a0..0f3cedb1f 100644
--- a/lib/data/repositories/auth_repository.dart
+++ b/lib/data/repositories/auth_repository.dart
@@ -115,6 +115,8 @@ class AuthRepository {
     ];
     url += '?include=${includes.join(',')}&include_static=true';
 
+    //url += '?first_load=true&include_static=true';
+
     dynamic response;
 
     if (Config.DEMO_MODE) {
diff --git a/lib/main.dart b/lib/main.dart
index 057a09f4b..20ce7fc82 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -241,6 +241,9 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
         final accentColor = convertHexStringToColor(state.accentColor) ??
             Colors.lightBlueAccent;
         final fontFamily = kIsWeb ? 'Roboto' : null;
+        final pageTransitionsTheme = PageTransitionsTheme(builders: {
+          TargetPlatform.android: ZoomPageTransitionsBuilder(),
+        });
         Intl.defaultLocale = localeSelector(state);
 
         return MaterialApp(
@@ -261,12 +264,14 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
           locale: AppLocalization.createLocale(localeSelector(state)),
           theme: state.prefState.enableDarkMode
               ? ThemeData(
+                  pageTransitionsTheme: pageTransitionsTheme,
                   brightness: Brightness.dark,
                   accentColor: accentColor,
                   textSelectionHandleColor: accentColor,
                   fontFamily: fontFamily,
                 )
               : ThemeData(fontFamily: fontFamily).copyWith(
+                  pageTransitionsTheme: pageTransitionsTheme,
                   accentColor: accentColor,
                   textSelectionColor: accentColor,
                   primaryColor: const Color(0xFF117cc1),