mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-11-08 10:48:13 +00:00
Make it easier to switch between v1/v2 layout.
This commit is contained in:
@@ -62,7 +62,7 @@ class AccountController extends Controller
|
||||
$accountTasker = app(AccountTaskerInterface::class);
|
||||
$accountReport = $accountTasker->getAccountReport($accounts, $start, $end);
|
||||
try {
|
||||
$result = view('reports.partials.accounts', compact('accountReport'))->render();
|
||||
$result = prefixView('reports.partials.accounts', compact('accountReport'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.accounts: %s', $e->getMessage()));
|
||||
|
||||
@@ -139,7 +139,7 @@ class BalanceController extends Controller
|
||||
|
||||
|
||||
try {
|
||||
$result = view('reports.partials.balance', compact('report'))->render();
|
||||
$result = prefixView('reports.partials.balance', compact('report'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.balance: %s', $e->getMessage()));
|
||||
|
||||
@@ -60,7 +60,7 @@ class BillController extends Controller
|
||||
|
||||
|
||||
try {
|
||||
$result = view('reports.partials.bills', compact('report'))->render();
|
||||
$result = prefixView('reports.partials.bills', compact('report'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.budgets: %s', $e->getMessage()));
|
||||
|
||||
@@ -95,7 +95,7 @@ class BudgetController extends Controller
|
||||
$generator->accountPerBudget();
|
||||
$report = $generator->getReport();
|
||||
|
||||
return view('reports.budget.partials.account-per-budget', compact('report', 'budgets'));
|
||||
return prefixView('reports.budget.partials.account-per-budget', compact('report', 'budgets'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -151,7 +151,7 @@ class BudgetController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
return view('reports.budget.partials.accounts', compact('sums', 'report'));
|
||||
return prefixView('reports.budget.partials.accounts', compact('sums', 'report'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -196,7 +196,7 @@ class BudgetController extends Controller
|
||||
array_multisort($amounts, SORT_ASC, $result);
|
||||
|
||||
try {
|
||||
$result = view('reports.budget.partials.avg-expenses', compact('result'))->render();
|
||||
$result = prefixView('reports.budget.partials.avg-expenses', compact('result'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
|
||||
@@ -271,7 +271,7 @@ class BudgetController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
return view('reports.budget.partials.budgets', compact('sums', 'report'));
|
||||
return prefixView('reports.budget.partials.budgets', compact('sums', 'report'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -296,7 +296,7 @@ class BudgetController extends Controller
|
||||
$generator->general();
|
||||
$report = $generator->getReport();
|
||||
|
||||
return view('reports.partials.budgets', compact('report'))->render();
|
||||
return prefixView('reports.partials.budgets', compact('report'))->render();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -353,7 +353,7 @@ class BudgetController extends Controller
|
||||
}
|
||||
}
|
||||
try {
|
||||
$result = view('reports.partials.budget-period', compact('report', 'periods'))->render();
|
||||
$result = prefixView('reports.partials.budget-period', compact('report', 'periods'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
|
||||
@@ -405,7 +405,7 @@ class BudgetController extends Controller
|
||||
array_multisort($amounts, SORT_ASC, $result);
|
||||
|
||||
try {
|
||||
$result = view('reports.budget.partials.top-expenses', compact('result'))->render();
|
||||
$result = prefixView('reports.budget.partials.top-expenses', compact('result'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
|
||||
|
||||
@@ -165,7 +165,7 @@ class CategoryController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
return view('reports.category.partials.account-per-category', compact('report', 'categories'));
|
||||
return prefixView('reports.category.partials.account-per-category', compact('report', 'categories'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -269,7 +269,7 @@ class CategoryController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
return view('reports.category.partials.accounts', compact('sums', 'report'));
|
||||
return prefixView('reports.category.partials.accounts', compact('sums', 'report'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -314,7 +314,7 @@ class CategoryController extends Controller
|
||||
array_multisort($amounts, SORT_ASC, $result);
|
||||
|
||||
try {
|
||||
$result = view('reports.category.partials.avg-expenses', compact('result'))->render();
|
||||
$result = prefixView('reports.category.partials.avg-expenses', compact('result'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
|
||||
@@ -366,7 +366,7 @@ class CategoryController extends Controller
|
||||
array_multisort($amounts, SORT_DESC, $result);
|
||||
|
||||
try {
|
||||
$result = view('reports.category.partials.avg-income', compact('result'))->render();
|
||||
$result = prefixView('reports.category.partials.avg-income', compact('result'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
|
||||
@@ -481,7 +481,7 @@ class CategoryController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
return view('reports.category.partials.categories', compact('sums', 'report'));
|
||||
return prefixView('reports.category.partials.categories', compact('sums', 'report'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -550,7 +550,7 @@ class CategoryController extends Controller
|
||||
$report = $data;
|
||||
|
||||
try {
|
||||
$result = view('reports.partials.category-period', compact('report', 'periods'))->render();
|
||||
$result = prefixView('reports.partials.category-period', compact('report', 'periods'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
|
||||
@@ -629,7 +629,7 @@ class CategoryController extends Controller
|
||||
$report = $data;
|
||||
|
||||
try {
|
||||
$result = view('reports.partials.category-period', compact('report', 'periods'))->render();
|
||||
$result = prefixView('reports.partials.category-period', compact('report', 'periods'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
|
||||
@@ -674,7 +674,7 @@ class CategoryController extends Controller
|
||||
|
||||
// @codeCoverageIgnoreStart
|
||||
try {
|
||||
$result = view('reports.partials.categories', compact('report'))->render();
|
||||
$result = prefixView('reports.partials.categories', compact('report'))->render();
|
||||
$cache->store($result);
|
||||
} catch (Throwable $e) {
|
||||
Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
|
||||
@@ -726,7 +726,7 @@ class CategoryController extends Controller
|
||||
array_multisort($amounts, SORT_ASC, $result);
|
||||
|
||||
try {
|
||||
$result = view('reports.category.partials.top-expenses', compact('result'))->render();
|
||||
$result = prefixView('reports.category.partials.top-expenses', compact('result'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
|
||||
@@ -776,7 +776,7 @@ class CategoryController extends Controller
|
||||
array_multisort($amounts, SORT_DESC, $result);
|
||||
|
||||
try {
|
||||
$result = view('reports.category.partials.top-income', compact('result'))->render();
|
||||
$result = prefixView('reports.category.partials.top-income', compact('result'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
|
||||
|
||||
@@ -110,7 +110,7 @@ class DoubleController extends Controller
|
||||
array_multisort($amounts, SORT_ASC, $result);
|
||||
|
||||
try {
|
||||
$result = view('reports.double.partials.avg-expenses', compact('result'))->render();
|
||||
$result = prefixView('reports.double.partials.avg-expenses', compact('result'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
|
||||
@@ -162,7 +162,7 @@ class DoubleController extends Controller
|
||||
array_multisort($amounts, SORT_DESC, $result);
|
||||
|
||||
try {
|
||||
$result = view('reports.double.partials.avg-income', compact('result'))->render();
|
||||
$result = prefixView('reports.double.partials.avg-income', compact('result'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
|
||||
@@ -288,7 +288,7 @@ class DoubleController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
return view('reports.double.partials.accounts', compact('sums', 'report'));
|
||||
return prefixView('reports.double.partials.accounts', compact('sums', 'report'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -388,7 +388,7 @@ class DoubleController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
return view('reports.double.partials.accounts-per-asset', compact('sums', 'report'));
|
||||
return prefixView('reports.double.partials.accounts-per-asset', compact('sums', 'report'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -431,7 +431,7 @@ class DoubleController extends Controller
|
||||
array_multisort($amounts, SORT_ASC, $result);
|
||||
|
||||
try {
|
||||
$result = view('reports.double.partials.top-expenses', compact('result'))->render();
|
||||
$result = prefixView('reports.double.partials.top-expenses', compact('result'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
|
||||
@@ -481,7 +481,7 @@ class DoubleController extends Controller
|
||||
array_multisort($amounts, SORT_DESC, $result);
|
||||
|
||||
try {
|
||||
$result = view('reports.double.partials.top-income', compact('result'))->render();
|
||||
$result = prefixView('reports.double.partials.top-income', compact('result'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
|
||||
|
||||
@@ -82,7 +82,7 @@ class OperationsController extends Controller
|
||||
$report = $this->tasker->getExpenseReport($start, $end, $accounts);
|
||||
$type = 'expense-entry';
|
||||
try {
|
||||
$result = view('reports.partials.income-expenses', compact('report', 'type'))->render();
|
||||
$result = prefixView('reports.partials.income-expenses', compact('report', 'type'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.income-expense: %s', $e->getMessage()));
|
||||
@@ -117,7 +117,7 @@ class OperationsController extends Controller
|
||||
$report = $this->tasker->getIncomeReport($start, $end, $accounts);
|
||||
$type = 'income-entry';
|
||||
try {
|
||||
$result = view('reports.partials.income-expenses', compact('report', 'type'))->render();
|
||||
$result = prefixView('reports.partials.income-expenses', compact('report', 'type'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.income-expenses: %s', $e->getMessage()));
|
||||
@@ -172,7 +172,7 @@ class OperationsController extends Controller
|
||||
}
|
||||
|
||||
try {
|
||||
$result = view('reports.partials.operations', compact('sums'))->render();
|
||||
$result = prefixView('reports.partials.operations', compact('sums'))->render();
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.operations: %s', $e->getMessage()));
|
||||
$result = 'Could not render view.';
|
||||
|
||||
@@ -159,7 +159,7 @@ class TagController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
return view('reports.tag.partials.account-per-tag', compact('report', 'tags'));
|
||||
return prefixView('reports.tag.partials.account-per-tag', compact('report', 'tags'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -263,7 +263,7 @@ class TagController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
return view('reports.tag.partials.accounts', compact('sums', 'report'));
|
||||
return prefixView('reports.tag.partials.accounts', compact('sums', 'report'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -308,7 +308,7 @@ class TagController extends Controller
|
||||
array_multisort($amounts, SORT_ASC, $result);
|
||||
|
||||
try {
|
||||
$result = view('reports.tag.partials.avg-expenses', compact('result'))->render();
|
||||
$result = prefixView('reports.tag.partials.avg-expenses', compact('result'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
|
||||
@@ -360,7 +360,7 @@ class TagController extends Controller
|
||||
array_multisort($amounts, SORT_DESC, $result);
|
||||
|
||||
try {
|
||||
$result = view('reports.tag.partials.avg-income', compact('result'))->render();
|
||||
$result = prefixView('reports.tag.partials.avg-income', compact('result'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
|
||||
@@ -475,7 +475,7 @@ class TagController extends Controller
|
||||
}
|
||||
}
|
||||
|
||||
return view('reports.tag.partials.tags', compact('sums', 'report'));
|
||||
return prefixView('reports.tag.partials.tags', compact('sums', 'report'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -518,7 +518,7 @@ class TagController extends Controller
|
||||
array_multisort($amounts, SORT_ASC, $result);
|
||||
|
||||
try {
|
||||
$result = view('reports.tag.partials.top-expenses', compact('result'))->render();
|
||||
$result = prefixView('reports.tag.partials.top-expenses', compact('result'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
|
||||
@@ -568,7 +568,7 @@ class TagController extends Controller
|
||||
array_multisort($amounts, SORT_DESC, $result);
|
||||
|
||||
try {
|
||||
$result = view('reports.tag.partials.top-income', compact('result'))->render();
|
||||
$result = prefixView('reports.tag.partials.top-income', compact('result'))->render();
|
||||
// @codeCoverageIgnoreStart
|
||||
} catch (Throwable $e) {
|
||||
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
|
||||
|
||||
Reference in New Issue
Block a user