Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for discount rounding

Browse Source
This commit is contained in:
Hillel Coren 2017-08-18 13:26:14 +03:00
parent f2ea4a1669
commit 032efd5c22
4 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
public/built.js
View File

File diff suppressed because one or more lines are too long

2
public/built.js.map
View File

File diff suppressed because one or more lines are too long

4
resources/assets/js/script.js
View File

@ -714,7 +714,7 @@ function calculateAmounts(invoice) {
if (parseInt(invoice.is_amount_discount)) { if (parseInt(invoice.is_amount_discount)) {
lineTotal -= roundToTwo((lineTotal/total) * invoice.discount); lineTotal -= roundToTwo((lineTotal/total) * invoice.discount);
} else { } else {
lineTotal -= roundToTwo(lineTotal * (invoice.discount/100)); lineTotal -= roundToTwo(lineTotal * invoice.discount / 100);
} }
} }
@ -749,7 +749,7 @@ function calculateAmounts(invoice) {
if (parseInt(invoice.is_amount_discount)) { if (parseInt(invoice.is_amount_discount)) {
discount = roundToTwo(invoice.discount); discount = roundToTwo(invoice.discount);
} else { } else {
discount = roundToTwo(total * (invoice.discount/100)); discount = roundToTwo(total * invoice.discount / 100);
} }
total -= discount; total -= discount;
} }

14
resources/views/invoices/knockout.blade.php
View File

@ -383,7 +383,7 @@ function InvoiceModel(data) {
if (parseInt(self.is_amount_discount())) { if (parseInt(self.is_amount_discount())) {
return roundToTwo(self.discount()); return roundToTwo(self.discount());
} else { } else {
return roundToTwo(self.totals.rawSubtotal() * (self.discount()/100)); return roundToTwo(self.totals.rawSubtotal() * self.discount() / 100);
} }
}); });
@ -427,7 +427,7 @@ function InvoiceModel(data) {
if (parseInt(self.is_amount_discount())) { if (parseInt(self.is_amount_discount())) {
lineTotal -= roundToTwo((lineTotal/total) * self.discount()); lineTotal -= roundToTwo((lineTotal/total) * self.discount());
} else { } else {
lineTotal -= roundToTwo(lineTotal * (self.discount()/100)); lineTotal -= roundToTwo(lineTotal * self.discount() / 100);
} }
} }
@ -822,7 +822,7 @@ function ItemModel(data) {
this.prettyQty = ko.computed({ this.prettyQty = ko.computed({
read: function () { read: function () {
return NINJA.parseFloat(this.qty()) ? roundSignificant(NINJA.parseFloat(this.qty())) : ''; return NINJA.parseFloat(this.qty()) ? NINJA.parseFloat(this.qty()) : '';
}, },
write: function (value) { write: function (value) {
this.qty(value); this.qty(value);
@ -832,7 +832,7 @@ function ItemModel(data) {
this.prettyCost = ko.computed({ this.prettyCost = ko.computed({
read: function () { read: function () {
return this.cost() ? roundSignificant(this.cost()).toFixed(2) : ''; return this.cost() ? this.cost() : '';
}, },
write: function (value) { write: function (value) {
this.cost(value); this.cost(value);
@ -842,6 +842,12 @@ function ItemModel(data) {
if (data) { if (data) {
ko.mapping.fromJS(data, {}, this); ko.mapping.fromJS(data, {}, this);
var precision = getPrecision(this.cost());
var cost = parseFloat(this.cost());
if (cost) {
this.cost(cost.toFixed(Math.max(2, precision)));
}
this.qty(roundSignificant(this.qty()));
} }
this.totals = ko.observable(); this.totals = ko.observable();