From aad648b901e61291200d978477280374676e4de8 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 16 Feb 2016 23:56:59 +0200 Subject: [PATCH 1/2] Fix for 'model not defined' error --- resources/views/invoices/knockout.blade.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/resources/views/invoices/knockout.blade.php b/resources/views/invoices/knockout.blade.php index 7edc741cf81a..1f1d210b8716 100644 --- a/resources/views/invoices/knockout.blade.php +++ b/resources/views/invoices/knockout.blade.php @@ -787,14 +787,7 @@ function ItemModel(data) { this.totals.total = ko.computed(function() { var total = self.totals.rawTotal(); - return total ? model.invoice().formatMoney(total) : ''; - /* - if (window.hasOwnProperty('model') && model.invoice && model.invoice() && model.invoice().client()) { - return total ? model.invoice().formatMoney(total) : ''; - } else { - return total ? model.invoice().formatMoney(total, 1) : ''; - } - */ + return window.hasOwnProperty('model') && total ? model.invoice().formatMoney(total) : ''; }); this.hideActions = function() { From c9f58ce2d3dbc8b05d9fbc99dd7e4c062671ffef Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 16 Feb 2016 23:59:24 +0200 Subject: [PATCH 2/2] Bumped version number to 2.5.0.2 --- app/Http/routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/routes.php b/app/Http/routes.php index 9001c18e6256..04a34b268726 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -509,7 +509,7 @@ if (!defined('CONTACT_EMAIL')) { define('NINJA_GATEWAY_CONFIG', 'NINJA_GATEWAY_CONFIG'); define('NINJA_WEB_URL', 'https://www.invoiceninja.com'); define('NINJA_APP_URL', 'https://app.invoiceninja.com'); - define('NINJA_VERSION', '2.5.0.1'); + define('NINJA_VERSION', '2.5.0.2'); define('NINJA_DATE', '2000-01-01'); define('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja');