kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-20 08:30:06 +00:00
Code Issues Projects Releases Wiki Activity

Fix #1300

Browse Source
This commit is contained in:
James Cole
2018-03-27 19:29:58 +02:00
parent c86b207b1c
commit 720dcb0fe5
16 changed files with 53 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/Http/Controllers/TransactionController.php
View File

@@ -113,37 +113,6 @@ class TransactionController extends Controller
$transactions->setPath($path);
return view('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'transactions', 'periods', 'start', 'end'));
//
// // prep for "all" view.
// if ('all' === $moment) {
// $subTitle = trans('firefly.all_' . $what);
// $first = $this->repository->first();
// $start = $first->date ?? new Carbon;
// $end = new Carbon;
// $path = route('transactions.index', [$what, 'all']);
// }
//
// // prep for "specific date" view.
// if (strlen($moment) > 0 && 'all' !== $moment) {
// $start = new Carbon($moment);
// $end = app('navigation')->endOfPeriod($start, $range);
// $path = route('transactions.index', [$what, $moment]);
//
// }
// // prep for current period
// if (0 === strlen($moment)) {
// $start = clone session('start', app('navigation')->startOfPeriod(new Carbon, $range));
// $end = clone session('end', app('navigation')->endOfPeriod(new Carbon, $range));
// $subTitle = trans(
// 'firefly.title_' . $what . '_between',
// ['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
// );
// }
}
/**
@@ -265,13 +234,16 @@ class TransactionController extends Controller
/**
* @param string $what
*
* @param Carbon $date
*
* @return Collection
*/
private function getPeriodOverview(string $what, Carbon $date): Collection
{
$range = Preferences::get('viewRange', '1M')->data;
$first = $this->repository->first();
$start = (new Carbon)->subYear();
$start = new Carbon;
$start->subYear();
$types = config('firefly.transactionTypesByWhat.' . $what);
$entries = new Collection;
if (null !== $first) {
@@ -280,6 +252,7 @@ class TransactionController extends Controller
if ($date < $start) {
list($start, $date) = [$date, $start]; // @codeCoverageIgnore
}
/** @var array $dates */
$dates = app('navigation')->blockPeriods($start, $date, $range);