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

Fix for second tax rate

This commit is contained in:
Hillel Coren 2018-12-14 14:14:52 +02:00
parent cbbc812417
commit 516d74b9d8
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/data/models/invoice_model.dart
View File

@ -574,10 +574,18 @@ abstract class InvoiceItemEntity extends Object
return null;
}
InvoiceItemEntity applyTax(TaxRateEntity taxRate) {
InvoiceItemEntity item = rebuild((b) => b
..taxRate1 = taxRate.rate
..taxName1 = taxRate.name);
InvoiceItemEntity applyTax(TaxRateEntity taxRate, {bool isSecond = false}) {
InvoiceItemEntity item;
if (isSecond) {
item = rebuild((b) => b
..taxRate2 = taxRate.rate
..taxName2 = taxRate.name);
} else {
item = rebuild((b) => b
..taxRate1 = taxRate.rate
..taxName1 = taxRate.name);
}
if (taxRate.isInclusive) {
item = item.rebuild(

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

@ -300,7 +300,7 @@ class ItemEditDetailsState extends State<ItemEditDetails> {
? TaxRateDropdown(
taxRates: company.taxRates,
onSelected: (taxRate) => viewModel.onChangedInvoiceItem(
invoiceItem.applyTax(taxRate), widget.index),
invoiceItem.applyTax(taxRate, isSecond: true), widget.index),
labelText: localization.tax,
initialTaxName: invoiceItem.taxName2,
initialTaxRate: invoiceItem.taxRate2,