kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-19 04:49:30 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2025-12-17

Browse Source
This commit is contained in:
JC5
2025-12-17 08:47:31 +01:00
parent 486e0d5ed5
commit 012df6bb24
50 changed files with 419 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@ use Illuminate\Contracts\View\View;
use Illuminate\Http\RedirectResponse;
use Illuminate\Routing\Redirector;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use FireflyIII\Support\Facades\Steam;
/**
* Class DeleteController
@@ -83,7 +84,7 @@ class DeleteController extends Controller
}
$objectType = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
$subTitle = (string) trans('firefly.delete_'.$objectType, ['description' => $group->title ?? $journal->description]);
$previous = \FireflyIII\Support\Facades\Steam::getSafePreviousUrl();
$previous = Steam::getSafePreviousUrl();
// put previous url in session
Log::debug('Will try to remember previous URL');
$this->rememberPreviousUrl('transactions.delete.url');

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

@@ -36,6 +36,7 @@ use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Routing\Redirector;
use Illuminate\View\View;
use FireflyIII\Support\Facades\Steam;
/**
* Class LinkController.
@@ -145,6 +146,6 @@ class LinkController extends Controller
$linkId = (int) $request->get('id');
$this->repository->switchLinkById($linkId);
return redirect(\FireflyIII\Support\Facades\Steam::getSafePreviousUrl());
return redirect(Steam::getSafePreviousUrl());
}
}

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

@@ -43,6 +43,7 @@ use Illuminate\Routing\Redirector;
use Illuminate\Support\Facades\Log;
use Illuminate\View\View as IlluminateView;
use InvalidArgumentException;
use FireflyIII\Support\Facades\Steam;
/**
* Class MassController.
@@ -142,9 +143,9 @@ class MassController extends Controller
// reverse amounts
foreach ($journals as $index => $journal) {
$journals[$index]['amount'] = \FireflyIII\Support\Facades\Steam::bcround(\FireflyIII\Support\Facades\Steam::positive($journal['amount']), $journal['currency_decimal_places']);
$journals[$index]['amount'] = Steam::bcround(Steam::positive($journal['amount']), $journal['currency_decimal_places']);
$journals[$index]['foreign_amount'] = null === $journal['foreign_amount']
? null : \FireflyIII\Support\Facades\Steam::positive($journal['foreign_amount']);
? null : Steam::positive($journal['foreign_amount']);
}
$this->rememberPreviousUrl('transactions.mass-edit.url');