From 1e8ef57bf648ff51ebfb5dff0f5624d738865208 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 24 Mar 2021 16:38:57 +0200
Subject: [PATCH] Models

---
 lib/data/models/company_model.dart      | 848 +-----------------------
 lib/data/models/models.dart             |   1 +
 lib/data/models/subscription_model.dart |  48 +-
 lib/redux/app/app_actions.dart          |  40 +-
 starter.sh                              |   2 +-
 5 files changed, 65 insertions(+), 874 deletions(-)

diff --git a/lib/data/models/company_model.dart b/lib/data/models/company_model.dart
index 2982e8b52..4d0b65360 100644
--- a/lib/data/models/company_model.dart
+++ b/lib/data/models/company_model.dart
@@ -119,6 +119,7 @@ abstract class CompanyEntity extends Object
       tokens: BuiltList<TokenEntity>(),
       webhooks: BuiltList<WebhookEntity>(),
       documents: BuiltList<DocumentEntity>(),
+      subscriptions: BuiltList<SubscriptionEntity>(),
     );
   }
 
@@ -277,6 +278,8 @@ abstract class CompanyEntity extends Object
 
   BuiltList<WebhookEntity> get webhooks;
 
+  BuiltList<SubscriptionEntity> get subscriptions;
+
   @BuiltValueField(wireName: 'payment_terms')
   BuiltList<PaymentTermEntity> get paymentTerms;
 
@@ -512,7 +515,8 @@ abstract class CompanyEntity extends Object
     ..sessionTimeout = 0
     ..passwordTimeout = 30 * 60 * 1000
     ..oauthPasswordRequired = false
-    ..invoiceTaskDatelog = true;
+    ..invoiceTaskDatelog = true
+    ..subscriptions = BuiltList<SubscriptionEntity>();
 
   static Serializer<CompanyEntity> get serializer => _$companyEntitySerializer;
 }
@@ -868,848 +872,6 @@ abstract class ReportSettingsEntity
       _$reportSettingsEntitySerializer;
 }
 
-abstract class SettingsEntity
-    implements Built<SettingsEntity, SettingsEntityBuilder> {
-  factory SettingsEntity({
-    SettingsEntity companySettings,
-    SettingsEntity groupSettings,
-    SettingsEntity clientSettings,
-  }) {
-    return _$SettingsEntity._(
-      defaultInvoiceTerms: clientSettings?.defaultInvoiceTerms ??
-          groupSettings?.defaultInvoiceTerms ??
-          companySettings?.defaultInvoiceTerms,
-      defaultInvoiceFooter: clientSettings?.defaultInvoiceFooter ??
-          groupSettings?.defaultInvoiceFooter ??
-          companySettings?.defaultInvoiceFooter,
-      lockInvoices: clientSettings?.lockInvoices ??
-          groupSettings?.lockInvoices ??
-          companySettings?.lockInvoices,
-    );
-  }
-
-  SettingsEntity._();
-
-  @override
-  @memoized
-  int get hashCode;
-
-  static const EMAIL_SENDING_METHOD_DEFAULT = 'default';
-  static const EMAIL_SENDING_METHOD_GMAIL = 'gmail';
-
-  static const LOCK_INVOICES_OFF = 'off';
-  static const LOCK_INVOICES_SENT = 'when_sent';
-  static const LOCK_INVOICES_PAID = 'when_paid';
-
-  static const AUTO_BILL_OFF = 'off';
-  static const AUTO_BILL_OPT_IN = 'optin';
-  static const AUTO_BILL_OPT_OUT = 'optout';
-  static const AUTO_BILL_ALWAYS = 'always';
-
-  static const AUTO_BILL_ON_SEND_DATE = 'on_send_date';
-  static const AUTO_BILL_ON_DUE_DATE = 'on_due_date';
-
-  @nullable
-  @BuiltValueField(wireName: 'timezone_id')
-  String get timezoneId;
-
-  @nullable
-  @BuiltValueField(wireName: 'date_format_id')
-  String get dateFormatId;
-
-  @nullable
-  @BuiltValueField(wireName: 'military_time')
-  bool get enableMilitaryTime;
-
-  @nullable
-  @BuiltValueField(wireName: 'language_id')
-  String get languageId;
-
-  @nullable
-  @BuiltValueField(wireName: 'show_currency_code')
-  bool get showCurrencyCode;
-
-  @nullable
-  @BuiltValueField(wireName: 'currency_id')
-  String get currencyId;
-
-  @nullable
-  @BuiltValueField(wireName: 'custom_value1')
-  String get customValue1;
-
-  @nullable
-  @BuiltValueField(wireName: 'custom_value2')
-  String get customValue2;
-
-  @nullable
-  @BuiltValueField(wireName: 'custom_value3')
-  String get customValue3;
-
-  @nullable
-  @BuiltValueField(wireName: 'custom_value4')
-  String get customValue4;
-
-  @nullable
-  @BuiltValueField(wireName: 'payment_terms')
-  String get defaultPaymentTerms;
-
-  @nullable
-  @BuiltValueField(wireName: 'company_gateway_ids')
-  String get companyGatewayIds;
-
-  @nullable
-  @BuiltValueField(wireName: 'default_task_rate')
-  double get defaultTaskRate;
-
-  @nullable
-  @BuiltValueField(wireName: 'send_reminders')
-  bool get sendReminders;
-
-  @nullable
-  @BuiltValueField(wireName: 'enable_client_portal')
-  bool get enablePortal;
-
-  @nullable
-  @BuiltValueField(wireName: 'enable_client_portal_dashboard')
-  bool get enablePortalDashboard;
-
-  @nullable
-  @BuiltValueField(wireName: 'enable_client_portal_tasks')
-  bool get enablePortalTasks;
-
-  @nullable
-  @BuiltValueField(wireName: 'client_portal_enable_uploads')
-  bool get enablePortalUploads;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_style')
-  String get emailStyle;
-
-  @nullable
-  @BuiltValueField(wireName: 'reply_to_email')
-  String get replyToEmail;
-
-  @nullable
-  @BuiltValueField(wireName: 'reply_to_name')
-  String get replyToName;
-
-  @nullable
-  @BuiltValueField(wireName: 'bcc_email')
-  String get bccEmail;
-
-  @nullable
-  @BuiltValueField(wireName: 'pdf_email_attachment')
-  bool get pdfEmailAttachment;
-
-  @nullable
-  @BuiltValueField(wireName: 'ubl_email_attachment')
-  bool get ublEmailAttachment;
-
-  @nullable
-  @BuiltValueField(wireName: 'document_email_attachment')
-  bool get documentEmailAttachment;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_style_custom')
-  String get emailStyleCustom;
-
-  @nullable
-  @BuiltValueField(wireName: 'custom_message_dashboard')
-  String get customMessageDashboard;
-
-  @nullable
-  @BuiltValueField(wireName: 'custom_message_unpaid_invoice')
-  String get customMessageUnpaidInvoice;
-
-  @nullable
-  @BuiltValueField(wireName: 'custom_message_paid_invoice')
-  String get customMessagePaidInvoice;
-
-  @nullable
-  @BuiltValueField(wireName: 'custom_message_unapproved_quote')
-  String get customMessageUnapprovedQuote;
-
-  @nullable
-  @BuiltValueField(wireName: 'auto_archive_invoice')
-  bool get autoArchiveInvoice;
-
-  @nullable
-  @BuiltValueField(wireName: 'auto_archive_quote')
-  bool get autoArchiveQuote;
-
-  @nullable
-  @BuiltValueField(wireName: 'auto_email_invoice')
-  bool get autoEmailInvoice;
-
-  @nullable
-  @BuiltValueField(wireName: 'auto_convert_quote')
-  bool get autoConvertQuote;
-
-  @nullable
-  @BuiltValueField(wireName: 'inclusive_taxes')
-  bool get enableInclusiveTaxes;
-
-  @nullable
-  BuiltMap<String, String> get translations;
-
-  @nullable
-  @BuiltValueField(wireName: 'task_number_pattern')
-  String get taskNumberPattern;
-
-  @nullable
-  @BuiltValueField(wireName: 'task_number_counter')
-  int get taskNumberCounter;
-
-  @nullable
-  @BuiltValueField(wireName: 'expense_number_pattern')
-  String get expenseNumberPattern;
-
-  @nullable
-  @BuiltValueField(wireName: 'expense_number_counter')
-  int get expenseNumberCounter;
-
-  @nullable
-  @BuiltValueField(wireName: 'vendor_number_pattern')
-  String get vendorNumberPattern;
-
-  @nullable
-  @BuiltValueField(wireName: 'vendor_number_counter')
-  int get vendorNumberCounter;
-
-  @nullable
-  @BuiltValueField(wireName: 'ticket_number_pattern')
-  String get ticketNumberPattern;
-
-  @nullable
-  @BuiltValueField(wireName: 'ticket_number_counter')
-  int get ticketNumberCounter;
-
-  @nullable
-  @BuiltValueField(wireName: 'payment_number_pattern')
-  String get paymentNumberPattern;
-
-  @nullable
-  @BuiltValueField(wireName: 'payment_number_counter')
-  int get paymentNumberCounter;
-
-  @nullable
-  @BuiltValueField(wireName: 'project_number_pattern')
-  String get projectNumberPattern;
-
-  @nullable
-  @BuiltValueField(wireName: 'project_number_counter')
-  int get projectNumberCounter;
-
-  @nullable
-  @BuiltValueField(wireName: 'invoice_number_pattern')
-  String get invoiceNumberPattern;
-
-  @nullable
-  @BuiltValueField(wireName: 'invoice_number_counter')
-  int get invoiceNumberCounter;
-
-  @nullable
-  @BuiltValueField(wireName: 'recurring_invoice_number_pattern')
-  String get recurringInvoiceNumberPattern;
-
-  @nullable
-  @BuiltValueField(wireName: 'recurring_invoice_number_counter')
-  int get recurringInvoiceNumberCounter;
-
-  @nullable
-  @BuiltValueField(wireName: 'quote_number_pattern')
-  String get quoteNumberPattern;
-
-  @nullable
-  @BuiltValueField(wireName: 'quote_number_counter')
-  int get quoteNumberCounter;
-
-  @nullable
-  @BuiltValueField(wireName: 'client_number_pattern')
-  String get clientNumberPattern;
-
-  @nullable
-  @BuiltValueField(wireName: 'client_number_counter')
-  int get clientNumberCounter;
-
-  @nullable
-  @BuiltValueField(wireName: 'credit_number_pattern')
-  String get creditNumberPattern;
-
-  @nullable
-  @BuiltValueField(wireName: 'credit_number_counter')
-  int get creditNumberCounter;
-
-  @nullable
-  @BuiltValueField(wireName: 'recurring_number_prefix')
-  String get recurringNumberPrefix;
-
-  @nullable
-  @BuiltValueField(wireName: 'reset_counter_frequency_id')
-  String get resetCounterFrequencyId;
-
-  @nullable
-  @BuiltValueField(wireName: 'reset_counter_date')
-  String get resetCounterDate;
-
-  @nullable
-  @BuiltValueField(wireName: 'counter_padding')
-  int get counterPadding;
-
-  @nullable
-  @BuiltValueField(wireName: 'shared_invoice_quote_counter')
-  bool get sharedInvoiceQuoteCounter;
-
-  @nullable
-  @BuiltValueField(wireName: 'shared_invoice_credit_counter')
-  bool get sharedInvoiceCreditCounter;
-
-  @nullable
-  @BuiltValueField(wireName: 'invoice_terms')
-  String get defaultInvoiceTerms;
-
-  @nullable
-  @BuiltValueField(wireName: 'quote_terms')
-  String get defaultQuoteTerms;
-
-  @nullable
-  @BuiltValueField(wireName: 'quote_footer')
-  String get defaultQuoteFooter;
-
-  @nullable
-  @BuiltValueField(wireName: 'credit_terms')
-  String get defaultCreditTerms;
-
-  @nullable
-  @BuiltValueField(wireName: 'credit_footer')
-  String get defaultCreditFooter;
-
-  @nullable
-  @BuiltValueField(wireName: 'invoice_design_id')
-  String get defaultInvoiceDesignId;
-
-  @nullable
-  @BuiltValueField(wireName: 'quote_design_id')
-  String get defaultQuoteDesignId;
-
-  @nullable
-  @BuiltValueField(wireName: 'credit_design_id')
-  String get defaultCreditDesignId;
-
-  @nullable
-  @BuiltValueField(wireName: 'invoice_footer')
-  String get defaultInvoiceFooter;
-
-  @nullable
-  @BuiltValueField(wireName: 'tax_name1')
-  String get defaultTaxName1;
-
-  @nullable
-  @BuiltValueField(wireName: 'tax_rate1')
-  double get defaultTaxRate1;
-
-  @nullable
-  @BuiltValueField(wireName: 'tax_name2')
-  String get defaultTaxName2;
-
-  @nullable
-  @BuiltValueField(wireName: 'tax_rate2')
-  double get defaultTaxRate2;
-
-  @nullable
-  @BuiltValueField(wireName: 'tax_name3')
-  String get defaultTaxName3;
-
-  @nullable
-  @BuiltValueField(wireName: 'tax_rate3')
-  double get defaultTaxRate3;
-
-  @nullable
-  @BuiltValueField(wireName: 'payment_type_id')
-  String get defaultPaymentTypeId;
-
-  @nullable
-  @BuiltValueField(wireName: 'pdf_variables')
-  BuiltMap<String, BuiltList<String>> get pdfVariables;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_signature')
-  String get emailSignature;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_subject_invoice')
-  String get emailSubjectInvoice;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_subject_quote')
-  String get emailSubjectQuote;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_subject_credit')
-  String get emailSubjectCredit;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_subject_payment')
-  String get emailSubjectPayment;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_subject_payment_partial')
-  String get emailSubjectPaymentPartial;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_template_invoice')
-  String get emailBodyInvoice;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_template_quote')
-  String get emailBodyQuote;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_template_credit')
-  String get emailBodyCredit;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_template_payment')
-  String get emailBodyPayment;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_template_payment_partial')
-  String get emailBodyPaymentPartial;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_subject_reminder1')
-  String get emailSubjectReminder1;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_subject_reminder2')
-  String get emailSubjectReminder2;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_subject_reminder3')
-  String get emailSubjectReminder3;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_template_reminder1')
-  String get emailBodyReminder1;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_template_reminder2')
-  String get emailBodyReminder2;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_template_reminder3')
-  String get emailBodyReminder3;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_subject_custom1')
-  String get emailSubjectCustom1;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_template_custom1')
-  String get emailBodyCustom1;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_subject_custom2')
-  String get emailSubjectCustom2;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_template_custom2')
-  String get emailBodyCustom2;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_subject_custom3')
-  String get emailSubjectCustom3;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_template_custom3')
-  String get emailBodyCustom3;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_subject_statement')
-  String get emailSubjectStatement;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_template_statement')
-  String get emailBodyStatement;
-
-  @nullable
-  @BuiltValueField(wireName: 'enable_client_portal_password')
-  bool get enablePortalPassword;
-
-  @nullable
-  @BuiltValueField(wireName: 'signature_on_pdf')
-  bool get signatureOnPdf;
-
-  @nullable
-  @BuiltValueField(wireName: 'enable_email_markup')
-  bool get enableEmailMarkup;
-
-  @nullable
-  @BuiltValueField(wireName: 'show_accept_invoice_terms')
-  bool get showAcceptInvoiceTerms;
-
-  @nullable
-  @BuiltValueField(wireName: 'show_accept_quote_terms')
-  bool get showAcceptQuoteTerms;
-
-  @nullable
-  @BuiltValueField(wireName: 'require_invoice_signature')
-  bool get requireInvoiceSignature;
-
-  @nullable
-  @BuiltValueField(wireName: 'require_quote_signature')
-  bool get requireQuoteSignature;
-
-  @nullable
-  String get name;
-
-  @nullable
-  @BuiltValueField(wireName: 'company_logo')
-  String get companyLogo;
-
-  @nullable
-  @BuiltValueField(wireName: 'website')
-  String get website;
-
-  @nullable
-  String get address1;
-
-  @nullable
-  String get address2;
-
-  @nullable
-  String get city;
-
-  @nullable
-  String get state;
-
-  @nullable
-  @BuiltValueField(wireName: 'postal_code')
-  String get postalCode;
-
-  @nullable
-  String get phone;
-
-  @nullable
-  String get email;
-
-  @nullable
-  @BuiltValueField(wireName: 'country_id')
-  String get countryId;
-
-  @nullable
-  @BuiltValueField(wireName: 'vat_number')
-  String get vatNumber;
-
-  @nullable
-  @BuiltValueField(wireName: 'id_number')
-  String get idNumber;
-
-  @nullable
-  @BuiltValueField(wireName: 'page_size')
-  String get pageSize;
-
-  @nullable
-  @BuiltValueField(wireName: 'font_size')
-  int get fontSize;
-
-  @nullable
-  @BuiltValueField(wireName: 'primary_color')
-  String get primaryColor;
-
-  @nullable
-  @BuiltValueField(wireName: 'secondary_color')
-  String get secondaryColor;
-
-  @nullable
-  @BuiltValueField(wireName: 'primary_font')
-  String get primaryFont;
-
-  @nullable
-  @BuiltValueField(wireName: 'secondary_font')
-  String get secondaryFont;
-
-  @nullable
-  @BuiltValueField(wireName: 'hide_paid_to_date')
-  bool get hidePaidToDate;
-
-  @nullable
-  @BuiltValueField(wireName: 'embed_documents')
-  bool get embedDocuments;
-
-  @nullable
-  @BuiltValueField(wireName: 'all_pages_header')
-  bool get allPagesHeader;
-
-  @nullable
-  @BuiltValueField(wireName: 'all_pages_footer')
-  bool get allPagesFooter;
-
-  @nullable
-  @BuiltValueField(wireName: 'enable_reminder1')
-  bool get enableReminder1;
-
-  @nullable
-  @BuiltValueField(wireName: 'enable_reminder2')
-  bool get enableReminder2;
-
-  @nullable
-  @BuiltValueField(wireName: 'enable_reminder3')
-  bool get enableReminder3;
-
-  @nullable
-  @BuiltValueField(wireName: 'enable_reminder_endless')
-  bool get enableReminderEndless;
-
-  @nullable
-  @BuiltValueField(wireName: 'num_days_reminder1')
-  int get numDaysReminder1;
-
-  @nullable
-  @BuiltValueField(wireName: 'num_days_reminder2')
-  int get numDaysReminder2;
-
-  @nullable
-  @BuiltValueField(wireName: 'num_days_reminder3')
-  int get numDaysReminder3;
-
-  @nullable
-  @BuiltValueField(wireName: 'schedule_reminder1')
-  String get scheduleReminder1;
-
-  @nullable
-  @BuiltValueField(wireName: 'schedule_reminder2')
-  String get scheduleReminder2;
-
-  @nullable
-  @BuiltValueField(wireName: 'schedule_reminder3')
-  String get scheduleReminder3;
-
-  @nullable
-  @BuiltValueField(wireName: 'endless_reminder_frequency_id')
-  String get endlessReminderFrequencyId;
-
-  @nullable
-  @BuiltValueField(wireName: 'late_fee_amount1')
-  double get lateFeeAmount1;
-
-  @nullable
-  @BuiltValueField(wireName: 'late_fee_amount2')
-  double get lateFeeAmount2;
-
-  @nullable
-  @BuiltValueField(wireName: 'late_fee_amount3')
-  double get lateFeeAmount3;
-
-  @nullable
-  @BuiltValueField(wireName: 'late_fee_endless_amount')
-  double get lateFeeAmountEndless;
-
-  @nullable
-  @BuiltValueField(wireName: 'late_fee_percent1')
-  double get lateFeePercent1;
-
-  @nullable
-  @BuiltValueField(wireName: 'late_fee_percent2')
-  double get lateFeePercent2;
-
-  @nullable
-  @BuiltValueField(wireName: 'late_fee_percent3')
-  double get lateFeePercent3;
-
-  @nullable
-  @BuiltValueField(wireName: 'late_fee_endless_percent')
-  double get lateFeePercentEndless;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_subject_reminder_endless')
-  String get emailSubjectReminderEndless;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_template_reminder_endless')
-  String get emailBodyReminderEndless;
-
-  @nullable
-  @BuiltValueField(wireName: 'client_online_payment_notification')
-  bool get clientOnlinePaymentNotification;
-
-  @nullable
-  @BuiltValueField(wireName: 'client_manual_payment_notification')
-  bool get clientManualPaymentNotification;
-
-  @nullable
-  @BuiltValueField(wireName: 'counter_number_applied')
-  String get counterNumberApplied;
-
-  @nullable
-  @BuiltValueField(wireName: 'email_sending_method')
-  String get emailSendingMethod;
-
-  @nullable
-  @BuiltValueField(wireName: 'gmail_sending_user_id')
-  String get gmailSendingUserId;
-
-  @nullable
-  @BuiltValueField(wireName: 'client_portal_terms')
-  String get clientPortalTerms;
-
-  @nullable
-  @BuiltValueField(wireName: 'client_portal_privacy_policy')
-  String get clientPortalPrivacy;
-
-  @nullable
-  @BuiltValueField(wireName: 'lock_invoices')
-  String get lockInvoices;
-
-  @nullable
-  @BuiltValueField(wireName: 'auto_bill')
-  String get autoBill;
-
-  @nullable
-  @BuiltValueField(wireName: 'client_portal_allow_under_payment')
-  bool get clientPortalAllowUnderPayment;
-
-  @nullable
-  @BuiltValueField(wireName: 'client_portal_allow_over_payment')
-  bool get clientPortalAllowOverPayment;
-
-  @nullable
-  @BuiltValueField(wireName: 'auto_bill_date')
-  String get autoBillDate;
-
-  @nullable
-  @BuiltValueField(wireName: 'client_portal_under_payment_minimum')
-  double get clientPortalUnderPaymentMinimum;
-
-  @nullable
-  @BuiltValueField(wireName: 'use_credits_payment')
-  String get useCreditsPayment;
-
-  @nullable
-  @BuiltValueField(wireName: 'portal_custom_head')
-  String get clientPortalCustomHeader;
-
-  @nullable
-  @BuiltValueField(wireName: 'portal_custom_css')
-  String get clientPortalCustomCss;
-
-  @nullable
-  @BuiltValueField(wireName: 'portal_custom_footer')
-  String get clientPortalCustomFooter;
-
-  @nullable
-  @BuiltValueField(wireName: 'portal_custom_js')
-  String get clientPortalCustomJs;
-
-  @nullable
-  @BuiltValueField(wireName: 'hide_empty_columns_on_pdf')
-  bool get hideEmptyColumnsOnPdf;
-
-  // TODO remove this field
-  @nullable
-  @BuiltValueField(wireName: 'has_custom_design1_HIDDEN')
-  bool get hasCustomDesign1;
-
-  // TODO remove this field
-  @nullable
-  @BuiltValueField(wireName: 'has_custom_design2_HIDDEN')
-  bool get hasCustomDesign2;
-
-  // TODO remove this field
-  @nullable
-  @BuiltValueField(wireName: 'has_custom_design3_HIDDEN')
-  bool get hasCustomDesign3;
-
-  bool get hasAddress => address1 != null && address1.isNotEmpty;
-
-  bool get hasLogo => companyLogo != null && companyLogo.isNotEmpty;
-
-  bool get hasTimezone => timezoneId != null && timezoneId.isNotEmpty;
-
-  bool get hasDateFormat => dateFormatId != null && dateFormatId.isNotEmpty;
-
-  bool get hasLanguage => languageId != null && languageId.isNotEmpty;
-
-  bool get hasCurrency => currencyId != null && currencyId.isNotEmpty;
-
-  bool get hasDefaultPaymentTypeId =>
-      defaultPaymentTypeId != null && defaultPaymentTypeId.isNotEmpty;
-
-  List<String> getFieldsForSection(String section) =>
-      pdfVariables != null && pdfVariables.containsKey(section)
-          ? pdfVariables[section].toList()
-          : [];
-
-  SettingsEntity setFieldsForSection(String section, List<String> fields) {
-    if (pdfVariables == null) {
-      return rebuild((b) => b..pdfVariables.replace({section: fields}));
-    } else {
-      return rebuild((b) => b..pdfVariables[section] = BuiltList(fields));
-    }
-  }
-
-  String getEmailSubject(EmailTemplate emailTemplate) {
-    switch (emailTemplate) {
-      case EmailTemplate.invoice:
-        return emailSubjectInvoice;
-      case EmailTemplate.quote:
-        return emailSubjectQuote;
-      case EmailTemplate.credit:
-        return emailSubjectCredit;
-      case EmailTemplate.payment:
-        return emailSubjectPayment;
-      case EmailTemplate.payment_partial:
-        return emailSubjectPaymentPartial;
-      case EmailTemplate.reminder1:
-        return emailSubjectReminder1;
-      case EmailTemplate.reminder2:
-        return emailSubjectReminder2;
-      case EmailTemplate.reminder3:
-        return emailSubjectReminder3;
-      case EmailTemplate.custom1:
-        return emailSubjectCustom1;
-      case EmailTemplate.custom2:
-        return emailSubjectCustom2;
-      case EmailTemplate.custom3:
-        return emailSubjectCustom3;
-      default:
-        return emailSubjectInvoice;
-    }
-  }
-
-  String getEmailBody(EmailTemplate template) {
-    switch (template) {
-      case EmailTemplate.invoice:
-        return emailBodyInvoice;
-      case EmailTemplate.quote:
-        return emailBodyQuote;
-      case EmailTemplate.credit:
-        return emailBodyCredit;
-      case EmailTemplate.payment:
-        return emailBodyPayment;
-      case EmailTemplate.payment_partial:
-        return emailBodyPaymentPartial;
-      case EmailTemplate.reminder1:
-        return emailBodyReminder1;
-      case EmailTemplate.reminder2:
-        return emailBodyReminder2;
-      case EmailTemplate.reminder3:
-        return emailBodyReminder3;
-      case EmailTemplate.custom1:
-        return emailBodyCustom1;
-      case EmailTemplate.custom2:
-        return emailBodyCustom2;
-      case EmailTemplate.custom3:
-        return emailBodyCustom3;
-      default:
-        return emailBodyInvoice;
-    }
-  }
-
-  static Serializer<SettingsEntity> get serializer =>
-      _$settingsEntitySerializer;
-}
-
 abstract class CompanyItemResponse
     implements Built<CompanyItemResponse, CompanyItemResponseBuilder> {
   factory CompanyItemResponse([void updates(CompanyItemResponseBuilder b)]) =
diff --git a/lib/data/models/models.dart b/lib/data/models/models.dart
index 2ee7da450..0116239f6 100644
--- a/lib/data/models/models.dart
+++ b/lib/data/models/models.dart
@@ -10,6 +10,7 @@ export 'package:invoiceninja_flutter/data/models/tax_rate_model.dart';
 export 'package:invoiceninja_flutter/data/models/document_model.dart';
 export 'package:invoiceninja_flutter/data/models/entities.dart';
 export 'package:invoiceninja_flutter/data/models/expense_model.dart';
+export 'package:invoiceninja_flutter/data/models/subscription_model.dart';
 export 'package:invoiceninja_flutter/data/models/expense_category_model.dart';
 export 'package:invoiceninja_flutter/data/models/token_model.dart';
 export 'package:invoiceninja_flutter/data/models/webhook_model.dart';
diff --git a/lib/data/models/subscription_model.dart b/lib/data/models/subscription_model.dart
index ba1e2809e..5f5ab4ae8 100644
--- a/lib/data/models/subscription_model.dart
+++ b/lib/data/models/subscription_model.dart
@@ -8,14 +8,16 @@ import 'package:invoiceninja_flutter/utils/formatting.dart';
 part 'subscription_model.g.dart';
 
 abstract class SubscriptionListResponse
-    implements Built<SubscriptionListResponse, SubscriptionListResponseBuilder> {
-  factory SubscriptionListResponse([void updates(SubscriptionListResponseBuilder b)]) =
+    implements
+        Built<SubscriptionListResponse, SubscriptionListResponseBuilder> {
+  factory SubscriptionListResponse(
+          [void updates(SubscriptionListResponseBuilder b)]) =
       _$SubscriptionListResponse;
 
   SubscriptionListResponse._();
 
   @override
-@memoized
+  @memoized
   int get hashCode;
 
   BuiltList<SubscriptionEntity> get data;
@@ -25,14 +27,16 @@ abstract class SubscriptionListResponse
 }
 
 abstract class SubscriptionItemResponse
-    implements Built<SubscriptionItemResponse, SubscriptionItemResponseBuilder> {
-  factory SubscriptionItemResponse([void updates(SubscriptionItemResponseBuilder b)]) =
+    implements
+        Built<SubscriptionItemResponse, SubscriptionItemResponseBuilder> {
+  factory SubscriptionItemResponse(
+          [void updates(SubscriptionItemResponseBuilder b)]) =
       _$SubscriptionItemResponse;
 
   SubscriptionItemResponse._();
 
   @override
-@memoized
+  @memoized
   int get hashCode;
 
   SubscriptionEntity get data;
@@ -45,8 +49,9 @@ class SubscriptionFields {
   // STARTER: fields - do not remove comment
 }
 
-abstract class SubscriptionEntity extends Object with BaseEntity implements Built<SubscriptionEntity, SubscriptionEntityBuilder> {
-
+abstract class SubscriptionEntity extends Object
+    with BaseEntity
+    implements Built<SubscriptionEntity, SubscriptionEntityBuilder> {
   // STARTER: properties - do not remove comment
 
   factory SubscriptionEntity({String id, AppState state}) {
@@ -60,18 +65,13 @@ abstract class SubscriptionEntity extends Object with BaseEntity implements Buil
   SubscriptionEntity._();
 
   @override
-@memoized
+  @memoized
   int get hashCode;
 
   @override
   EntityType get entityType => EntityType.subscription;
 
-  String get displayName {
-    // STARTER: display name - do not remove comment
-return subscriptions;
-
-  }
-
+  String get displayName => id;
 
   @override
   List<EntityAction> getActions(
@@ -94,23 +94,22 @@ return subscriptions;
     return actions..addAll(super.getActions(userCompany: userCompany));
   }
 
-  int compareTo(SubscriptionEntity subscription, String sortField, bool sortAscending) {
+  int compareTo(
+      SubscriptionEntity subscription, String sortField, bool sortAscending) {
     int response = 0;
     final subscriptionA = sortAscending ? this : subscription;
-    final subscriptionB = sortAscending ? subscription: this;
+    final subscriptionB = sortAscending ? subscription : this;
 
     switch (sortField) {
       // STARTER: sort switch - do not remove comment
-            default:
-              print('## ERROR: sort by subscription.$sortField is not implemented');
-              break;
-
+      default:
+        print('## ERROR: sort by subscription.$sortField is not implemented');
+        break;
     }
 
     if (response == 0) {
       // STARTER: sort default - do not remove comment
-return subscriptionA.subscriptions.compareTo(subscriptionB.subscriptions);
-
+      return subscriptionA.createdAt.compareTo(subscriptionB.createdAt);
     } else {
       return response;
     }
@@ -147,5 +146,6 @@ return subscriptionA.subscriptions.compareTo(subscriptionB.subscriptions);
   @override
   FormatNumberType get listDisplayAmountType => null;
 
-  static Serializer<SubscriptionEntity> get serializer => _$subscriptionEntitySerializer;
+  static Serializer<SubscriptionEntity> get serializer =>
+      _$subscriptionEntitySerializer;
 }
diff --git a/lib/redux/app/app_actions.dart b/lib/redux/app/app_actions.dart
index aab87bf4f..95fc6725b 100644
--- a/lib/redux/app/app_actions.dart
+++ b/lib/redux/app/app_actions.dart
@@ -331,7 +331,9 @@ void viewEntitiesByType({
             action = ViewGroupList(navigator: navigator);
             break;
           // STARTER: view list - do not remove comment
-case EntityType.subscription: store.dispatch(ViewSubscriptionList(navigator: navigator)); break;
+          case EntityType.subscription:
+            store.dispatch(ViewSubscriptionList(navigator: navigator));
+            break;
 
           case EntityType.taskStatus:
             store.dispatch(ViewTaskStatusList(navigator: navigator));
@@ -544,7 +546,13 @@ void viewEntityById({
             ));
             break;
           // STARTER: view - do not remove comment
-case EntityType.subscription: store.dispatch(ViewSubscription(subscriptionId: entityId, navigator: navigator, force: force,)); break;
+          case EntityType.subscription:
+            store.dispatch(ViewSubscription(
+              subscriptionId: entityId,
+              navigator: navigator,
+              force: force,
+            ));
+            break;
 
           case EntityType.taskStatus:
             store.dispatch(ViewTaskStatus(
@@ -780,7 +788,13 @@ void createEntityByType({
             ));
             break;
           // STARTER: create type - do not remove comment
-case EntityType.subscription: store.dispatch(EditSubscription(navigator: navigator, force: force, subscription: SubscriptionEntity(state: state), )); break;
+          case EntityType.subscription:
+            store.dispatch(EditSubscription(
+              navigator: navigator,
+              force: force,
+              subscription: SubscriptionEntity(state: state),
+            ));
+            break;
 
           case EntityType.taskStatus:
             store.dispatch(EditTaskStatus(
@@ -996,7 +1010,14 @@ void createEntity({
             ));
             break;
           // STARTER: create - do not remove comment
-case EntityType.subscription: store.dispatch(EditSubscription(navigator: navigator, subscription: entity, force: force, completer: completer, )); break;
+          case EntityType.subscription:
+            store.dispatch(EditSubscription(
+              navigator: navigator,
+              subscription: entity,
+              force: force,
+              completer: completer,
+            ));
+            break;
 
           case EntityType.taskStatus:
             store.dispatch(EditTaskStatus(
@@ -1199,7 +1220,12 @@ void editEntity(
             ));
             break;
           // STARTER: edit - do not remove comment
-case EntityType.subscription: store.dispatch(EditSubscription(subscription: entity, navigator: navigator, completer: completer ?? snackBarCompleter<SubscriptionEntity>(context, entity.isNew ? localization.createdSubscription : localization.updatedSubscription),));break;
+          case EntityType.subscription:
+            store.dispatch(EditSubscription(
+                subscription: entity,
+                navigator: navigator,
+                completer: completer));
+            break;
 
           case EntityType.taskStatus:
             store.dispatch(EditTaskStatus(
@@ -1361,7 +1387,9 @@ void handleEntitiesActions(
       handleDocumentAction(context, entities, action);
       break;
     // STARTER: actions - do not remove comment
-case EntityType.subscription: handleSubscriptionAction(context, entities, action); break;
+    case EntityType.subscription:
+      handleSubscriptionAction(context, entities, action);
+      break;
 
     case EntityType.taskStatus:
       handleTaskStatusAction(context, entities, action);
diff --git a/starter.sh b/starter.sh
index 9eb0ccc68..5ec61c3f1 100644
--- a/starter.sh
+++ b/starter.sh
@@ -426,7 +426,7 @@ else
     sed -i -e "s/$comment/$comment${lineBreak}$code/g" ./lib/redux/app/app_actions.dart
 
     comment="STARTER: edit - do not remove comment"
-    code="case EntityType.${module_camel}: store.dispatch(Edit${Module}(${module_camel}: entity, navigator: navigator, completer: completer ?? snackBarCompleter<${Module}Entity>(context, entity.isNew ? localization.created${Module} : localization.updated${Module}),));break;${lineBreak}"
+    code="case EntityType.${module_camel}: store.dispatch(Edit${Module}(${module_camel}: entity, navigator: navigator, completer: completer));break;${lineBreak}"
     sed -i -e "s/$comment/$comment${lineBreak}$code/g" ./lib/redux/app/app_actions.dart
 
     comment="STARTER: actions - do not remove comment"