kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Remove dead code.

Browse Source
This commit is contained in:
James Cole
2018-06-23 17:40:41 +02:00
parent a1d99c1954
commit 3a71bd01fb
6 changed files with 2 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Helpers/Collection/BalanceLine.php
View File

@@ -40,10 +40,6 @@ class BalanceLine
*
*/
public const ROLE_TAGROLE = 2;
/**
*
*/
public const ROLE_DIFFROLE = 3;
/** @var Collection */
protected $balanceEntries;
@@ -167,9 +163,6 @@ class BalanceLine
if (self::ROLE_TAGROLE === $this->getRole()) {
return (string)trans('firefly.coveredWithTags');
}
if (self::ROLE_DIFFROLE === $this->getRole()) {
return (string)trans('firefly.leftUnbalanced');
}
return '';
}

27
app/Helpers/Report/PopupReport.php
View File

@@ -36,33 +36,6 @@ use Illuminate\Support\Collection;
*/
class PopupReport implements PopupReportInterface
{
/**
* @param $account
* @param $attributes
*
* @return Collection
*/
public function balanceDifference($account, $attributes): Collection
{
// row that displays difference
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class);
$collector
->setAccounts(new Collection([$account]))
->setTypes([TransactionType::WITHDRAWAL])
->setRange($attributes['startDate'], $attributes['endDate'])
->withoutBudget();
$journals = $collector->getJournals();
return $journals->filter(
function (Transaction $transaction) {
$tags = $transaction->transactionJournal->tags()->where('tagMode', 'balancingAct')->count();
return 0 === $tags;
}
);
}
/**
* @param Budget $budget
* @param Account $account

8
app/Helpers/Report/PopupReportInterface.php
View File

@@ -32,14 +32,6 @@ use Illuminate\Support\Collection;
*/
interface PopupReportInterface
{
/**
* @param $account
* @param $attributes
*
* @return Collection
*/
public function balanceDifference($account, $attributes): Collection;
/**
* @param Budget $budget
* @param Account $account

5
app/Http/Controllers/Popup/ReportController.php
View File

@@ -127,6 +127,7 @@ class ReportController extends Controller
$budget = $this->budgetRepository->findNull((int)$attributes['budgetId']);
$account = $this->accountRepository->findNull((int)$attributes['accountId']);
switch (true) {
case BalanceLine::ROLE_DEFAULTROLE === $role && null !== $budget->id:
// normal row with a budget:
@@ -137,10 +138,6 @@ class ReportController extends Controller
$journals = $this->popupHelper->balanceForNoBudget($account, $attributes);
$budget->name = (string)trans('firefly.no_budget');
break;
case BalanceLine::ROLE_DIFFROLE === $role:
$journals = $this->popupHelper->balanceDifference($account, $attributes);
$budget->name = (string)trans('firefly.leftUnbalanced');
break;
case BalanceLine::ROLE_TAGROLE === $role:
// row with tag info.
throw new FireflyException('Firefly cannot handle this type of info-button (BalanceLine::TagRole)');

2
app/Http/Controllers/Report/BalanceController.php
View File

@@ -56,7 +56,7 @@ class BalanceController extends Controller
$balance = $helper->getBalanceReport($accounts, $start, $end);
$result = view('reports.partials.balance', compact('balance'))->render();
$result = view('reports.partials.balance', compact( 'balance'))->render();
$cache->store($result);
return $result;

1
resources/lang/en_US/firefly.php
View File

@@ -900,7 +900,6 @@ return [
'balanceEnd' => 'Balance at end of period',
'splitByAccount' => 'Split by account',
'coveredWithTags' => 'Covered with tags',
'leftUnbalanced' => 'Left unbalanced',
'leftInBudget' => 'Left in budget',
'sumOfSums' => 'Sum of sums',
'noCategory' => '(no category)',