Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug Fixes

Browse Source
This commit is contained in:
David Bomba 2016-02-17 14:43:25 +11:00
commit 9428557e70
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ClientApiController.php
View File

@ -136,12 +136,12 @@ class ClientApiController extends BaseAPIController
{ {
if ($request->action == ACTION_ARCHIVE) { if ($request->action == ACTION_ARCHIVE) {
$client = Client::scope($publicId)->withTrashed()->first(); $client = Client::scope($publicId)->withTrashed()->first();
if(!$client) if(!$client)
return $this->errorResponse(['message'=>'Client not found.']); return $this->errorResponse(['message'=>'Client not found.']);
$this->clientRepo->archive($client); $this->clientRepo->archive($client);
$transformer = new ClientTransformer(Auth::user()->account, Input::get('serializer')); $transformer = new ClientTransformer(Auth::user()->account, Input::get('serializer'));

2
app/Http/routes.php
View File

@ -510,7 +510,7 @@ if (!defined('CONTACT_EMAIL')) {
define('NINJA_GATEWAY_CONFIG', 'NINJA_GATEWAY_CONFIG'); define('NINJA_GATEWAY_CONFIG', 'NINJA_GATEWAY_CONFIG');
define('NINJA_WEB_URL', 'https://www.invoiceninja.com'); define('NINJA_WEB_URL', 'https://www.invoiceninja.com');
define('NINJA_APP_URL', 'https://app.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('NINJA_DATE', '2000-01-01');
define('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja'); define('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja');

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

@ -787,14 +787,7 @@ function ItemModel(data) {
this.totals.total = ko.computed(function() { this.totals.total = ko.computed(function() {
var total = self.totals.rawTotal(); var total = self.totals.rawTotal();
return total ? model.invoice().formatMoney(total) : ''; return window.hasOwnProperty('model') && 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) : '';
}
*/
}); });
this.hideActions = function() { this.hideActions = function() {