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

Fix for payment terms

This commit is contained in:
Hillel Coren 2020-03-19 17:37:06 +02:00
parent 6ad8491033
commit 5ec22524ae
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/constants.dart
View File

@ -351,6 +351,8 @@ const String kReportGroupYear = 'year';
const String kActivityEmailInvoice = '6'; const String kActivityEmailInvoice = '6';
const int kPaymentTermsOff = -1;
const int kModuleRecurringInvoices = 1; const int kModuleRecurringInvoices = 1;
const int kModuleCredits = 2; const int kModuleCredits = 2;
const int kModuleQuotes = 4; const int kModuleQuotes = 4;

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

@ -1,6 +1,7 @@
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';
import 'package:invoiceninja_flutter/constants.dart';
import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart';
import 'package:invoiceninja_flutter/redux/static/static_selectors.dart'; import 'package:invoiceninja_flutter/redux/static/static_selectors.dart';
import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart'; import 'package:invoiceninja_flutter/ui/app/buttons/elevated_button.dart';
@ -131,8 +132,10 @@ class _CompanyDetailsState extends State<CompanyDetails>
_postalCodeController.text = settings.postalCode; _postalCodeController.text = settings.postalCode;
_taskRateController.text = formatNumber(settings.defaultTaskRate, context, _taskRateController.text = formatNumber(settings.defaultTaskRate, context,
formatNumberType: FormatNumberType.input); formatNumberType: FormatNumberType.input);
_paymentTermsController.text = formatNumber( _paymentTermsController.text =
settings.defaultPaymentTerms?.toDouble(), context, settings.defaultPaymentTerms == kPaymentTermsOff
? ''
: formatNumber(settings.defaultPaymentTerms?.toDouble(), context,
formatNumberType: FormatNumberType.input); formatNumberType: FormatNumberType.input);
_custom1Controller.text = settings.customValue1; _custom1Controller.text = settings.customValue1;
_custom2Controller.text = settings.customValue2; _custom2Controller.text = settings.customValue2;
@ -152,6 +155,7 @@ class _CompanyDetailsState extends State<CompanyDetails>
} }
void _onSettingsChanged() { void _onSettingsChanged() {
final state = widget.viewModel.state;
_debouncer.run(() { _debouncer.run(() {
final settings = widget.viewModel.settings.rebuild((b) => b final settings = widget.viewModel.settings.rebuild((b) => b
..name = _nameController.text.trim() ..name = _nameController.text.trim()
@ -167,8 +171,11 @@ class _CompanyDetailsState extends State<CompanyDetails>
..postalCode = _postalCodeController.text.trim() ..postalCode = _postalCodeController.text.trim()
..defaultTaskRate = ..defaultTaskRate =
parseDouble(_taskRateController.text, zeroIsNull: true) parseDouble(_taskRateController.text, zeroIsNull: true)
..defaultPaymentTerms = ..defaultPaymentTerms = _paymentTermsController.text.isEmpty
parseInt(_paymentTermsController.text, zeroIsNull: true) ? (state.settingsUIState.entityType == EntityType.company
? -1
: null)
: parseInt(_paymentTermsController.text)
..customValue1 = _custom1Controller.text.trim() ..customValue1 = _custom1Controller.text.trim()
..customValue2 = _custom2Controller.text.trim() ..customValue2 = _custom2Controller.text.trim()
..customValue3 = _custom3Controller.text.trim() ..customValue3 = _custom3Controller.text.trim()
@ -452,7 +459,6 @@ class _CompanyDetailsState extends State<CompanyDetails>
settings.rebuild( settings.rebuild(
(b) => b..defaultPaymentTypeId = paymentType?.id)), (b) => b..defaultPaymentTypeId = paymentType?.id)),
allowClearing: true, allowClearing: true,
), ),
DecoratedFormField( DecoratedFormField(
label: localization.paymentTerms, label: localization.paymentTerms,