IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-11 16:05:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #65 from vbali/master

Browse Source 
Fixes for chart and account creation
This commit is contained in:
James Cole 2015-04-04 06:50:30 +02:00
commit 0c02a08954
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/CategoryController.php
View File

@ -185,17 +185,11 @@ class CategoryController extends Controller
return Redirect::route('categories.create')->withInput();
}
<<<<<<< HEAD
if (intval(Input::get('create_another')) === 1) {
return Redirect::route('categories.create');
}
return Redirect::route('categories.index');
=======
// redirect to previous URL.
return Redirect::to(Session::get('categories.create.url'));
>>>>>>> release/3.3.6
}

6
app/Http/Controllers/GoogleChartController.php
View File

@ -46,8 +46,9 @@ class GoogleChartController extends Controller
*/
public function accountBalanceChart(Account $account, GChart $chart)
{
$accountName = iconv('UTF-8', 'ASCII//TRANSLIT', $account->name);
$chart->addColumn('Day of month', 'date');
$chart->addColumn('Balance for ' . $account->name, 'number');
$chart->addColumn('Balance for ' . $accountName, 'number');
$chart->addCertainty(1);
$start = Session::get('start', Carbon::now()->startOfMonth());
@ -88,7 +89,8 @@ class GoogleChartController extends Controller
$index = 1;
/** @var Account $account */
foreach ($accounts as $account) {
$chart->addColumn('Balance for ' . $account->name, 'number');
$accountName = iconv('UTF-8', 'ASCII//TRANSLIT', $account->name);
$chart->addColumn('Balance for ' . $accountName, 'number');
$chart->addCertainty($index);
$index++;
}

1
app/Models/Account.php
View File

@ -54,6 +54,7 @@ class Account extends Model
App::abort(500, 'Could not create new account with data: ' . json_encode($fields));
}
return $account;
}