IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactor method to original name #524

Browse Source
This commit is contained in:
James Cole 2017-01-05 08:47:09 +01:00
parent 57f63ba752
commit 452c14bece
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -346,7 +346,7 @@ class CategoryController extends Controller
$end = Navigation::startOfPeriod($end, $range);
$currentEnd = Navigation::endOfPeriod($end, $range);
$spent = $repository->spentInPeriodCollector(new Collection([$category]), $accounts, $end, $currentEnd);
$earned = $repository->earnedInPeriodCollector(new Collection([$category]), $accounts, $end, $currentEnd);
$earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $end, $currentEnd);
$dateStr = $end->format('Y-m-d');
$dateName = Navigation::periodShow($end, $range);
$entries->push([$dateStr, $dateName, $spent, $earned]);

4
app/Http/Controllers/Chart/CategoryController.php
View File

@ -91,7 +91,7 @@ class CategoryController extends Controller
while ($start <= $end) {
$currentEnd = Navigation::endOfPeriod($start, $range);
$spent = $repository->spentInPeriodCollector(new Collection([$category]), $accounts, $start, $currentEnd);
$earned = $repository->earnedInPeriodCollector(new Collection([$category]), $accounts, $start, $currentEnd);
$earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $start, $currentEnd);
$label = Navigation::periodShow($start, $range);
$chartData[0]['entries'][$label] = bcmul($spent, '-1');
$chartData[1]['entries'][$label] = $earned;
@ -316,7 +316,7 @@ class CategoryController extends Controller
while ($start <= $end) {
$spent = $repository->spentInPeriodCollector(new Collection([$category]), $accounts, $start, $start);
$earned = $repository->earnedInPeriodCollector(new Collection([$category]), $accounts, $start, $start);
$earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $start, $start);
$label = Navigation::periodShow($start, '1D');
$chartData[0]['entries'][$label] = bcmul($spent, '-1');

2
app/Repositories/Category/CategoryRepository.php
View File

@ -64,7 +64,7 @@ class CategoryRepository implements CategoryRepositoryInterface
*
* @return string
*/
public function earnedInPeriodCollector(Collection $categories, Collection $accounts, Carbon $start, Carbon $end): string
public function earnedInPeriod(Collection $categories, Collection $accounts, Carbon $start, Carbon $end): string
{
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class, [$this->user]);

2
app/Repositories/Category/CategoryRepositoryInterface.php
View File

@ -39,7 +39,7 @@ interface CategoryRepositoryInterface
*
* @return string
*/
public function earnedInPeriodCollector(Collection $categories, Collection $accounts, Carbon $start, Carbon $end): string;
public function earnedInPeriod(Collection $categories, Collection $accounts, Carbon $start, Carbon $end): string;
/**
* Find a category