Merge branch 'develop'

.github/workflows/build.yml

@@ -60,7 +60,7 @@ jobs:
           rm ./public/index.html
           git add .
           git commit -m 'Admin Portal - Hosted'
-          #git push
+          git push
           cd ..
 
           #sentry-cli --auth-token ${{secrets.sentry_auth_token}} --url ${{secrets.sentry_url}} releases --project ${{secrets.sentry_project}} --org ${{secrets.sentry_org}} files $SENTRY_RELEASE upload-sourcemaps . --ext dart --rewrite

lib/data/models/client_model.dart

@@ -891,6 +891,14 @@ abstract class ClientContactEntity extends Object
     }
   }
 
+  String get emailOrFullName {
+    if (email.isNotEmpty) {
+      return email;
+    } else {
+      return fullName;
+    }
+  }
+
   String get fullNameWithEmail {
     String name = fullName;
 

lib/data/models/company_model.dart

@@ -29,6 +29,8 @@ class CompanyFields {
   static const String email = 'email';
   static const String address1 = 'address1';
   static const String address2 = 'address2';
+  static const String city = 'city';
+  static const String postalCode = 'postal_code';
   static const String country = 'country';
   static const String vatNumber = 'vat_number';
   static const String idNumber = 'id_number';

lib/data/models/entities.dart

@@ -285,6 +285,7 @@ class EmailTemplate extends EnumClass {
   static const EmailTemplate payment = _$payment_email;
   static const EmailTemplate payment_partial = _$payment_partial_email;
   static const EmailTemplate credit = _$credit_email;
+  static const EmailTemplate purchase_order = _$purchase_order;
   static const EmailTemplate statement = _$statement_email;
   static const EmailTemplate reminder1 = _$reminder1_email;
   static const EmailTemplate reminder2 = _$reminder2_email;
@@ -293,7 +294,6 @@ class EmailTemplate extends EnumClass {
   static const EmailTemplate custom1 = _$custom1_email;
   static const EmailTemplate custom2 = _$custom2_email;
   static const EmailTemplate custom3 = _$custom3_email;
-  static const EmailTemplate purchase_order = _$purchase_order;
 
   static BuiltSet<EmailTemplate> get values => _$templateValues;
 

lib/data/models/invoice_model.dart

@@ -146,9 +146,9 @@ abstract class InvoiceEntity extends Object
     final settings = getClientSettings(state, client);
 
     double exchangeRate = 1;
-    if ((client?.currencyId ?? '').isNotEmpty) {
+    if (state != null && (client?.currencyId ?? '').isNotEmpty) {
       exchangeRate = getExchangeRate(
-        state!.staticState.currencyMap,
+        state.staticState.currencyMap,
         fromCurrencyId: state.company.currencyId,
         toCurrencyId: client!.currencyId,
       );

lib/data/models/settings_model.dart

@@ -884,6 +884,8 @@ abstract class SettingsEntity
         return emailSubjectReminder3;
       case EmailTemplate.reminder_endless:
         return emailSubjectReminderEndless;
+      case EmailTemplate.statement:
+        return emailSubjectStatement;
       case EmailTemplate.custom1:
         return emailSubjectCustom1;
       case EmailTemplate.custom2:
@@ -917,6 +919,8 @@ abstract class SettingsEntity
         return emailBodyReminder3;
       case EmailTemplate.reminder_endless:
         return emailBodyReminderEndless;
+      case EmailTemplate.statement:
+        return emailBodyStatement;
       case EmailTemplate.custom1:
         return emailBodyCustom1;
       case EmailTemplate.custom2:

lib/data/models/vendor_model.dart

@@ -555,6 +555,7 @@ abstract class VendorContactEntity extends Object
       customValue3: '',
       customValue4: '',
       link: '',
+      password: '',
     );
   }
 
@@ -585,6 +586,8 @@ abstract class VendorContactEntity extends Object
 
   String get phone;
 
+  String get password;
+
   @BuiltValueField(wireName: 'custom_value1')
   String get customValue1;
 
@@ -613,6 +616,14 @@ abstract class VendorContactEntity extends Object
     }
   }
 
+  String get emailOrFullName {
+    if (email.isNotEmpty) {
+      return email;
+    } else {
+      return fullName;
+    }
+  }
+
   String get fullNameWithEmail {
     String name = fullName;
 
@@ -665,6 +676,7 @@ abstract class VendorContactEntity extends Object
   static void _initializeBuilder(VendorContactEntityBuilder builder) => builder
     ..sendEmail = true
     ..link = ''
+    ..password = ''
     ..customValue1 = ''
     ..customValue2 = ''
     ..customValue3 = ''

lib/redux/ui/pref_state.dart

@@ -49,6 +49,7 @@ abstract class PrefState implements Built<PrefState, PrefStateBuilder> {
       persistData: false,
       persistUI: true,
       enableNativeBrowser: false,
+      donwloadsFolder: '',
       statementIncludes: BuiltList(<String>[kStatementIncludePayments]),
       companyPrefs: BuiltMap<String, CompanyPrefState>(),
       sortFields: BuiltMap<EntityType, PrefStateSortField>(),
@@ -175,6 +176,8 @@ abstract class PrefState implements Built<PrefState, PrefStateBuilder> {
 
   double get textScaleFactor;
 
+  String get donwloadsFolder;
+
   BuiltMap<EntityType, PrefStateSortField> get sortFields;
 
   bool get enableDarkMode => darkModeType == kBrightnessSytem
@@ -284,7 +287,8 @@ abstract class PrefState implements Built<PrefState, PrefStateBuilder> {
     ..darkModeType = kBrightnessSytem
     ..colorTheme = kColorThemeLight
     ..darkColorTheme = kColorThemeDark
-    ..enableDarkModeSystem = false;
+    ..enableDarkModeSystem = false
+    ..donwloadsFolder = '';
 
   static Serializer<PrefState> get serializer => _$prefStateSerializer;
 }