From 0ebf08c53d1ed75a97f36061bdf8917a8fac8e17 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 10 Mar 2015 13:15:01 +0200
Subject: [PATCH] Corrected rounding issue if qty or cost had greater than 2
 precision

---
 app/ninja/repositories/InvoiceRepository.php | 4 ++--
 app/views/invoices/edit.blade.php            | 4 ++--
 app/views/users/login.blade.php              | 1 +
 public/built.js                              | 6 +++---
 public/js/script.js                          | 6 +++---
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/ninja/repositories/InvoiceRepository.php b/app/ninja/repositories/InvoiceRepository.php
index 8b78fabc8057..5d6a85790f0c 100755
--- a/app/ninja/repositories/InvoiceRepository.php
+++ b/app/ninja/repositories/InvoiceRepository.php
@@ -264,8 +264,8 @@ class InvoiceRepository
                 continue;
             }
 
-            $invoiceItemCost = Utils::parseFloat($item['cost']);
-            $invoiceItemQty = Utils::parseFloat($item['qty']);
+            $invoiceItemCost = round(Utils::parseFloat($item['cost']), 2);
+            $invoiceItemQty = round(Utils::parseFloat($item['qty']), 2);
             $invoiceItemTaxRate = 0;
 
             if (isset($item['tax_rate']) && Utils::parseFloat($item['tax_rate']) > 0) {
diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index 1847b394ded6..7b5e9f632ea2 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -1517,8 +1517,8 @@
 		this.totals = ko.observable();
 
 		this.totals.rawTotal = ko.computed(function() {
-			var cost = NINJA.parseFloat(self.cost());
-			var qty = NINJA.parseFloat(self.qty());
+			var cost = roundToTwo(NINJA.parseFloat(self.cost()));
+			var qty = roundToTwo(NINJA.parseFloat(self.qty()));
 			var taxRate = NINJA.parseFloat(self.tax_rate());
     	var value = cost * qty;        	
     	if (taxRate > 0) {
diff --git a/app/views/users/login.blade.php b/app/views/users/login.blade.php
index 23e90644107a..085575fd4350 100755
--- a/app/views/users/login.blade.php
+++ b/app/views/users/login.blade.php
@@ -71,6 +71,7 @@
             </p>
 
             <p>{{ Button::success_submit(trans('texts.lets_go'), array('class' => 'btn-lg'))->block() }}</p>
+            
             <p class="link">
                 {{ link_to('forgot_password', trans('texts.forgot_password')) }}
             </p>
diff --git a/public/built.js b/public/built.js
index 27f18e11846c..4d3649814b04 100644
--- a/public/built.js
+++ b/public/built.js
@@ -32436,7 +32436,7 @@ function calculateAmounts(invoice) {
       tax = parseFloat(item.tax_rate);
     }
 
-    var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty);
+    var lineTotal = roundToTwo(NINJA.parseFloat(item.cost)) * roundToTwo(NINJA.parseFloat(item.qty));
     if (tax) {
       lineTotal += roundToTwo(lineTotal * tax / 100);
     }
@@ -32552,7 +32552,7 @@ function displayInvoiceItems(doc, invoice, layout) {
   for (var i=0; i<invoice.invoice_items.length; i++) {
     var item = invoice.invoice_items[i];
     var cost = formatMoney(item.cost, currencyId, true);
-    var qty = NINJA.parseFloat(item.qty) ? NINJA.parseFloat(item.qty) + '' : '';
+    var qty = NINJA.parseFloat(item.qty) ? roundToTwo(NINJA.parseFloat(item.qty)) + '' : '';
     var notes = item.notes;
     var productKey = item.product_key;
     var tax = 0;
@@ -32593,7 +32593,7 @@ function displayInvoiceItems(doc, invoice, layout) {
       productKey = processVariables(productKey);
     }
 
-    var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty);
+    var lineTotal = roundToTwo(NINJA.parseFloat(item.cost)) * roundToTwo(NINJA.parseFloat(item.qty));
     if (tax) {
       lineTotal += lineTotal * tax / 100;
     }
diff --git a/public/js/script.js b/public/js/script.js
index 4a0fa58842b1..9c930d82300c 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -913,7 +913,7 @@ function calculateAmounts(invoice) {
       tax = parseFloat(item.tax_rate);
     }
 
-    var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty);
+    var lineTotal = roundToTwo(NINJA.parseFloat(item.cost)) * roundToTwo(NINJA.parseFloat(item.qty));
     if (tax) {
       lineTotal += roundToTwo(lineTotal * tax / 100);
     }
@@ -1029,7 +1029,7 @@ function displayInvoiceItems(doc, invoice, layout) {
   for (var i=0; i<invoice.invoice_items.length; i++) {
     var item = invoice.invoice_items[i];
     var cost = formatMoney(item.cost, currencyId, true);
-    var qty = NINJA.parseFloat(item.qty) ? NINJA.parseFloat(item.qty) + '' : '';
+    var qty = NINJA.parseFloat(item.qty) ? roundToTwo(NINJA.parseFloat(item.qty)) + '' : '';
     var notes = item.notes;
     var productKey = item.product_key;
     var tax = 0;
@@ -1070,7 +1070,7 @@ function displayInvoiceItems(doc, invoice, layout) {
       productKey = processVariables(productKey);
     }
 
-    var lineTotal = NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty);
+    var lineTotal = roundToTwo(NINJA.parseFloat(item.cost)) * roundToTwo(NINJA.parseFloat(item.qty));
     if (tax) {
       lineTotal += lineTotal * tax / 100;
     }