From 8af8f3d317deddc7f5a1d651c73f6d0c5b8fe7c0 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 4 Nov 2021 09:45:05 +0200 Subject: [PATCH] Only show default tax selector if company has tax rates --- lib/ui/settings/tax_settings.dart | 68 ++++++++++++++++--------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/lib/ui/settings/tax_settings.dart b/lib/ui/settings/tax_settings.dart index 632c5ce36..999596b7c 100644 --- a/lib/ui/settings/tax_settings.dart +++ b/lib/ui/settings/tax_settings.dart @@ -83,39 +83,41 @@ class _TaxSettingsState extends State { ), ], ), - FormCard( - children: [ - TaxRateDropdown( - onSelected: (taxRate) => - viewModel.onSettingsChanged(settings.rebuild((b) => b - ..defaultTaxName1 = taxRate.name - ..defaultTaxRate1 = taxRate.rate)), - labelText: localization.defaultTaxRate, - initialTaxName: settings.defaultTaxName1, - initialTaxRate: settings.defaultTaxRate1, - ), - if (company.enableSecondInvoiceTaxRate) - TaxRateDropdown( - onSelected: (taxRate) => - viewModel.onSettingsChanged(settings.rebuild((b) => b - ..defaultTaxName2 = taxRate.name - ..defaultTaxRate2 = taxRate.rate)), - labelText: localization.defaultTaxRate, - initialTaxName: settings.defaultTaxName2, - initialTaxRate: settings.defaultTaxRate2, - ), - if (company.enableThirdInvoiceTaxRate) - TaxRateDropdown( - onSelected: (taxRate) => - viewModel.onSettingsChanged(settings.rebuild((b) => b - ..defaultTaxName3 = taxRate.name - ..defaultTaxRate3 = taxRate.rate)), - labelText: localization.defaultTaxRate, - initialTaxName: settings.defaultTaxName3, - initialTaxRate: settings.defaultTaxRate3, - ), - ], - ), + if (state.taxRateState.list.isNotEmpty) + FormCard( + children: [ + if (company.enableFirstInvoiceTaxRate) + TaxRateDropdown( + onSelected: (taxRate) => + viewModel.onSettingsChanged(settings.rebuild((b) => b + ..defaultTaxName1 = taxRate.name + ..defaultTaxRate1 = taxRate.rate)), + labelText: localization.defaultTaxRate, + initialTaxName: settings.defaultTaxName1, + initialTaxRate: settings.defaultTaxRate1, + ), + if (company.enableSecondInvoiceTaxRate) + TaxRateDropdown( + onSelected: (taxRate) => + viewModel.onSettingsChanged(settings.rebuild((b) => b + ..defaultTaxName2 = taxRate.name + ..defaultTaxRate2 = taxRate.rate)), + labelText: localization.defaultTaxRate, + initialTaxName: settings.defaultTaxName2, + initialTaxRate: settings.defaultTaxRate2, + ), + if (company.enableThirdInvoiceTaxRate) + TaxRateDropdown( + onSelected: (taxRate) => + viewModel.onSettingsChanged(settings.rebuild((b) => b + ..defaultTaxName3 = taxRate.name + ..defaultTaxRate3 = taxRate.rate)), + labelText: localization.defaultTaxRate, + initialTaxName: settings.defaultTaxName3, + initialTaxRate: settings.defaultTaxRate3, + ), + ], + ), Padding( padding: const EdgeInsets.symmetric(horizontal: 16.0), child: AppButton(