Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Null safetyc

This commit is contained in:
Hillel Coren 2023-09-26 12:10:40 +03:00
parent cdfcffec0d
commit 50f89cba99
2 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ui/app/forms/bool_dropdown_button.dart
View File

@ -77,7 +77,7 @@ class BoolDropdownButton extends StatelessWidget {
child: Text(trueLabel), child: Text(trueLabel),
value: true, value: true,
), ),
].toList() as List<DropdownMenuItem<bool>>?, ],
), ),
) )
: Padding( : Padding(

79
lib/ui/settings/company_details.dart
View File

@ -140,31 +140,33 @@ class _CompanyDetailsState extends State<CompanyDetails>
final viewModel = widget.viewModel; final viewModel = widget.viewModel;
final settings = viewModel.settings; final settings = viewModel.settings;
_nameController.text = settings.name!; _nameController.text = settings.name ?? '';
_idNumberController.text = settings.idNumber!; _idNumberController.text = settings.idNumber ?? '';
_vatNumberController.text = settings.vatNumber!; _vatNumberController.text = settings.vatNumber ?? '';
_emailController.text = settings.email!; _emailController.text = settings.email ?? '';
_websiteController.text = settings.website!; _websiteController.text = settings.website ?? '';
_phoneController.text = settings.phone!; _phoneController.text = settings.phone ?? '';
_address1Controller.text = settings.address1!; _address1Controller.text = settings.address1 ?? '';
_address2Controller.text = settings.address2!; _address2Controller.text = settings.address2 ?? '';
_cityController.text = settings.city!; _cityController.text = settings.city ?? '';
_stateController.text = settings.state!; _stateController.text = settings.state ?? '';
_postalCodeController.text = settings.postalCode!; _postalCodeController.text = settings.postalCode ?? '';
_custom1Controller.text = settings.customValue1!; _custom1Controller.text = settings.customValue1 ?? '';
_custom2Controller.text = settings.customValue2!; _custom2Controller.text = settings.customValue2 ?? '';
_custom3Controller.text = settings.customValue3!; _custom3Controller.text = settings.customValue3 ?? '';
_custom4Controller.text = settings.customValue4!; _custom4Controller.text = settings.customValue4 ?? '';
_invoiceTermsController.text = settings.defaultInvoiceTerms!; _invoiceTermsController.text = settings.defaultInvoiceTerms ?? '';
_invoiceFooterController.text = settings.defaultInvoiceFooter!; _invoiceFooterController.text = settings.defaultInvoiceFooter ?? '';
_quoteTermsController.text = settings.defaultQuoteTerms!; _quoteTermsController.text = settings.defaultQuoteTerms ?? '';
_quoteFooterController.text = settings.defaultQuoteFooter!; _quoteFooterController.text = settings.defaultQuoteFooter ?? '';
_creditFooterController.text = settings.defaultCreditFooter!; _creditFooterController.text = settings.defaultCreditFooter ?? '';
_creditTermsController.text = settings.defaultCreditTerms!; _creditTermsController.text = settings.defaultCreditTerms ?? '';
_purchaseOrderFooterController.text = settings.defaultPurchaseOrderFooter!; _purchaseOrderFooterController.text =
_purchaseOrderTermsController.text = settings.defaultPurchaseOrderTerms!; settings.defaultPurchaseOrderFooter ?? '';
_qrIbanController.text = settings.qrIban!; _purchaseOrderTermsController.text =
_besrIdController.text = settings.besrId!; settings.defaultPurchaseOrderTerms ?? '';
_qrIbanController.text = settings.qrIban ?? '';
_besrIdController.text = settings.besrId ?? '';
_controllers.forEach( _controllers.forEach(
(dynamic controller) => controller.addListener(_onSettingsChanged)); (dynamic controller) => controller.addListener(_onSettingsChanged));
@ -692,19 +694,20 @@ class _CompanyDetailsState extends State<CompanyDetails>
b..defaultPurchaseOrderDesignId = value.id)), b..defaultPurchaseOrderDesignId = value.id)),
), ),
]), ]),
FormCard( if (!state.settingsUIState.isFiltered)
crossAxisAlignment: CrossAxisAlignment.stretch, FormCard(
children: <Widget>[ crossAxisAlignment: CrossAxisAlignment.stretch,
BoolDropdownButton( children: <Widget>[
value: company.useQuoteTermsOnConversion, BoolDropdownButton(
onChanged: (value) => viewModel.onCompanyChanged( value: company.useQuoteTermsOnConversion,
company.rebuild( onChanged: (value) => viewModel.onCompanyChanged(
(b) => b..useQuoteTermsOnConversion = value)), company.rebuild(
label: localization.useQuoteTerms, (b) => b..useQuoteTermsOnConversion = value)),
helpLabel: localization.useQuoteTermsHelp, label: localization.useQuoteTerms,
iconData: getEntityIcon(EntityType.quote), helpLabel: localization.useQuoteTermsHelp,
), iconData: getEntityIcon(EntityType.quote),
]), ),
]),
FormCard( FormCard(
isLast: true, isLast: true,
children: <Widget>[ children: <Widget>[