From e7562ec21bd13e7e07ca13d30c99c0e4f15b6555 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 4 May 2023 10:13:23 +0300 Subject: [PATCH] Change setting order --- lib/ui/settings/generated_numbers.dart | 49 +++++++++++++------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/lib/ui/settings/generated_numbers.dart b/lib/ui/settings/generated_numbers.dart index 1f8123b1f..c9978ae97 100644 --- a/lib/ui/settings/generated_numbers.dart +++ b/lib/ui/settings/generated_numbers.dart @@ -285,30 +285,6 @@ class _GeneratedNumbersState extends State ), ], ), - if (company.isModuleEnabled(EntityType.recurringInvoice)) - DecoratedFormField( - label: localization.recurringPrefix, - controller: _recurringPrefixController, - keyboardType: TextInputType.text, - ), - if (company.isModuleEnabled(EntityType.quote)) - BoolDropdownButton( - iconData: Icons.content_copy, - label: localization.sharedInvoiceQuoteCounter, - value: settings.sharedInvoiceQuoteCounter, - onChanged: (value) => viewModel.onSettingsChanged( - settings.rebuild( - (b) => b..sharedInvoiceQuoteCounter = value)), - ), - if (company.isModuleEnabled(EntityType.credit)) - BoolDropdownButton( - iconData: Icons.content_copy, - label: localization.sharedInvoiceCreditCounter, - value: settings.sharedInvoiceCreditCounter, - onChanged: (value) => viewModel.onSettingsChanged( - settings.rebuild( - (b) => b..sharedInvoiceCreditCounter = value)), - ), AppDropdownButton( labelText: localization.resetCounter, value: settings.resetCounterFrequencyId, @@ -341,6 +317,31 @@ class _GeneratedNumbersState extends State onSelected: (value, _) => viewModel.onSettingsChanged( settings.rebuild((b) => b..resetCounterDate = value)), ), + if (company.isModuleEnabled(EntityType.recurringInvoice)) + DecoratedFormField( + label: localization.recurringPrefix, + controller: _recurringPrefixController, + keyboardType: TextInputType.text, + ), + SizedBox(height: 20), + if (company.isModuleEnabled(EntityType.quote)) + BoolDropdownButton( + iconData: Icons.content_copy, + label: localization.sharedInvoiceQuoteCounter, + value: settings.sharedInvoiceQuoteCounter, + onChanged: (value) => viewModel.onSettingsChanged( + settings.rebuild( + (b) => b..sharedInvoiceQuoteCounter = value)), + ), + if (company.isModuleEnabled(EntityType.credit)) + BoolDropdownButton( + iconData: Icons.content_copy, + label: localization.sharedInvoiceCreditCounter, + value: settings.sharedInvoiceCreditCounter, + onChanged: (value) => viewModel.onSettingsChanged( + settings.rebuild( + (b) => b..sharedInvoiceCreditCounter = value)), + ), ], ), ],