diff --git a/app/Helpers/Collection/BalanceLine.php b/app/Helpers/Collection/BalanceLine.php index a998b4784e..9d62a4aa21 100644 --- a/app/Helpers/Collection/BalanceLine.php +++ b/app/Helpers/Collection/BalanceLine.php @@ -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 ''; } diff --git a/app/Helpers/Report/PopupReport.php b/app/Helpers/Report/PopupReport.php index 73e786e24b..24c1bd2d9e 100644 --- a/app/Helpers/Report/PopupReport.php +++ b/app/Helpers/Report/PopupReport.php @@ -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 diff --git a/app/Helpers/Report/PopupReportInterface.php b/app/Helpers/Report/PopupReportInterface.php index 69efef80e6..6345afdcc3 100644 --- a/app/Helpers/Report/PopupReportInterface.php +++ b/app/Helpers/Report/PopupReportInterface.php @@ -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 diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index ed57022b60..0f30b1c9d7 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -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)'); diff --git a/app/Http/Controllers/Report/BalanceController.php b/app/Http/Controllers/Report/BalanceController.php index 3b31be87de..2945a15b13 100644 --- a/app/Http/Controllers/Report/BalanceController.php +++ b/app/Http/Controllers/Report/BalanceController.php @@ -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; diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index e3513773a9..48ad084831 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -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)',