Merge branch 'develop'

.github/workflows/build.yml

@@ -69,6 +69,19 @@ jobs:
 
           sentry-cli --auth-token ${{secrets.sentry_auth_token}} --url ${{secrets.sentry_url}} releases --org ${{secrets.sentry_org}} finalize $SENTRY_RELEASE
           sentry-cli --auth-token ${{secrets.sentry_auth_token}} --url ${{secrets.sentry_url}} releases --org ${{secrets.sentry_org}} deploys $SENTRY_RELEASE new -e production          
+      - name: Build HTML App
+        run: |
+          flutter build --web-renderer html
+
+          git clone https://${{secrets.commit_secret}}@github.com/invoiceninja/invoiceninja.git invoiceninja_html
+          cd invoiceninja_html
+
+          git checkout v5-develop
+          cp ../build/web/main.dart.js ./public/main.html.dart.js
+          git add .
+          git commit -m 'Admin Portal - HTML'
+          git push
+          cd ..
       - name: Build Profile App
         run: |
           flutter build web --profile

lib/constants.dart

@@ -4,7 +4,7 @@ class Constants {
 }
 
 // TODO remove version once #46609 is fixed
-const String kClientVersion = '5.0.60';
+const String kClientVersion = '5.0.61';
 const String kMinServerVersion = '5.0.4';
 
 const String kAppName = 'Invoice Ninja';
@@ -35,6 +35,11 @@ const String kLinuxUrl = 'https://download.invoiceninja.com/linux';
 const String kWindowsUrl =
     'https://www.microsoft.com/en-us/p/invoice-ninja/9n3f2bbcfdr6';
 
+const String kTwitterUrl = 'https://twitter.com/invoiceninja';
+const String kFacebookUrl = 'https://www.facebook.com/invoiceninja';
+const String kYouTubeUrl =
+    'https://www.youtube.com/channel/UCXAHcBvhW05PDtWYIq7WDFA/videos';
+
 const String kDocsUrl = 'https://invoiceninja.github.io/docs';
 const String kDocsCustomDomainUrl =
     'https://invoiceninja.github.io/docs/hosted-custom-domain';
@@ -98,7 +103,7 @@ const double kDrawerWidth = 270;
 const double kTableColumnGap = 16;
 const double kTopBottomBarHeight = 50;
 const double kDialogWidth = 400;
-const double kDashboardPanelHeight = 548; // TODO remove this
+const double kDashboardPanelHeight = 545; // TODO remove this
 const double kDashboardPanelHeightWeb = 541; // TODO remove this
 const double kListNumberWidth = 100;
 const double kBorderRadius = 2;

lib/data/models/client_model.dart

@@ -71,6 +71,7 @@ class ClientFields {
   static const String isDeleted = 'is_deleted';
   static const String contactName = 'contact_name';
   static const String contactEmail = 'contact_email';
+  static const String contactPhone = 'contact_phone';
   static const String state = 'state';
   static const String phone = 'phone';
   static const String website = 'website';

lib/data/models/company_model.dart

@@ -128,6 +128,7 @@ abstract class CompanyEntity extends Object
       documents: BuiltList<DocumentEntity>(),
       subscriptions: BuiltList<SubscriptionEntity>(),
       systemLogs: BuiltList<SystemLogEntity>(),
+      clientRegistrationFields: BuiltList<RegistrationFieldEntity>(),
     );
   }
 
@@ -306,6 +307,9 @@ abstract class CompanyEntity extends Object
   @BuiltValueField(wireName: 'system_logs')
   BuiltList<SystemLogEntity> get systemLogs;
 
+  @BuiltValueField(wireName: 'client_registration_fields')
+  BuiltList<RegistrationFieldEntity> get clientRegistrationFields;
+
   @BuiltValueField(wireName: 'custom_fields')
   BuiltMap<String, String> get customFields;
 
@@ -562,7 +566,8 @@ abstract class CompanyEntity extends Object
     ..reportIncludeDrafts = false
     ..systemLogs.replace(BuiltList<SystemLogEntity>())
     ..subscriptions.replace(BuiltList<SubscriptionEntity>())
-    ..recurringExpenses.replace(BuiltList<ExpenseEntity>());
+    ..recurringExpenses.replace(BuiltList<ExpenseEntity>())
+    ..clientRegistrationFields.replace(BuiltList<RegistrationFieldEntity>());
 
   static Serializer<CompanyEntity> get serializer => _$companyEntitySerializer;
 }
@@ -974,3 +979,26 @@ abstract class CompanyItemResponse
   static Serializer<CompanyItemResponse> get serializer =>
       _$companyItemResponseSerializer;
 }
+
+abstract class RegistrationFieldEntity
+    implements Built<RegistrationFieldEntity, RegistrationFieldEntityBuilder> {
+  factory RegistrationFieldEntity(bool reportErrors) {
+    return _$RegistrationFieldEntity._(
+      key: '',
+      required: false,
+    );
+  }
+
+  RegistrationFieldEntity._();
+
+  @override
+  @memoized
+  int get hashCode;
+
+  String get key;
+
+  bool get required;
+
+  static Serializer<RegistrationFieldEntity> get serializer =>
+      _$registrationFieldEntitySerializer;
+}