tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #641 from ridgarou/patch-2

Browse source 
Update knockout.blade.php
This commit is contained in:
Hillel Coren 2016-01-23 21:42:00 +02:00
commit c55d23a071
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
resources/views/invoices/knockout.blade.php
View file

@ -388,12 +388,14 @@ function InvoiceModel(data) {
}
var taxRate = parseFloat(self.tax_rate());
if (taxRate > 0) {
var tax = roundToTwo(total * (taxRate/100));
return self.formatMoney(tax);
} else {
return self.formatMoney(0);
}
//if (taxRate > 0) {
// var tax = roundToTwo(total * (taxRate/100));
// return self.formatMoney(tax);
//} else {
// return self.formatMoney(0);
//}
var tax = roundToTwo(total * (taxRate/100));
return self.formatMoney(tax);
});
self.totals.itemTaxes = ko.computed(function() {
@ -482,9 +484,10 @@ function InvoiceModel(data) {
}
var taxRate = parseFloat(self.tax_rate());
if (taxRate > 0) {
total = NINJA.parseFloat(total) + roundToTwo((total * (taxRate/100)));
}
//if (taxRate > 0) {
// total = NINJA.parseFloat(total) + roundToTwo((total * (taxRate/100)));
//}
total = NINJA.parseFloat(total) + roundToTwo((total * (taxRate/100)));
var taxes = self.totals.itemTaxes();
for (var key in taxes) {