kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-20 11:19:16 +00:00
Code Issues Projects Releases Wiki Activity

Various code fixes.

Browse Source
This commit is contained in:
James Cole
2022-10-31 05:53:36 +01:00
parent 0059ed7bde
commit 249b0c3377
88 changed files with 180 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/Export/ExportData.php
View File

@@ -121,7 +121,7 @@ class ExportData extends Command
$exporter->setExportBills($options['export']['bills']); $exporter->setExportBills($options['export']['bills']);
$exporter->setExportPiggies($options['export']['piggies']); $exporter->setExportPiggies($options['export']['piggies']);
$data = $exporter->export(); $data = $exporter->export();
if (0 === count ($data)) { if (0 === count($data)) {
$this->error('You must export *something*. Use --export-transactions or another option. See docs.firefly-iii.org'); $this->error('You must export *something*. Use --export-transactions or another option. See docs.firefly-iii.org');
} }
$returnCode = 0; $returnCode = 0;

4
app/Exceptions/GracefulNotFoundHandler.php
View File

@@ -148,10 +148,10 @@ class GracefulNotFoundHandler extends ExceptionHandler
$user = auth()->user(); $user = auth()->user();
$route = $request->route(); $route = $request->route();
$param = $route->parameter('account'); $param = $route->parameter('account');
if($param instanceof Account) { if ($param instanceof Account) {
$accountId = (int) $param->id; $accountId = (int) $param->id;
} }
if(!($param instanceof Account)) { if (!($param instanceof Account)) {
$accountId = (int) $param; $accountId = (int) $param;
} }
/** @var Account $account */ /** @var Account $account */

10
app/Repositories/TransactionGroup/TransactionGroupRepository.php
View File

@@ -197,11 +197,11 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface
$return = []; $return = [];
$journals = $group->transactionJournals->pluck('id')->toArray(); $journals = $group->transactionJournals->pluck('id')->toArray();
$set = TransactionJournalLink::where( $set = TransactionJournalLink::where(
static function (Builder $q) use ($journals) { static function (Builder $q) use ($journals) {
$q->whereIn('source_id', $journals); $q->whereIn('source_id', $journals);
$q->orWhereIn('destination_id', $journals); $q->orWhereIn('destination_id', $journals);
} }
) )
->with(['source', 'destination', 'source.transactions']) ->with(['source', 'destination', 'source.transactions'])
->leftJoin('link_types', 'link_types.id', '=', 'journal_links.link_type_id') ->leftJoin('link_types', 'link_types.id', '=', 'journal_links.link_type_id')
->get(['journal_links.*', 'link_types.inward', 'link_types.outward', 'link_types.editable']); ->get(['journal_links.*', 'link_types.inward', 'link_types.outward', 'link_types.editable']);