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

Remove reference to a method no longer used.

Browse Source
This commit is contained in:
James Cole 2022-01-29 14:11:12 +01:00
parent acb2a8697a
commit 003d8ba02a
No known key found for this signature in database
GPG Key ID: BDE6667570EADBD5
104 changed files with 219 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Generator/Report/Account/MonthReportGenerator.php
View File

@ -52,7 +52,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
$reportType = 'account';
$preferredPeriod = $this->preferredPeriod();
try {
$result = prefixView('reports.double.report', compact('accountIds', 'reportType', 'doubleIds', 'preferredPeriod'))
$result = view('reports.double.report', compact('accountIds', 'reportType', 'doubleIds', 'preferredPeriod'))
->with('start', $this->start)->with('end', $this->end)
->with('doubles', $this->expense)
->render();

2
app/Generator/Report/Audit/MonthReportGenerator.php
View File

@ -78,7 +78,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
'due_date', 'payment_date', 'invoice_date',
];
try {
$result = prefixView('reports.audit.report', compact('reportType', 'accountIds', 'auditData', 'hideable', 'defaultShow'))
$result = view('reports.audit.report', compact('reportType', 'accountIds', 'auditData', 'hideable', 'defaultShow'))
->with('start', $this->start)->with('end', $this->end)->with('accounts', $this->accounts)
->render();
} catch (Throwable $e) { // @phpstan-ignore-line

2
app/Generator/Report/Budget/MonthReportGenerator.php
View File

@ -64,7 +64,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
$accountIds = implode(',', $this->accounts->pluck('id')->toArray());
$budgetIds = implode(',', $this->budgets->pluck('id')->toArray());
try {
$result = prefixView(
$result = view(
'reports.budget.month',
compact('accountIds', 'budgetIds')
)

2
app/Generator/Report/Category/MonthReportGenerator.php
View File

@ -76,7 +76,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
// render!
try {
return prefixView('reports.category.month', compact('accountIds', 'categoryIds', 'reportType'))
return view('reports.category.month', compact('accountIds', 'categoryIds', 'reportType'))
->with('start', $this->start)->with('end', $this->end)
->with('categories', $this->categories)
->with('accounts', $this->accounts)

2
app/Generator/Report/Standard/MonthReportGenerator.php
View File

@ -53,7 +53,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
$reportType = 'default';
try {
return prefixView('reports.default.month', compact('accountIds', 'reportType'))->with('start', $this->start)->with('end', $this->end)->render();
return view('reports.default.month', compact('accountIds', 'reportType'))->with('start', $this->start)->with('end', $this->end)->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Cannot render reports.default.month: %s', $e->getMessage()));
$result = 'Could not render report view.';

2
app/Generator/Report/Standard/MultiYearReportGenerator.php
View File

@ -54,7 +54,7 @@ class MultiYearReportGenerator implements ReportGeneratorInterface
$reportType = 'default';
try {
return prefixView(
return view(
'reports.default.multi-year',
compact('accountIds', 'reportType')
)->with('start', $this->start)->with('end', $this->end)->render();

2
app/Generator/Report/Standard/YearReportGenerator.php
View File

@ -54,7 +54,7 @@ class YearReportGenerator implements ReportGeneratorInterface
$reportType = 'default';
try {
$result = prefixView(
$result = view(
'reports.default.year',
compact('accountIds', 'reportType')
)->with('start', $this->start)->with('end', $this->end)->render();

2
app/Generator/Report/Tag/MonthReportGenerator.php
View File

@ -75,7 +75,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
// render!
try {
$result = prefixView(
$result = view(
'reports.tag.month',
compact('accountIds', 'reportType', 'tagIds')
)->with('start', $this->start)->with('end', $this->end)->with('tags', $this->tags)->with('accounts', $this->accounts)->render();

2
app/Http/Controllers/Account/CreateController.php
View File

@ -124,7 +124,7 @@ class CreateController extends Controller
$request->session()->forget('accounts.create.fromStore');
Log::channel('audit')->info('Creating new account.');
return prefixView(
return view(
'accounts.create',
compact('subTitleIcon', 'liabilityDirections', 'locations', 'objectType', 'interestPeriods', 'subTitle', 'roles', 'liabilityTypes')
);

2
app/Http/Controllers/Account/DeleteController.php
View File

@ -84,7 +84,7 @@ class DeleteController extends Controller
// put previous url in session
$this->rememberPreviousUri('accounts.delete.uri');
return prefixView('accounts.delete', compact('account', 'subTitle', 'accountList', 'objectType'));
return view('accounts.delete', compact('account', 'subTitle', 'accountList', 'objectType'));
}
/**

2
app/Http/Controllers/Account/EditController.php
View File

@ -159,7 +159,7 @@ class EditController extends Controller
$request->session()->flash('preFilled', $preFilled);
return prefixView(
return view(
'accounts.edit',
compact(
'account',

4
app/Http/Controllers/Account/IndexController.php
View File

@ -117,7 +117,7 @@ class IndexController extends Controller
$accounts = new LengthAwarePaginator($accounts, $total, $pageSize, $page);
$accounts->setPath(route('accounts.inactive.index', [$objectType]));
return prefixView('accounts.index', compact('objectType', 'inactivePage', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
return view('accounts.index', compact('objectType', 'inactivePage', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
}
@ -188,6 +188,6 @@ class IndexController extends Controller
Log::debug(sprintf('Count of accounts after LAP (1): %d', $accounts->count()));
Log::debug(sprintf('Count of accounts after LAP (2): %d', $accounts->getCollection()->count()));
return prefixView('accounts.index', compact('objectType', 'inactiveCount', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
return view('accounts.index', compact('objectType', 'inactiveCount', 'subTitleIcon', 'subTitle', 'page', 'accounts'));
}
}

2
app/Http/Controllers/Account/ReconcileController.php
View File

@ -136,7 +136,7 @@ class ReconcileController extends Controller
$indexUri = route('accounts.reconcile', [$account->id, '%start%', '%end%']);
$objectType = 'asset';
return prefixView(
return view(
'accounts.reconcile.index',
compact(
'account',

4
app/Http/Controllers/Account/ShowController.php
View File

@ -135,7 +135,7 @@ class ShowController extends Controller
$showAll = false;
$balance = app('steam')->balance($account, $end);
return prefixView(
return view(
'accounts.show',
compact(
'account',
@ -194,7 +194,7 @@ class ShowController extends Controller
$showAll = true;
$balance = app('steam')->balance($account, $end);
return prefixView(
return view(
'accounts.show',
compact(
'account',

2
app/Http/Controllers/Admin/ConfigurationController.php
View File

@ -75,7 +75,7 @@ class ConfigurationController extends Controller
$isDemoSite = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
$siteOwner = config('firefly.site_owner');
return prefixView(
return view(
'admin.configuration.index',
compact('subTitle', 'subTitleIcon', 'singleUserMode', 'isDemoSite', 'siteOwner')
);

2
app/Http/Controllers/Admin/HomeController.php
View File

@ -68,7 +68,7 @@ class HomeController extends Controller
}
Log::debug('Email is ', [$email]);
return prefixView('admin.index', compact('title', 'mainTitleIcon', 'email'));
return view('admin.index', compact('title', 'mainTitleIcon', 'email'));
}
/**

10
app/Http/Controllers/Admin/LinkController.php
View File

@ -79,7 +79,7 @@ class LinkController extends Controller
$this->rememberPreviousUri('link-types.create.uri');
}
return prefixView('admin.link.create', compact('subTitle', 'subTitleIcon'));
return view('admin.link.create', compact('subTitle', 'subTitleIcon'));
}
/**
@ -115,7 +115,7 @@ class LinkController extends Controller
// put previous url in session
$this->rememberPreviousUri('link-types.delete.uri');
return prefixView('admin.link.delete', compact('linkType', 'subTitle', 'moveTo', 'count'));
return view('admin.link.delete', compact('linkType', 'subTitle', 'moveTo', 'count'));
}
/**
@ -165,7 +165,7 @@ class LinkController extends Controller
}
$request->session()->forget('link-types.edit.fromUpdate');
return prefixView('admin.link.edit', compact('subTitle', 'subTitleIcon', 'linkType'));
return view('admin.link.edit', compact('subTitle', 'subTitleIcon', 'linkType'));
}
/**
@ -186,7 +186,7 @@ class LinkController extends Controller
}
);
return prefixView('admin.link.index', compact('subTitle', 'subTitleIcon', 'linkTypes'));
return view('admin.link.index', compact('subTitle', 'subTitleIcon', 'linkTypes'));
}
/**
@ -204,7 +204,7 @@ class LinkController extends Controller
Log::channel('audit')->info(sprintf('User viewing link type #%d', $linkType->id));
return prefixView('admin.link.show', compact('subTitle', 'subTitleIcon', 'linkType', 'links'));
return view('admin.link.show', compact('subTitle', 'subTitleIcon', 'linkType', 'links'));
}
/**

2
app/Http/Controllers/Admin/UpdateController.php
View File

@ -82,7 +82,7 @@ class UpdateController extends Controller
'alpha' => (string)trans('firefly.update_channel_alpha'),
];
return prefixView('admin.update.index', compact('subTitle', 'subTitleIcon', 'selected', 'options', 'channelSelected', 'channelOptions'));
return view('admin.update.index', compact('subTitle', 'subTitleIcon', 'selected', 'options', 'channelSelected', 'channelOptions'));
}
/**

8
app/Http/Controllers/Admin/UserController.php
View File

@ -79,7 +79,7 @@ class UserController extends Controller
$subTitle = (string)trans('firefly.delete_user', ['email' => $user->email]);
return prefixView('admin.users.delete', compact('user', 'subTitle'));
return view('admin.users.delete', compact('user', 'subTitle'));
}
/**
@ -132,7 +132,7 @@ class UserController extends Controller
'email_changed' => (string)trans('firefly.block_code_email_changed'),
];
return prefixView('admin.users.edit', compact('user', 'canEditDetails', 'subTitle', 'subTitleIcon', 'codes', 'currentUser', 'isAdmin'));
return view('admin.users.edit', compact('user', 'canEditDetails', 'subTitle', 'subTitleIcon', 'codes', 'currentUser', 'isAdmin'));
}
/**
@ -154,7 +154,7 @@ class UserController extends Controller
}
);
return prefixView('admin.users.index', compact('subTitle', 'subTitleIcon', 'users'));
return view('admin.users.index', compact('subTitle', 'subTitleIcon', 'users'));
}
/**
@ -172,7 +172,7 @@ class UserController extends Controller
$subTitleIcon = 'fa-user';
$information = $this->repository->getUserData($user);
return prefixView(
return view(
'admin.users.show',
compact(
'title',

6
app/Http/Controllers/AttachmentController.php
View File

@ -79,7 +79,7 @@ class AttachmentController extends Controller
// put previous url in session
$this->rememberPreviousUri('attachments.delete.uri');
return prefixView('attachments.delete', compact('attachment', 'subTitle'));
return view('attachments.delete', compact('attachment', 'subTitle'));
}
/**
@ -158,7 +158,7 @@ class AttachmentController extends Controller
];
$request->session()->flash('preFilled', $preFilled);
return prefixView('attachments.edit', compact('attachment', 'subTitleIcon', 'subTitle'));
return view('attachments.edit', compact('attachment', 'subTitleIcon', 'subTitle'));
}
/**
@ -177,7 +177,7 @@ class AttachmentController extends Controller
}
);
return prefixView('attachments.index', compact('set'));
return view('attachments.index', compact('set'));
}
/**

6
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@ -75,7 +75,7 @@ class ForgotPasswordController extends Controller
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
Log::error($message);
return prefixView('error', compact('message'));
return view('error', compact('message'));
}
@ -117,7 +117,7 @@ class ForgotPasswordController extends Controller
if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
return prefixView('error', compact('message'));
return view('error', compact('message'));
}
// is allowed to?
@ -129,6 +129,6 @@ class ForgotPasswordController extends Controller
$allowRegistration = false;
}
return prefixView('auth.passwords.email')->with(compact('allowRegistration', 'pageTitle'));
return view('auth.passwords.email')->with(compact('allowRegistration', 'pageTitle'));
}
}

2
app/Http/Controllers/Auth/LoginController.php
View File

@ -251,7 +251,7 @@ class LoginController extends Controller
}
$usernameField = $this->username();
return prefixView('auth.login', compact('allowRegistration', 'email', 'remember', 'ldapWarning', 'allowReset', 'title', 'usernameField'));
return view('auth.login', compact('allowRegistration', 'email', 'remember', 'ldapWarning', 'allowReset', 'title', 'usernameField'));
}
/**

4
app/Http/Controllers/Auth/RegisterController.php
View File

@ -148,12 +148,12 @@ class RegisterController extends Controller
if (false === $allowRegistration) {
$message = 'Registration is currently not available.';
return prefixView('error', compact('message'));
return view('error', compact('message'));
}
$email = $request->old('email');
return prefixView('auth.register', compact('isDemoSite', 'email', 'pageTitle'));
return view('auth.register', compact('isDemoSite', 'email', 'pageTitle'));
}
}

6
app/Http/Controllers/Auth/ResetPasswordController.php
View File

@ -85,7 +85,7 @@ class ResetPasswordController extends Controller
if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
return prefixView('error', compact('message'));
return view('error', compact('message'));
}
$rules = [
'token' => 'required',
@ -130,7 +130,7 @@ class ResetPasswordController extends Controller
if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
return prefixView('error', compact('message'));
return view('error', compact('message'));
}
// is allowed to register?
@ -143,7 +143,7 @@ class ResetPasswordController extends Controller
}
/** @noinspection PhpUndefinedFieldInspection */
return prefixView('auth.passwords.reset')->with(
return view('auth.passwords.reset')->with(
['token' => $token, 'email' => $request->email, 'allowRegistration' => $allowRegistration, 'pageTitle' => $pageTitle]
);
}

2
app/Http/Controllers/Auth/TwoFactorController.php
View File

@ -49,7 +49,7 @@ class TwoFactorController extends Controller
$siteOwner = config('firefly.site_owner');
$title = (string)trans('firefly.two_factor_forgot_title');
return prefixView('auth.lost-two-factor', compact('user', 'siteOwner', 'title'));
return view('auth.lost-two-factor', compact('user', 'siteOwner', 'title'));
}
/**

2
app/Http/Controllers/Bill/CreateController.php
View File

@ -88,7 +88,7 @@ class CreateController extends Controller
}
$request->session()->forget('bills.create.fromStore');
return prefixView('bills.create', compact('periods', 'subTitle', 'defaultCurrency'));
return view('bills.create', compact('periods', 'subTitle', 'defaultCurrency'));
}
/**

2
app/Http/Controllers/Bill/DeleteController.php
View File

@ -75,7 +75,7 @@ class DeleteController extends Controller
$this->rememberPreviousUri('bills.delete.uri');
$subTitle = (string)trans('firefly.delete_bill', ['name' => $bill->name]);
return prefixView('bills.delete', compact('bill', 'subTitle'));
return view('bills.delete', compact('bill', 'subTitle'));
}
/**

2
app/Http/Controllers/Bill/EditController.php
View File

@ -107,7 +107,7 @@ class EditController extends Controller
$request->session()->flash('preFilled', $preFilled);
$request->session()->forget('bills.edit.fromUpdate');
return prefixView('bills.edit', compact('subTitle', 'periods', 'rules', 'bill', 'defaultCurrency', 'preFilled'));
return view('bills.edit', compact('subTitle', 'periods', 'rules', 'bill', 'defaultCurrency', 'preFilled'));
}
/**

2
app/Http/Controllers/Bill/IndexController.php
View File

@ -137,7 +137,7 @@ class IndexController extends Controller
$sums = $this->getSums($bills);
$totals = $this->getTotals($sums);
return prefixView('bills.index', compact('bills', 'sums', 'total', 'totals'));
return view('bills.index', compact('bills', 'sums', 'total', 'totals'));
}
/**

2
app/Http/Controllers/Bill/ShowController.php
View File

@ -179,7 +179,7 @@ class ShowController extends Controller
}
return prefixView('bills.show', compact('attachments', 'groups', 'rules', 'yearAverage', 'overallAverage', 'year', 'object', 'bill', 'subTitle'));
return view('bills.show', compact('attachments', 'groups', 'rules', 'yearAverage', 'overallAverage', 'year', 'object', 'bill', 'subTitle'));
}
}

6
app/Http/Controllers/Budget/AvailableBudgetController.php
View File

@ -98,7 +98,7 @@ class AvailableBudgetController extends Controller
}
$page = (int)($request->get('page') ?? 1);
return prefixView('budgets.available-budgets.create', compact('start', 'end', 'page', 'currency'));
return view('budgets.available-budgets.create', compact('start', 'end', 'page', 'currency'));
}
/**
@ -130,7 +130,7 @@ class AvailableBudgetController extends Controller
);
$page = (int)($request->get('page') ?? 1);
return prefixView('budgets.available-budgets.create-alternative', compact('start', 'end', 'page', 'currencies'));
return view('budgets.available-budgets.create-alternative', compact('start', 'end', 'page', 'currencies'));
}
/**
@ -164,7 +164,7 @@ class AvailableBudgetController extends Controller
{
$availableBudget->amount = number_format((float)$availableBudget->amount, $availableBudget->transactionCurrency->decimal_places, '.', '');
return prefixView('budgets.available-budgets.edit', compact('availableBudget', 'start', 'end'));
return view('budgets.available-budgets.edit', compact('availableBudget', 'start', 'end'));
}
/**

2
app/Http/Controllers/Budget/BudgetLimitController.php
View File

@ -103,7 +103,7 @@ class BudgetLimitController extends Controller
}
);
return prefixView('budgets.budget-limits.create', compact('start', 'end', 'currencies', 'budget'));
return view('budgets.budget-limits.create', compact('start', 'end', 'currencies', 'budget'));
}
/**

2
app/Http/Controllers/Budget/CreateController.php
View File

@ -103,7 +103,7 @@ class CreateController extends Controller
$request->session()->forget('budgets.create.fromStore');
$subTitle = (string)trans('firefly.create_new_budget');
return prefixView('budgets.create', compact('subTitle', 'autoBudgetTypes', 'autoBudgetPeriods'));
return view('budgets.create', compact('subTitle', 'autoBudgetTypes', 'autoBudgetPeriods'));
}
/**

2
app/Http/Controllers/Budget/DeleteController.php
View File

@ -75,7 +75,7 @@ class DeleteController extends Controller
// put previous url in session
$this->rememberPreviousUri('budgets.delete.uri');
return prefixView('budgets.delete', compact('budget', 'subTitle'));
return view('budgets.delete', compact('budget', 'subTitle'));
}
/**

2
app/Http/Controllers/Budget/EditController.php
View File

@ -113,7 +113,7 @@ class EditController extends Controller
$request->session()->forget('budgets.edit.fromUpdate');
$request->session()->flash('preFilled', $preFilled);
return prefixView('budgets.edit', compact('budget', 'subTitle', 'autoBudgetTypes', 'autoBudgetPeriods', 'autoBudget'));
return view('budgets.edit', compact('budget', 'subTitle', 'autoBudgetTypes', 'autoBudgetPeriods', 'autoBudget'));
}
/**

2
app/Http/Controllers/Budget/IndexController.php
View File

@ -136,7 +136,7 @@ class IndexController extends Controller
// get all inactive budgets, and simply list them:
$inactive = $this->repository->getInactiveBudgets();
return prefixView(
return view(
'budgets.index', compact(
'availableBudgets', 'budgeted', 'spent', 'prevLoop', 'nextLoop', 'budgets', 'currencies', 'enableAddButton', 'periodTitle',
'defaultCurrency', 'activeDaysPassed', 'activeDaysLeft', 'inactive', 'budgets', 'start', 'end', 'sums'

8
app/Http/Controllers/Budget/ShowController.php
View File

@ -105,7 +105,7 @@ class ShowController extends Controller
$groups = $collector->getPaginatedGroups();
$groups->setPath(route('budgets.no-budget'));
return prefixView('budgets.no-budget', compact('groups', 'subTitle', 'periods', 'start', 'end'));
return view('budgets.no-budget', compact('groups', 'subTitle', 'periods', 'start', 'end'));
}
/**
@ -133,7 +133,7 @@ class ShowController extends Controller
$groups = $collector->getPaginatedGroups();
$groups->setPath(route('budgets.no-budget'));
return prefixView('budgets.no-budget', compact('groups', 'subTitle', 'start', 'end'));
return view('budgets.no-budget', compact('groups', 'subTitle', 'start', 'end'));
}
/**
@ -167,7 +167,7 @@ class ShowController extends Controller
$subTitle = (string)trans('firefly.all_journals_for_budget', ['name' => $budget->name]);
return prefixView('budgets.show', compact('limits', 'attachments', 'budget', 'repetition', 'groups', 'subTitle'));
return view('budgets.show', compact('limits', 'attachments', 'budget', 'repetition', 'groups', 'subTitle'));
}
/**
@ -212,6 +212,6 @@ class ShowController extends Controller
$attachments = $this->repository->getAttachments($budget);
$limits = $this->getLimits($budget, $start, $end);
return prefixView('budgets.show', compact('limits', 'attachments', 'budget', 'budgetLimit', 'groups', 'subTitle'));
return view('budgets.show', compact('limits', 'attachments', 'budget', 'budgetLimit', 'groups', 'subTitle'));
}
}

2
app/Http/Controllers/Category/CreateController.php
View File

@ -78,7 +78,7 @@ class CreateController extends Controller
$request->session()->forget('categories.create.fromStore');
$subTitle = (string)trans('firefly.create_new_category');
return prefixView('categories.create', compact('subTitle'));
return view('categories.create', compact('subTitle'));
}
/**

2
app/Http/Controllers/Category/DeleteController.php
View File

@ -74,7 +74,7 @@ class DeleteController extends Controller
// put previous url in session
$this->rememberPreviousUri('categories.delete.uri');
return prefixView('categories.delete', compact('category', 'subTitle'));
return view('categories.delete', compact('category', 'subTitle'));
}
/**

2
app/Http/Controllers/Category/EditController.php
View File

@ -86,7 +86,7 @@ class EditController extends Controller
'notes' => $request->old('notes') ?? $this->repository->getNoteText($category),
];
return prefixView('categories.edit', compact('category', 'subTitle', 'preFilled'));
return view('categories.edit', compact('category', 'subTitle', 'preFilled'));
}
/**

2
app/Http/Controllers/Category/IndexController.php
View File

@ -87,7 +87,7 @@ class IndexController extends Controller
$categories = new LengthAwarePaginator($collection, $total, $pageSize, $page);
$categories->setPath(route('categories.index'));
return prefixView('categories.index', compact('categories'));
return view('categories.index', compact('categories'));
}
}

4
app/Http/Controllers/Category/NoCategoryController.php
View File

@ -104,7 +104,7 @@ class NoCategoryController extends Controller
$groups = $collector->getPaginatedGroups();
$groups->setPath(route('categories.no-category'));
return prefixView('categories.no-category', compact('groups', 'subTitle', 'periods', 'start', 'end'));
return view('categories.no-category', compact('groups', 'subTitle', 'periods', 'start', 'end'));
}
/**
@ -139,6 +139,6 @@ class NoCategoryController extends Controller
$groups = $collector->getPaginatedGroups();
$groups->setPath(route('categories.no-category.all'));
return prefixView('categories.no-category', compact('groups', 'subTitle', 'periods', 'start', 'end'));
return view('categories.no-category', compact('groups', 'subTitle', 'periods', 'start', 'end'));
}
}

4
app/Http/Controllers/Category/ShowController.php
View File

@ -107,7 +107,7 @@ class ShowController extends Controller
$groups = $collector->getPaginatedGroups();
$groups->setPath($path);
return prefixView('categories.show', compact('category', 'attachments', 'groups', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
return view('categories.show', compact('category', 'attachments', 'groups', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
}
/**
@ -146,6 +146,6 @@ class ShowController extends Controller
$groups = $collector->getPaginatedGroups();
$groups->setPath($path);
return prefixView('categories.show', compact('category', 'attachments', 'groups', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
return view('categories.show', compact('category', 'attachments', 'groups', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end'));
}
}

8
app/Http/Controllers/CurrencyController.php
View File

@ -94,7 +94,7 @@ class CurrencyController extends Controller
Log::channel('audit')->info('Create new currency.');
return prefixView('currencies.create', compact('subTitleIcon', 'subTitle'));
return view('currencies.create', compact('subTitleIcon', 'subTitle'));
}
/**
@ -161,7 +161,7 @@ class CurrencyController extends Controller
$subTitle = (string)trans('form.delete_currency', ['name' => $currency->name]);
Log::channel('audit')->info(sprintf('Visit page to delete currency %s.', $currency->code));
return prefixView('currencies.delete', compact('currency', 'subTitle'));
return view('currencies.delete', compact('currency', 'subTitle'));
}
/**
@ -308,7 +308,7 @@ class CurrencyController extends Controller
}
$request->session()->forget('currencies.edit.fromUpdate');
return prefixView('currencies.edit', compact('currency', 'subTitle', 'subTitleIcon'));
return view('currencies.edit', compact('currency', 'subTitle', 'subTitleIcon'));
}
/**
@ -361,7 +361,7 @@ class CurrencyController extends Controller
$isOwner = false;
}
return prefixView('currencies.index', compact('currencies', 'defaultCurrency', 'isOwner'));
return view('currencies.index', compact('currencies', 'defaultCurrency', 'isOwner'));
}
/**

2
app/Http/Controllers/Export/IndexController.php
View File

@ -110,7 +110,7 @@ class IndexController extends Controller
*/
public function index()
{
return prefixView('export.index');
return view('export.index');
}
}

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

@ -141,6 +141,6 @@ class HomeController extends Controller
$user = auth()->user();
event(new RequestedVersionCheckStatus($user));
return prefixView('index', compact('count', 'subTitle', 'transactions', 'billCount', 'start', 'end', 'today'));
return view('index', compact('count', 'subTitle', 'transactions', 'billCount', 'start', 'end', 'today'));
}
}

2
app/Http/Controllers/Json/FrontpageController.php
View File

@ -66,7 +66,7 @@ class FrontpageController extends Controller
$html = '';
if (!empty($info)) {
try {
$html = prefixView('json.piggy-banks', compact('info'))->render();
$html = view('json.piggy-banks', compact('info'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Cannot render json.piggy-banks: %s', $e->getMessage()));

4
app/Http/Controllers/Json/ReconcileController.php
View File

@ -141,7 +141,7 @@ class ReconcileController extends Controller
$reconSum = bcadd(bcadd($startBalance, $amount), $clearedAmount);
try {
$view = prefixView(
$view = view(
'accounts.reconcile.overview',
compact(
'account',
@ -256,7 +256,7 @@ class ReconcileController extends Controller
$journals = $this->processTransactions($account, $array);
try {
$html = prefixView(
$html = view(
'accounts.reconcile.transactions',
compact('account', 'journals', 'currency', 'start', 'end', 'selectionStart', 'selectionEnd')
)->render();

4
app/Http/Controllers/Json/RuleController.php
View File

@ -50,7 +50,7 @@ class RuleController extends Controller
$actions[$key] = (string)trans('firefly.rule_action_' . $key . '_choice');
}
try {
$view = prefixView('rules.partials.action', compact('actions', 'count'))->render();
$view = view('rules.partials.action', compact('actions', 'count'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Cannot render rules.partials.action: %s', $e->getMessage()));
@ -81,7 +81,7 @@ class RuleController extends Controller
asort($triggers);
try {
$view = prefixView('rules.partials.trigger', compact('triggers', 'count'))->render();
$view = view('rules.partials.trigger', compact('triggers', 'count'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Cannot render rules.partials.trigger: %s', $e->getMessage()));
$view = 'Could not render view.';

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

@ -78,7 +78,7 @@ class NewUserController extends Controller
return redirect(route('index'));
}
return prefixView('new-user.index', compact('languages'));
return view('new-user.index', compact('languages'));
}
/**

2
app/Http/Controllers/ObjectGroup/DeleteController.php
View File

@ -74,7 +74,7 @@ class DeleteController extends Controller
// put previous url in session
$this->rememberPreviousUri('object-groups.delete.uri');
return prefixView('object-groups.delete', compact('objectGroup', 'subTitle', 'piggyBanks'));
return view('object-groups.delete', compact('objectGroup', 'subTitle', 'piggyBanks'));
}
/**

2
app/Http/Controllers/ObjectGroup/EditController.php
View File

@ -79,7 +79,7 @@ class EditController extends Controller
}
session()->forget('object-groups.edit.fromUpdate');
return prefixView('object-groups.edit', compact('subTitle', 'subTitleIcon', 'objectGroup'));
return view('object-groups.edit', compact('subTitle', 'subTitleIcon', 'objectGroup'));
}
/**

2
app/Http/Controllers/ObjectGroup/IndexController.php
View File

@ -71,7 +71,7 @@ class IndexController extends Controller
$subTitle = (string)trans('firefly.object_groups_index');
$objectGroups = $this->repository->get();
return prefixView('object-groups.index', compact('subTitle', 'objectGroups'));
return view('object-groups.index', compact('subTitle', 'objectGroups'));
}
/**

8
app/Http/Controllers/PiggyBank/AmountController.php
View File

@ -81,7 +81,7 @@ class AmountController extends Controller
$maxAmount = min($leftOnAccount, $leftToSave);
$currency = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
return prefixView('piggy-banks.add', compact('piggyBank', 'maxAmount', 'currency'));
return view('piggy-banks.add', compact('piggyBank', 'maxAmount', 'currency'));
}
/**
@ -101,7 +101,7 @@ class AmountController extends Controller
$maxAmount = min($leftOnAccount, $leftToSave);
$currency = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
return prefixView('piggy-banks.add-mobile', compact('piggyBank', 'maxAmount', 'currency'));
return view('piggy-banks.add-mobile', compact('piggyBank', 'maxAmount', 'currency'));
}
/**
@ -201,7 +201,7 @@ class AmountController extends Controller
$repetition = $this->piggyRepos->getRepetition($piggyBank);
$currency = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
return prefixView('piggy-banks.remove', compact('piggyBank', 'repetition', 'currency'));
return view('piggy-banks.remove', compact('piggyBank', 'repetition', 'currency'));
}
/**
@ -216,6 +216,6 @@ class AmountController extends Controller
$repetition = $this->piggyRepos->getRepetition($piggyBank);
$currency = $this->accountRepos->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrency();
return prefixView('piggy-banks.remove-mobile', compact('piggyBank', 'repetition', 'currency'));
return view('piggy-banks.remove-mobile', compact('piggyBank', 'repetition', 'currency'));
}
}

2
app/Http/Controllers/PiggyBank/CreateController.php
View File

@ -80,7 +80,7 @@ class CreateController extends Controller
}
session()->forget('piggy-banks.create.fromStore');
return prefixView('piggy-banks.create', compact('subTitle', 'subTitleIcon'));
return view('piggy-banks.create', compact('subTitle', 'subTitleIcon'));
}
/**

2
app/Http/Controllers/PiggyBank/DeleteController.php
View File

@ -74,7 +74,7 @@ class DeleteController extends Controller
// put previous url in session
$this->rememberPreviousUri('piggy-banks.delete.uri');
return prefixView('piggy-banks.delete', compact('piggyBank', 'subTitle'));
return view('piggy-banks.delete', compact('piggyBank', 'subTitle'));
}
/**

2
app/Http/Controllers/PiggyBank/EditController.php
View File

@ -101,7 +101,7 @@ class EditController extends Controller
}
session()->forget('piggy-banks.edit.fromUpdate');
return prefixView('piggy-banks.edit', compact('subTitle', 'subTitleIcon', 'piggyBank', 'preFilled'));
return view('piggy-banks.edit', compact('subTitle', 'subTitleIcon', 'piggyBank', 'preFilled'));
}
/**

2
app/Http/Controllers/PiggyBank/IndexController.php
View File

@ -136,7 +136,7 @@ class IndexController extends Controller
ksort($piggyBanks);
return prefixView('piggy-banks.index', compact('piggyBanks', 'accounts'));
return view('piggy-banks.index', compact('piggyBanks', 'accounts'));
}
/**

2
app/Http/Controllers/PiggyBank/ShowController.php
View File

@ -84,6 +84,6 @@ class ShowController extends Controller
$subTitle = $piggyBank->name;
$attachments = $this->piggyRepos->getAttachments($piggyBank);
return prefixView('piggy-banks.show', compact('piggyBank', 'events', 'subTitle', 'piggy', 'attachments'));
return view('piggy-banks.show', compact('piggyBank', 'events', 'subTitle', 'piggy', 'attachments'));
}
}

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

@ -121,7 +121,7 @@ class PreferencesController extends Controller
$frontPageAccounts = $accountIds;
}
return prefixView(
return view(
'preferences.index',
compact(
'language',

14
app/Http/Controllers/ProfileController.php
View File

@ -113,7 +113,7 @@ class ProfileController extends Controller
$subTitle = (string)trans('firefly.change_your_email');
$subTitleIcon = 'fa-envelope';
return prefixView('profile.change-email', compact('title', 'subTitle', 'subTitleIcon', 'email'));
return view('profile.change-email', compact('title', 'subTitle', 'subTitleIcon', 'email'));
}
/**
@ -135,7 +135,7 @@ class ProfileController extends Controller
$subTitle = (string)trans('firefly.change_your_password');
$subTitleIcon = 'fa-key';
return prefixView('profile.change-password', compact('title', 'subTitle', 'subTitleIcon'));
return view('profile.change-password', compact('title', 'subTitle', 'subTitleIcon'));
}
/**
@ -192,7 +192,7 @@ class ProfileController extends Controller
$image = Google2FA::getQRCodeInline($domain, auth()->user()->email, $secret);
return prefixView('profile.code', compact('image', 'secret', 'codes'));
return view('profile.code', compact('image', 'secret', 'codes'));
}
/**
@ -252,7 +252,7 @@ class ProfileController extends Controller
$subTitle = (string)trans('firefly.delete_account');
$subTitleIcon = 'fa-trash';
return prefixView('profile.delete-account', compact('title', 'subTitle', 'subTitleIcon'));
return view('profile.delete-account', compact('title', 'subTitle', 'subTitleIcon'));
}
/**
@ -340,7 +340,7 @@ class ProfileController extends Controller
$accessToken = app('preferences')->set('access_token', $token);
}
return prefixView(
return view(
'profile.index', compact('subTitle', 'mfaBackupCount', 'userId', 'accessToken', 'enabled2FA', 'isInternalAuth', 'isInternalIdentity')
);
}
@ -356,7 +356,7 @@ class ProfileController extends Controller
return redirect(route('profile.index'));
}
return prefixView('profile.logout-other-sessions');
return view('profile.logout-other-sessions');
}
/**
@ -385,7 +385,7 @@ class ProfileController extends Controller
app('preferences')->set('mfa_recovery', $recoveryCodes);
app('preferences')->mark();
return prefixView('profile.new-backup-codes', compact('codes'));
return view('profile.new-backup-codes', compact('codes'));
}
/**

4
app/Http/Controllers/Recurring/CreateController.php
View File

@ -117,7 +117,7 @@ class CreateController extends Controller
];
$request->session()->flash('preFilled', $preFilled);
return prefixView(
return view(
'recurring.create',
compact('tomorrow', 'oldRepetitionType', 'bills', 'weekendResponses', 'preFilled', 'repetitionEnds', 'defaultCurrency', 'budgets')
);
@ -211,7 +211,7 @@ class CreateController extends Controller
}
$request->session()->flash('preFilled', $preFilled);
return prefixView(
return view(
'recurring.create',
compact('tomorrow', 'oldRepetitionType', 'weekendResponses', 'preFilled', 'repetitionEnds', 'defaultCurrency', 'budgets')
);

2
app/Http/Controllers/Recurring/DeleteController.php
View File

@ -77,7 +77,7 @@ class DeleteController extends Controller
$journalsCreated = $this->recurring->getTransactions($recurrence)->count();
return prefixView('recurring.delete', compact('recurrence', 'subTitle', 'journalsCreated'));
return view('recurring.delete', compact('recurrence', 'subTitle', 'journalsCreated'));
}
/**

2
app/Http/Controllers/Recurring/EditController.php
View File

@ -148,7 +148,7 @@ class EditController extends Controller
$array['repeat_until'] = substr((string)$array['repeat_until'], 0, 10);
$array['transactions'][0]['tags'] = implode(',', $array['transactions'][0]['tags'] ?? []);
return prefixView(
return view(
'recurring.edit',
compact(
'recurrence', 'array', 'bills',

2
app/Http/Controllers/Recurring/IndexController.php
View File

@ -125,7 +125,7 @@ class IndexController extends Controller
$this->verifyRecurringCronJob();
return prefixView('recurring.index', compact('paginator', 'today', 'page', 'pageSize', 'total'));
return view('recurring.index', compact('paginator', 'today', 'page', 'pageSize', 'total'));
}
}

2
app/Http/Controllers/Recurring/ShowController.php
View File

@ -96,6 +96,6 @@ class ShowController extends Controller
$subTitle = (string)trans('firefly.overview_for_recurrence', ['title' => $recurrence->title]);
return prefixView('recurring.show', compact('recurrence', 'subTitle', 'array', 'groups', 'today'));
return view('recurring.show', compact('recurrence', 'subTitle', 'array', 'groups', 'today'));
}
}

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

@ -63,7 +63,7 @@ class AccountController extends Controller
$accountTasker = app(AccountTaskerInterface::class);
$accountReport = $accountTasker->getAccountReport($accounts, $start, $end);
try {
$result = prefixView('reports.partials.accounts', compact('accountReport'))->render();
$result = view('reports.partials.accounts', compact('accountReport'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.accounts: %s', $e->getMessage()));

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

@ -136,7 +136,7 @@ class BalanceController extends Controller
// get transactions in budget
}
try {
$result = prefixView('reports.partials.balance', compact('report'))->render();
$result = view('reports.partials.balance', compact('report'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.balance: %s', $e->getMessage()));

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

@ -59,7 +59,7 @@ class BillController extends Controller
$helper = app(ReportHelperInterface::class);
$report = $helper->getBillReport($accounts, $start, $end);
try {
$result = prefixView('reports.partials.bills', compact('report'))->render();
$result = view('reports.partials.bills', compact('report'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.budgets: %s', $e->getMessage()));

14
app/Http/Controllers/Report/BudgetController.php
View File

@ -96,7 +96,7 @@ class BudgetController extends Controller
$generator->accountPerBudget();
$report = $generator->getReport();
return prefixView('reports.budget.partials.account-per-budget', compact('report', 'budgets'));
return view('reports.budget.partials.account-per-budget', compact('report', 'budgets'));
}
/**
@ -152,7 +152,7 @@ class BudgetController extends Controller
}
}
return prefixView('reports.budget.partials.accounts', compact('sums', 'report'));
return view('reports.budget.partials.accounts', compact('sums', 'report'));
}
/**
@ -197,7 +197,7 @@ class BudgetController extends Controller
array_multisort($amounts, SORT_ASC, $result);
try {
$result = prefixView('reports.budget.partials.avg-expenses', compact('result'))->render();
$result = view('reports.budget.partials.avg-expenses', compact('result'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@ -272,7 +272,7 @@ class BudgetController extends Controller
}
}
return prefixView('reports.budget.partials.budgets', compact('sums', 'report'));
return view('reports.budget.partials.budgets', compact('sums', 'report'));
}
/**
@ -297,7 +297,7 @@ class BudgetController extends Controller
$generator->general();
$report = $generator->getReport();
return prefixView('reports.partials.budgets', compact('report'))->render();
return view('reports.partials.budgets', compact('report'))->render();
}
/**
@ -353,7 +353,7 @@ class BudgetController extends Controller
}
}
try {
$result = prefixView('reports.partials.budget-period', compact('report', 'periods'))->render();
$result = view('reports.partials.budget-period', compact('report', 'periods'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
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 = prefixView('reports.budget.partials.top-expenses', compact('result'))->render();
$result = view('reports.budget.partials.top-expenses', compact('result'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));

20
app/Http/Controllers/Report/CategoryController.php
View File

@ -162,7 +162,7 @@ class CategoryController extends Controller
}
}
return prefixView('reports.category.partials.account-per-category', compact('report', 'categories'));
return view('reports.category.partials.account-per-category', compact('report', 'categories'));
}
/**
@ -266,7 +266,7 @@ class CategoryController extends Controller
}
}
return prefixView('reports.category.partials.accounts', compact('sums', 'report'));
return view('reports.category.partials.accounts', compact('sums', 'report'));
}
/**
@ -311,7 +311,7 @@ class CategoryController extends Controller
array_multisort($amounts, SORT_ASC, $result);
try {
$result = prefixView('reports.category.partials.avg-expenses', compact('result'))->render();
$result = view('reports.category.partials.avg-expenses', compact('result'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@ -363,7 +363,7 @@ class CategoryController extends Controller
array_multisort($amounts, SORT_DESC, $result);
try {
$result = prefixView('reports.category.partials.avg-income', compact('result'))->render();
$result = view('reports.category.partials.avg-income', compact('result'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@ -478,7 +478,7 @@ class CategoryController extends Controller
}
}
return prefixView('reports.category.partials.categories', compact('sums', 'report'));
return view('reports.category.partials.categories', compact('sums', 'report'));
}
/**
@ -548,7 +548,7 @@ class CategoryController extends Controller
$report = $data;
try {
$result = prefixView('reports.partials.category-period', compact('report', 'periods'))->render();
$result = view('reports.partials.category-period', compact('report', 'periods'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
@ -628,7 +628,7 @@ class CategoryController extends Controller
$report = $data;
try {
$result = prefixView('reports.partials.category-period', compact('report', 'periods'))->render();
$result = view('reports.partials.category-period', compact('report', 'periods'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
@ -672,7 +672,7 @@ class CategoryController extends Controller
try {
$result = (string)prefixView('reports.partials.categories', compact('report'))->render();
$result = (string)view('reports.partials.categories', compact('report'))->render();
$cache->store($result);
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
@ -722,7 +722,7 @@ class CategoryController extends Controller
array_multisort($amounts, SORT_ASC, $result);
try {
$result = prefixView('reports.category.partials.top-expenses', compact('result'))->render();
$result = view('reports.category.partials.top-expenses', compact('result'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@ -772,7 +772,7 @@ class CategoryController extends Controller
array_multisort($amounts, SORT_DESC, $result);
try {
$result = prefixView('reports.category.partials.top-income', compact('result'))->render();
$result = view('reports.category.partials.top-income', compact('result'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));

12
app/Http/Controllers/Report/DoubleController.php
View File

@ -110,7 +110,7 @@ class DoubleController extends Controller
array_multisort($amounts, SORT_ASC, $result);
try {
$result = prefixView('reports.double.partials.avg-expenses', compact('result'))->render();
$result = view('reports.double.partials.avg-expenses', compact('result'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
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 = prefixView('reports.double.partials.avg-income', compact('result'))->render();
$result = view('reports.double.partials.avg-income', compact('result'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@ -288,7 +288,7 @@ class DoubleController extends Controller
}
}
return prefixView('reports.double.partials.accounts', compact('sums', 'report'));
return view('reports.double.partials.accounts', compact('sums', 'report'));
}
/**
@ -413,7 +413,7 @@ class DoubleController extends Controller
}
}
return prefixView('reports.double.partials.accounts-per-asset', compact('sums', 'report'));
return view('reports.double.partials.accounts-per-asset', compact('sums', 'report'));
}
/**
@ -456,7 +456,7 @@ class DoubleController extends Controller
array_multisort($amounts, SORT_ASC, $result);
try {
$result = prefixView('reports.double.partials.top-expenses', compact('result'))->render();
$result = view('reports.double.partials.top-expenses', compact('result'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@ -506,7 +506,7 @@ class DoubleController extends Controller
array_multisort($amounts, SORT_DESC, $result);
try {
$result = prefixView('reports.double.partials.top-income', compact('result'))->render();
$result = view('reports.double.partials.top-income', compact('result'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));

6
app/Http/Controllers/Report/OperationsController.php
View File

@ -83,7 +83,7 @@ class OperationsController extends Controller
$report = $this->tasker->getExpenseReport($start, $end, $accounts);
$type = 'expense-entry';
try {
$result = prefixView('reports.partials.income-expenses', compact('report', 'type'))->render();
$result = view('reports.partials.income-expenses', compact('report', 'type'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.income-expense: %s', $e->getMessage()));
@ -119,7 +119,7 @@ class OperationsController extends Controller
$report = $this->tasker->getIncomeReport($start, $end, $accounts);
$type = 'income-entry';
try {
$result = prefixView('reports.partials.income-expenses', compact('report', 'type'))->render();
$result = view('reports.partials.income-expenses', compact('report', 'type'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.income-expenses: %s', $e->getMessage()));
@ -175,7 +175,7 @@ class OperationsController extends Controller
}
try {
$result = prefixView('reports.partials.operations', compact('sums'))->render();
$result = view('reports.partials.operations', compact('sums'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.operations: %s', $e->getMessage()));
$result = 'Could not render view.';

14
app/Http/Controllers/Report/TagController.php
View File

@ -155,7 +155,7 @@ class TagController extends Controller
}
}
return prefixView('reports.tag.partials.account-per-tag', compact('report', 'tags'));
return view('reports.tag.partials.account-per-tag', compact('report', 'tags'));
}
/**
@ -259,7 +259,7 @@ class TagController extends Controller
}
}
return prefixView('reports.tag.partials.accounts', compact('sums', 'report'));
return view('reports.tag.partials.accounts', compact('sums', 'report'));
}
/**
@ -304,7 +304,7 @@ class TagController extends Controller
array_multisort($amounts, SORT_ASC, $result);
try {
$result = prefixView('reports.tag.partials.avg-expenses', compact('result'))->render();
$result = view('reports.tag.partials.avg-expenses', compact('result'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@ -356,7 +356,7 @@ class TagController extends Controller
array_multisort($amounts, SORT_DESC, $result);
try {
$result = prefixView('reports.tag.partials.avg-income', compact('result'))->render();
$result = view('reports.tag.partials.avg-income', compact('result'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@ -471,7 +471,7 @@ class TagController extends Controller
}
}
return prefixView('reports.tag.partials.tags', compact('sums', 'report'));
return view('reports.tag.partials.tags', compact('sums', 'report'));
}
/**
@ -514,7 +514,7 @@ class TagController extends Controller
array_multisort($amounts, SORT_ASC, $result);
try {
$result = prefixView('reports.tag.partials.top-expenses', compact('result'))->render();
$result = view('reports.tag.partials.top-expenses', compact('result'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
@ -564,7 +564,7 @@ class TagController extends Controller
array_multisort($amounts, SORT_DESC, $result);
try {
$result = prefixView('reports.tag.partials.top-income', compact('result'))->render();
$result = view('reports.tag.partials.top-income', compact('result'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));

14
app/Http/Controllers/ReportController.php
View File

@ -89,7 +89,7 @@ class ReportController extends Controller
public function auditReport(Collection $accounts, Carbon $start, Carbon $end)
{
if ($end < $start) {
return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
return view('error')->with('message', (string)trans('firefly.end_after_start_date'));
}
$this->repository->cleanupBudgets();
@ -125,7 +125,7 @@ class ReportController extends Controller
public function budgetReport(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end)
{
if ($end < $start) {
return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
return view('error')->with('message', (string)trans('firefly.end_after_start_date'));
}
$this->repository->cleanupBudgets();
@ -162,7 +162,7 @@ class ReportController extends Controller
public function categoryReport(Collection $accounts, Collection $categories, Carbon $start, Carbon $end)
{
if ($end < $start) {
return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
return view('error')->with('message', (string)trans('firefly.end_after_start_date'));
}
$this->repository->cleanupBudgets();
@ -198,7 +198,7 @@ class ReportController extends Controller
public function defaultReport(Collection $accounts, Carbon $start, Carbon $end)
{
if ($end < $start) {
return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
return view('error')->with('message', (string)trans('firefly.end_after_start_date'));
}
$this->repository->cleanupBudgets();
@ -293,7 +293,7 @@ class ReportController extends Controller
$accountList = implode(',', $accounts->pluck('id')->toArray());
$this->repository->cleanupBudgets();
return prefixView('reports.index', compact('months', 'accounts', 'start', 'accountList', 'groupedAccounts', 'customFiscalYear'));
return view('reports.index', compact('months', 'accounts', 'start', 'accountList', 'groupedAccounts', 'customFiscalYear'));
}
/**
@ -371,7 +371,7 @@ class ReportController extends Controller
}
if ($request->getEndDate() < $request->getStartDate()) {
return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
return view('error')->with('message', (string)trans('firefly.end_after_start_date'));
}
$uri = match ($reportType) {
@ -400,7 +400,7 @@ class ReportController extends Controller
public function tagReport(Collection $accounts, Collection $tags, Carbon $start, Carbon $end)
{
if ($end < $start) {
return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
return view('error')->with('message', (string)trans('firefly.end_after_start_date'));
}
$this->repository->cleanupBudgets();

6
app/Http/Controllers/Rule/CreateController.php
View File

@ -126,7 +126,7 @@ class CreateController extends Controller
}
session()->forget('rules.create.fromStore');
return prefixView(
return view(
'rules.rule.create',
compact('subTitleIcon', 'oldTriggers', 'preFilled', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup', 'subTitle')
);
@ -179,7 +179,7 @@ class CreateController extends Controller
}
session()->forget('rules.create.fromStore');
return prefixView(
return view(
'rules.rule.create',
compact('subTitleIcon', 'oldTriggers', 'preFilled', 'oldActions', 'triggerCount', 'actionCount', 'subTitle')
);
@ -229,7 +229,7 @@ class CreateController extends Controller
}
session()->forget('rules.create.fromStore');
return prefixView(
return view(
'rules.rule.create',
compact('subTitleIcon', 'oldTriggers', 'preFilled', 'oldActions', 'triggerCount', 'actionCount', 'subTitle')
);

2
app/Http/Controllers/Rule/DeleteController.php
View File

@ -73,7 +73,7 @@ class DeleteController extends Controller
// put previous url in session
$this->rememberPreviousUri('rules.delete.uri');
return prefixView('rules.rule.delete', compact('rule', 'subTitle'));
return view('rules.rule.delete', compact('rule', 'subTitle'));
}
/**

4
app/Http/Controllers/Rule/EditController.php
View File

@ -133,7 +133,7 @@ class EditController extends Controller
$request->session()->flash('preFilled', $preFilled);
return prefixView('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount'));
return view('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount'));
}
/**
@ -158,7 +158,7 @@ class EditController extends Controller
$index = 0;
foreach ($submittedOperators as $operator) {
try {
$renderedEntries[] = prefixView(
$renderedEntries[] = view(
'rules.partials.trigger',
[
'oldTrigger' => OperatorQuerySearch::getRootOperator($operator['type']),

2
app/Http/Controllers/Rule/IndexController.php
View File

@ -75,7 +75,7 @@ class IndexController extends Controller
$this->ruleGroupRepos->resetOrder();
$ruleGroups = $this->ruleGroupRepos->getAllRuleGroupsWithRules(null);
return prefixView('rules.index', compact('ruleGroups'));
return view('rules.index', compact('ruleGroups'));
}
/**

6
app/Http/Controllers/Rule/SelectController.php
View File

@ -121,7 +121,7 @@ class SelectController extends Controller
$today = Carbon::now()->format('Y-m-d');
$subTitle = (string)trans('firefly.apply_rule_selection', ['title' => $rule->title]);
return prefixView('rules.rule.select-transactions', compact('first', 'today', 'rule', 'subTitle'));
return view('rules.rule.select-transactions', compact('first', 'today', 'rule', 'subTitle'));
}
/**
@ -175,7 +175,7 @@ class SelectController extends Controller
// Return json response
$view = 'ERROR, see logs.';
try {
$view = prefixView('list.journals-array-tiny', ['groups' => $collection])->render();
$view = view('list.journals-array-tiny', ['groups' => $collection])->render();
} catch (Throwable $exception) { // @phpstan-ignore-line
Log::error(sprintf('Could not render view in testTriggers(): %s', $exception->getMessage()));
@ -218,7 +218,7 @@ class SelectController extends Controller
// Return json response
$view = 'ERROR, see logs.';
try {
$view = prefixView('list.journals-array-tiny', ['groups' => $collection])->render();
$view = view('list.journals-array-tiny', ['groups' => $collection])->render();
} catch (Throwable $exception) { // @phpstan-ignore-line
Log::error(sprintf('Could not render view in testTriggersByRule(): %s', $exception->getMessage()));

2
app/Http/Controllers/RuleGroup/CreateController.php
View File

@ -76,7 +76,7 @@ class CreateController extends Controller
}
session()->forget('rule-groups.create.fromStore');
return prefixView('rules.rule-group.create', compact('subTitleIcon', 'subTitle'));
return view('rules.rule-group.create', compact('subTitleIcon', 'subTitle'));
}
/**

2
app/Http/Controllers/RuleGroup/DeleteController.php
View File

@ -75,7 +75,7 @@ class DeleteController extends Controller
// put previous url in session
$this->rememberPreviousUri('rule-groups.delete.uri');
return prefixView('rules.rule-group.delete', compact('ruleGroup', 'subTitle'));
return view('rules.rule-group.delete', compact('ruleGroup', 'subTitle'));
}
/**

2
app/Http/Controllers/RuleGroup/EditController.php
View File

@ -118,7 +118,7 @@ class EditController extends Controller
session()->forget('rule-groups.edit.fromUpdate');
session()->flash('preFilled', $preFilled);
return prefixView('rules.rule-group.edit', compact('ruleGroup', 'subTitle'));
return view('rules.rule-group.edit', compact('ruleGroup', 'subTitle'));
}
/**

2
app/Http/Controllers/RuleGroup/ExecutionController.php
View File

@ -113,6 +113,6 @@ class ExecutionController extends Controller
$today = Carbon::now()->format('Y-m-d');
$subTitle = (string)trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]);
return prefixView('rules.rule-group.select-transactions', compact('first', 'today', 'ruleGroup', 'subTitle'));
return view('rules.rule-group.select-transactions', compact('first', 'today', 'ruleGroup', 'subTitle'));
}
}

4
app/Http/Controllers/SearchController.php
View File

@ -91,7 +91,7 @@ class SearchController extends Controller
$invalidOperators = $searcher->getInvalidOperators();
$subTitle = (string)trans('breadcrumbs.search_result', ['query' => $fullQuery]);
return prefixView('search.index', compact('query', 'operators', 'page', 'rule', 'fullQuery', 'subTitle', 'ruleId', 'ruleChanged', 'invalidOperators'));
return view('search.index', compact('query', 'operators', 'page', 'rule', 'fullQuery', 'subTitle', 'ruleId', 'ruleChanged', 'invalidOperators'));
}
/**
@ -118,7 +118,7 @@ class SearchController extends Controller
$groups->setPath($url);
try {
$html = prefixView('search.search', compact('groups', 'hasPages', 'searchTime'))->render();
$html = view('search.search', compact('groups', 'hasPages', 'searchTime'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Cannot render search.search: %s', $e->getMessage()));

2
app/Http/Controllers/System/InstallController.php
View File

@ -132,7 +132,7 @@ class InstallController extends Controller
// set new DB version.
app('fireflyconfig')->set('db_version', (int)config('firefly.db_version'));
return prefixView('install.index');
return view('install.index');
}
/**

12
app/Http/Controllers/TagController.php
View File

@ -94,7 +94,7 @@ class TagController extends Controller
}
session()->forget('tags.create.fromStore');
return prefixView('tags.create', compact('subTitle', 'subTitleIcon', 'locations'));
return view('tags.create', compact('subTitle', 'subTitleIcon', 'locations'));
}
/**
@ -111,7 +111,7 @@ class TagController extends Controller
// put previous url in session
$this->rememberPreviousUri('tags.delete.uri');
return prefixView('tags.delete', compact('tag', 'subTitle'));
return view('tags.delete', compact('tag', 'subTitle'));
}
/**
@ -164,7 +164,7 @@ class TagController extends Controller
}
session()->forget('tags.edit.fromUpdate');
return prefixView('tags.edit', compact('tag', 'subTitle', 'subTitleIcon', 'locations'));
return view('tags.edit', compact('tag', 'subTitle', 'subTitleIcon', 'locations'));
}
/**
@ -192,7 +192,7 @@ class TagController extends Controller
}
$count = $repository->count();
return prefixView('tags.index', compact('tags', 'count'));
return view('tags.index', compact('tags', 'count'));
}
/**
@ -262,7 +262,7 @@ class TagController extends Controller
$groups->setPath($path);
$sums = $this->repository->sumsOfTag($tag, $start, $end);
return prefixView('tags.show', compact('tag', 'attachments', 'sums', 'periods', 'subTitle', 'subTitleIcon', 'groups', 'start', 'end', 'location'));
return view('tags.show', compact('tag', 'attachments', 'sums', 'periods', 'subTitle', 'subTitleIcon', 'groups', 'start', 'end', 'location'));
}
/**
@ -295,7 +295,7 @@ class TagController extends Controller
$groups->setPath($path);
$sums = $this->repository->sumsOfTag($tag, $start, $end);
return prefixView('tags.show', compact('tag', 'attachments', 'sums', 'periods', 'subTitle', 'subTitleIcon', 'groups', 'start', 'end', 'location'));
return view('tags.show', compact('tag', 'attachments', 'sums', 'periods', 'subTitle', 'subTitleIcon', 'groups', 'start', 'end', 'location'));
}
/**

2
app/Http/Controllers/Transaction/BulkController.php
View File

@ -85,7 +85,7 @@ class BulkController extends Controller
$budgetRepos = app(BudgetRepositoryInterface::class);
$budgetList = app('expandedform')->makeSelectListWithEmpty($budgetRepos->getActiveBudgets());
return prefixView('transactions.bulk.edit', compact('journals', 'subTitle', 'budgetList'));
return view('transactions.bulk.edit', compact('journals', 'subTitle', 'budgetList'));
}
/**

2
app/Http/Controllers/Transaction/ConvertController.php
View File

@ -124,7 +124,7 @@ class ConvertController extends Controller
return redirect(route('transactions.show', [$group->id]));
}
return prefixView(
return view(
'transactions.convert',
compact(
'sourceType',

2
app/Http/Controllers/Transaction/CreateController.php
View File

@ -125,7 +125,7 @@ class CreateController extends Controller
session()->put('preFilled', $preFilled);
return prefixView(
return view(
'transactions.create',
compact(
'subTitleIcon',

2
app/Http/Controllers/Transaction/DeleteController.php
View File

@ -89,7 +89,7 @@ class DeleteController extends Controller
Log::debug('Will try to remember previous URI');
$this->rememberPreviousUri('transactions.delete.uri');
return prefixView('transactions.delete', compact('group', 'journal', 'subTitle', 'objectType', 'previous'));
return view('transactions.delete', compact('group', 'journal', 'subTitle', 'objectType', 'previous'));
}
/**

2
app/Http/Controllers/Transaction/EditController.php
View File

@ -85,7 +85,7 @@ class EditController extends Controller
$search = sprintf('?%s', $parts['query'] ?? '');
$previousUrl = str_replace($search, '', $previousUrl);
return prefixView(
return view(
'transactions.edit',
compact(
'cash', 'allowedSourceDests', 'expectedSourceTypes', 'transactionGroup', 'allowedOpposingTypes', 'accountToTypes', 'defaultCurrency',

4
app/Http/Controllers/Transaction/IndexController.php
View File

@ -120,7 +120,7 @@ class IndexController extends Controller
$groups = $collector->getPaginatedGroups();
$groups->setPath($path);
return prefixView('transactions.index', compact('subTitle', 'objectType', 'subTitleIcon', 'groups', 'periods', 'start', 'end'));
return view('transactions.index', compact('subTitle', 'objectType', 'subTitleIcon', 'groups', 'periods', 'start', 'end'));
}
/**
@ -159,6 +159,6 @@ class IndexController extends Controller
$groups = $collector->getPaginatedGroups();
$groups->setPath($path);
return prefixView('transactions.index', compact('subTitle', 'objectType', 'subTitleIcon', 'groups', 'start', 'end'));
return view('transactions.index', compact('subTitle', 'objectType', 'subTitleIcon', 'groups', 'start', 'end'));
}
}

4
app/Http/Controllers/Transaction/LinkController.php
View File

@ -79,7 +79,7 @@ class LinkController extends Controller
$subTitle = (string)trans('breadcrumbs.delete_journal_link');
$this->rememberPreviousUri('journal_links.delete.uri');
return prefixView('transactions.links.delete', compact('link', 'subTitle', 'subTitleIcon'));
return view('transactions.links.delete', compact('link', 'subTitle', 'subTitleIcon'));
}
/**
@ -108,7 +108,7 @@ class LinkController extends Controller
{
$linkTypes = $this->repository->get();
return prefixView('transactions.links.modal', compact('journal', 'linkTypes'));
return view('transactions.links.modal', compact('journal', 'linkTypes'));
}
/**

4
app/Http/Controllers/Transaction/MassController.php
View File

@ -84,7 +84,7 @@ class MassController extends Controller
// put previous url in session
$this->rememberPreviousUri('transactions.mass-delete.uri');
return prefixView('transactions.mass.delete', compact('journals', 'subTitle'));
return view('transactions.mass.delete', compact('journals', 'subTitle'));
}
/**
@ -153,7 +153,7 @@ class MassController extends Controller
$this->rememberPreviousUri('transactions.mass-edit.uri');
return prefixView('transactions.mass.edit', compact('journals', 'subTitle', 'withdrawalSources', 'depositDestinations', 'budgets'));
return view('transactions.mass.edit', compact('journals', 'subTitle', 'withdrawalSources', 'depositDestinations', 'budgets'));
}
/**

2
app/Http/Controllers/Transaction/ShowController.php
View File

@ -110,7 +110,7 @@ class ShowController extends Controller
$attachments = $this->repository->getAttachments($transactionGroup);
$links = $this->repository->getLinks($transactionGroup);
return prefixView(
return view(
'transactions.show',
compact(
'transactionGroup',

30
app/Support/ExpandedForm.php
View File

@ -62,7 +62,7 @@ class ExpandedForm
//$value = round((float)$value, 8);
//}
try {
$html = prefixView('form.amount-no-currency', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.amount-no-currency', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::error(sprintf('Could not render amountNoCurrency(): %s', $e->getMessage()));
$html = 'Could not render amountNoCurrency.';
@ -97,7 +97,7 @@ class ExpandedForm
unset($options['placeholder'], $options['autocomplete'], $options['class']);
try {
$html = prefixView('form.checkbox', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.checkbox', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render checkbox(): %s', $e->getMessage()));
$html = 'Could not render checkbox.';
@ -121,7 +121,7 @@ class ExpandedForm
$value = $this->fillFieldValue($name, $value);
unset($options['placeholder']);
try {
$html = prefixView('form.date', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.date', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render date(): %s', $e->getMessage()));
$html = 'Could not render date.';
@ -143,7 +143,7 @@ class ExpandedForm
$options = $this->expandOptionArray($name, $label, $options);
$classes = $this->getHolderClasses($name);
try {
$html = prefixView('form.file', compact('classes', 'name', 'label', 'options'))->render();
$html = view('form.file', compact('classes', 'name', 'label', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render file(): %s', $e->getMessage()));
$html = 'Could not render file.';
@ -168,7 +168,7 @@ class ExpandedForm
$value = $this->fillFieldValue($name, $value);
$options['step'] = '1';
try {
$html = prefixView('form.integer', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.integer', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render integer(): %s', $e->getMessage()));
$html = 'Could not render integer.';
@ -192,7 +192,7 @@ class ExpandedForm
$classes = $this->getHolderClasses($name);
$value = $this->fillFieldValue($name, $value);
try {
$html = prefixView('form.location', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.location', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render location(): %s', $e->getMessage()));
$html = 'Could not render location.';
@ -250,7 +250,7 @@ class ExpandedForm
// $value = round((float)$value, $selectedCurrency->decimal_places);
}
try {
$html = prefixView('form.non-selectable-amount', compact('selectedCurrency', 'classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.non-selectable-amount', compact('selectedCurrency', 'classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render nonSelectableAmount(): %s', $e->getMessage()));
$html = 'Could not render nonSelectableAmount.';
@ -275,7 +275,7 @@ class ExpandedForm
$options['step'] = 'any';
unset($options['placeholder']);
try {
$html = prefixView('form.number', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.number', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render number(): %s', $e->getMessage()));
$html = 'Could not render number.';
@ -304,7 +304,7 @@ class ExpandedForm
}
try {
$html = prefixView('form.object_group', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.object_group', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render objectGroup(): %s', $e->getMessage()));
$html = 'Could not render objectGroup.';
@ -323,7 +323,7 @@ class ExpandedForm
public function optionsList(string $type, string $name): string
{
try {
$html = prefixView('form.options', compact('type', 'name'))->render();
$html = view('form.options', compact('type', 'name'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render select(): %s', $e->getMessage()));
$html = 'Could not render optionsList.';
@ -345,7 +345,7 @@ class ExpandedForm
$options = $this->expandOptionArray($name, $label, $options);
$classes = $this->getHolderClasses($name);
try {
$html = prefixView('form.password', compact('classes', 'name', 'label', 'options'))->render();
$html = view('form.password', compact('classes', 'name', 'label', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render password(): %s', $e->getMessage()));
$html = 'Could not render password.';
@ -372,7 +372,7 @@ class ExpandedForm
$options['step'] = 'any';
unset($options['placeholder']);
try {
$html = prefixView('form.percentage', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.percentage', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render percentage(): %s', $e->getMessage()));
$html = 'Could not render percentage.';
@ -394,7 +394,7 @@ class ExpandedForm
$options = $this->expandOptionArray($name, $label, $options);
$classes = $this->getHolderClasses($name);
try {
$html = prefixView('form.static', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.static', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render staticText(): %s', $e->getMessage()));
$html = 'Could not render staticText.';
@ -417,7 +417,7 @@ class ExpandedForm
$classes = $this->getHolderClasses($name);
$value = $this->fillFieldValue($name, $value);
try {
$html = prefixView('form.text', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.text', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render text(): %s', $e->getMessage()));
$html = 'Could not render text.';
@ -446,7 +446,7 @@ class ExpandedForm
}
try {
$html = prefixView('form.textarea', compact('classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.textarea', compact('classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render textarea(): %s', $e->getMessage()));
$html = 'Could not render textarea.';

2
app/Support/Form/AccountForm.php
View File

@ -136,7 +136,7 @@ class AccountForm
unset($options['class']);
try {
$html = prefixView('form.assetAccountCheckList', compact('classes', 'selected', 'name', 'label', 'options', 'grouped'))->render();
$html = view('form.assetAccountCheckList', compact('classes', 'selected', 'name', 'label', 'options', 'grouped'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render assetAccountCheckList(): %s', $e->getMessage()));
$html = 'Could not render assetAccountCheckList.';

4
app/Support/Form/CurrencyForm.php
View File

@ -95,7 +95,7 @@ class CurrencyForm
$value = round((float)$value, $defaultCurrency->decimal_places);
}
try {
$html = prefixView('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render currencyField(): %s', $e->getMessage()));
$html = 'Could not render currencyField.';
@ -164,7 +164,7 @@ class CurrencyForm
$value = round((float)$value, $defaultCurrency->decimal_places);
}
try {
$html = prefixView('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
$html = view('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render currencyField(): %s', $e->getMessage()));
$html = 'Could not render currencyField.';

2
app/Support/Form/FormSupport.php
View File

@ -53,7 +53,7 @@ trait FormSupport
$selected = $this->fillFieldValue($name, $selected);
unset($options['autocomplete'], $options['placeholder']);
try {
$html = prefixView('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render();
$html = view('form.select', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render();
} catch (Throwable $e) { // @phpstan-ignore-line
Log::debug(sprintf('Could not render select(): %s', $e->getMessage()));
$html = 'Could not render select.';

Some files were not shown because too many files have changed in this diff Show More