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

Improve auto-taxes

This commit is contained in:
Hillel Coren 2023-07-20 13:55:26 +03:00
parent a113b642e3
commit dbb87a31e7
1 changed files with 82 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/ui/invoice/edit/invoice_edit_items.dart
View File

@ -1,8 +1,10 @@
// Flutter imports: // Flutter imports:
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:invoiceninja_flutter/constants.dart';
// Project imports: // Project imports:
import 'package:invoiceninja_flutter/data/models/models.dart'; import 'package:invoiceninja_flutter/data/models/models.dart';
import 'package:invoiceninja_flutter/ui/app/forms/app_dropdown_button.dart';
import 'package:invoiceninja_flutter/ui/app/forms/custom_field.dart'; import 'package:invoiceninja_flutter/ui/app/forms/custom_field.dart';
import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart'; import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart';
import 'package:invoiceninja_flutter/ui/app/help_text.dart'; import 'package:invoiceninja_flutter/ui/app/help_text.dart';
@ -118,6 +120,7 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
TaxRateEntity _taxRate1; TaxRateEntity _taxRate1;
TaxRateEntity _taxRate2; TaxRateEntity _taxRate2;
TaxRateEntity _taxRate3; TaxRateEntity _taxRate3;
String _taxCategoryId;
List<TextEditingController> _controllers = []; List<TextEditingController> _controllers = [];
final _debouncer = Debouncer(); final _debouncer = Debouncer();
@ -163,6 +166,7 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
TaxRateEntity(name: invoiceItem.taxName2, rate: invoiceItem.taxRate2); TaxRateEntity(name: invoiceItem.taxName2, rate: invoiceItem.taxRate2);
_taxRate3 = _taxRate3 =
TaxRateEntity(name: invoiceItem.taxName3, rate: invoiceItem.taxRate3); TaxRateEntity(name: invoiceItem.taxName3, rate: invoiceItem.taxRate3);
_taxCategoryId = invoiceItem.taxCategoryId;
super.didChangeDependencies(); super.didChangeDependencies();
} }
@ -195,6 +199,10 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
..customValue3 = _custom3Controller.text.trim() ..customValue3 = _custom3Controller.text.trim()
..customValue4 = _custom4Controller.text.trim()); ..customValue4 = _custom4Controller.text.trim());
if (widget.viewModel.company.calculateTaxes) {
invoiceItem =
invoiceItem.rebuild((b) => b..taxCategoryId = _taxCategoryId);
} else {
if (_taxRate1 != null) { if (_taxRate1 != null) {
invoiceItem = invoiceItem.applyTax(_taxRate1); invoiceItem = invoiceItem.applyTax(_taxRate1);
} }
@ -204,6 +212,7 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
if (_taxRate3 != null) { if (_taxRate3 != null) {
invoiceItem = invoiceItem.applyTax(_taxRate3, isThird: true); invoiceItem = invoiceItem.applyTax(_taxRate3, isThird: true);
} }
}
if (invoiceItem != widget.invoiceItem) { if (invoiceItem != widget.invoiceItem) {
widget.viewModel.onChangedInvoiceItem(invoiceItem, widget.index); widget.viewModel.onChangedInvoiceItem(invoiceItem, widget.index);
@ -307,6 +316,25 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
onSavePressed: widget.entityViewModel.onSavePressed, onSavePressed: widget.entityViewModel.onSavePressed,
) )
: Container(), : Container(),
if (company.calculateTaxes)
AppDropdownButton<String>(
labelText: localization.taxCategory,
value: _taxCategoryId,
onChanged: (dynamic value) {
setState(() {
_taxCategoryId = value;
_onChanged();
});
},
items: kTaxCategories.keys
.map((key) => DropdownMenuItem<String>(
child: Text(localization.lookup(
kTaxCategories[key],
)),
value: key,
))
.toList())
else ...[
if (company.enableFirstItemTaxRate || _taxRate1.name.isNotEmpty) if (company.enableFirstItemTaxRate || _taxRate1.name.isNotEmpty)
TaxRateDropdown( TaxRateDropdown(
onSelected: (taxRate) { onSelected: (taxRate) {
@ -353,6 +381,7 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
initialTaxRate: _taxRate3.rate, initialTaxRate: _taxRate3.rate,
), ),
], ],
],
), ),
), ),
); );