diff --git a/app/controllers/GoogleChartController.php b/app/controllers/GoogleChartController.php index 57f1a49812..4c72298b1c 100644 --- a/app/controllers/GoogleChartController.php +++ b/app/controllers/GoogleChartController.php @@ -231,8 +231,7 @@ class GoogleChartController extends BaseController /** @var \TransactionJournal $journal */ foreach ($journals as $journal) { if ($journal->transactionType->type == 'Withdrawal') { - $amount = floatval($journal->transactions[1]->amount); - $amount = $amount < 0 ? $amount * -1 : $amount; + $amount = $journal->getAmount(); $category = $journal->categories()->first(); if (!is_null($category)) { if (isset($data[$category->name])) { @@ -321,8 +320,7 @@ class GoogleChartController extends BaseController $unpaid['items'][] = $entry->name; $unpaid['amount'] += (($entry->amount_max + $entry->amount_min) / 2); } else { - $amount = floatval($journal->transactions[0]->amount); - $amount = $amount < 0 ? $amount * -1 : $amount; + $amount = $journal->getAmount(); $paid['items'][] = $journal->description; $paid['amount'] += $amount; } diff --git a/app/views/layouts/default.blade.php b/app/views/layouts/default.blade.php index 76b2c54814..b63fc91baf 100644 --- a/app/views/layouts/default.blade.php +++ b/app/views/layouts/default.blade.php @@ -17,6 +17,7 @@ {{HTML::style('assets/stylesheets/metisMenu/metisMenu.min.css')}} {{HTML::style('assets/stylesheets/sbadmin/sb.css')}} {{HTML::style('assets/stylesheets/fa/css/font-awesome.min.css')}} + @yield('styles')