kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-24 22:48:18 +00:00
Code Issues Projects Releases Wiki Activity

Reformatted and checked everything. [skip ci]

Browse Source
This commit is contained in:
James Cole
2014-07-25 13:02:01 +02:00
parent bcd48f2e49
commit 30d5b88769
45 changed files with 980 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/lib/Firefly/Helper/Toolkit/Toolkit.php
View File

@@ -2,6 +2,8 @@
namespace Firefly\Helper\Toolkit;
use Carbon\Carbon;
/**
* Class Toolkit
*
@@ -37,10 +39,10 @@ class Toolkit implements ToolkitInterface
}
// switch $range, update range or something:
$start = \Session::has('start') ? \Session::get('start') : new \Carbon\Carbon();
$end = \Session::has('end') ? \Session::get('end') : new \Carbon\Carbon();
$today = new \Carbon\Carbon;
\Log::debug('Start: ' . $start.' ('.\Session::has('start').')');
$start = \Session::has('start') ? \Session::get('start') : new Carbon;
$end = \Session::has('end') ? \Session::get('end') : new Carbon;
$today = new Carbon;
\Log::debug('Start: ' . $start . ' (' . \Session::has('start') . ')');
\Log::debug('End: ' . $end);
// see if we have to do a prev / next thing:
@@ -58,8 +60,8 @@ class Toolkit implements ToolkitInterface
case 'custom':
// when range is custom AND input, we ignore $today
if (\Input::get('start') && \Input::get('end')) {
$start = new \Carbon\Carbon(\Input::get('start'));
$end = new \Carbon\Carbon(\Input::get('end'));
$start = new Carbon(\Input::get('start'));
$end = new Carbon(\Input::get('end'));
} else {
$start = \Session::get('start');
$end = \Session::get('end');
@@ -147,11 +149,14 @@ class Toolkit implements ToolkitInterface
return \Redirect::route('index');
}
return;
return null;
}
/**
* @return array
*/
public function getDateRangeDates()
{
return [\Session::get('start'), \Session::get('end')];