From 50b61d33f74d76c04d85301e54a7a8c5f9a5ada9 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 24 May 2023 12:19:53 +0300 Subject: [PATCH] Adjust version requirements --- lib/ui/settings/email_settings.dart | 2 +- lib/ui/settings/settings_list.dart | 4 ++-- lib/ui/settings/tax_settings.dart | 2 +- lib/utils/platforms.dart | 13 ++++++++++--- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/lib/ui/settings/email_settings.dart b/lib/ui/settings/email_settings.dart index b9ca2478d..260d012e9 100644 --- a/lib/ui/settings/email_settings.dart +++ b/lib/ui/settings/email_settings.dart @@ -510,7 +510,7 @@ class _EmailSettingsState extends State { onChanged: (value) => viewModel.onSettingsChanged( settings.rebuild((b) => b..ublEmailAttachment = value)), ), - if (supportsLatestFeatures()) + if (supportsLatestFeatures(null)) BoolDropdownButton( label: localization.enableEInvoice, value: settings.enableEInvoice, diff --git a/lib/ui/settings/settings_list.dart b/lib/ui/settings/settings_list.dart index 2b2802253..c17ad76fa 100644 --- a/lib/ui/settings/settings_list.dart +++ b/lib/ui/settings/settings_list.dart @@ -428,7 +428,7 @@ class SettingsSearch extends StatelessWidget { [ 'tax_settings', 'inclusive_taxes', - if (supportsLatestFeatures()) 'calculate_taxes#2023-04-26', + if (supportsLatestFeatures('5.6.0')) 'calculate_taxes#2023-04-26', ], ], kSettingsTaxRates: [ @@ -623,7 +623,7 @@ class SettingsSearch extends StatelessWidget { 'mailgun#2023-01-11', 'email_alignment#2023-01-17', 'show_email_footer#2023-01-17', - if (supportsLatestFeatures()) 'enable_e_invoice#2023-04-27,' + if (supportsLatestFeatures(null)) 'enable_e_invoice#2023-04-27,' ], ], kSettingsTemplatesAndReminders: [ diff --git a/lib/ui/settings/tax_settings.dart b/lib/ui/settings/tax_settings.dart index e8be8d743..cafec7b28 100644 --- a/lib/ui/settings/tax_settings.dart +++ b/lib/ui/settings/tax_settings.dart @@ -160,7 +160,7 @@ class _TaxSettingsState extends State { onPressed: () => viewModel.onConfigureRatesPressed(context), ), ), - if (supportsLatestFeatures()) + if (supportsLatestFeatures('5.6.0')) FormCard( isLast: true, crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/utils/platforms.dart b/lib/utils/platforms.dart index a0383cc43..9cd3a9ee7 100644 --- a/lib/utils/platforms.dart +++ b/lib/utils/platforms.dart @@ -47,7 +47,7 @@ bool supportsAppleOAuth() => kIsWeb || isApple(); // TODO remove this function bool supportsMicrosoftOAuth() => kIsWeb; -bool supportsLatestFeatures() { +bool supportsLatestFeatures(String version) { final store = StoreProvider.of(navigatorKey.currentContext); final state = store.state; @@ -55,8 +55,15 @@ bool supportsLatestFeatures() { return true; } - return Version.parse(state.account.currentVersion) >= - Version.parse('5.5.118'); + if (state.isSelfHosted) { + return true; + } + + if (version == null) { + return false; + } + + return Version.parse(state.account.currentVersion) >= Version.parse(version); } bool supportsInAppPurchase() {