kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-21 21:20:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into feat/improve-request-objects

Browse Source
This commit is contained in:
mergify[bot]
2025-10-10 06:46:55 +00:00
committed by GitHub
parent 52f3ec7d3d 63aa8adab7
commit 58c76bee94
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Factory/PiggyBankEventFactory.php
View File

@@ -26,6 +26,7 @@ namespace FireflyIII\Factory;
use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBank;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use Illuminate\Support\Facades\Log;
/** /**
* Create piggy bank events. * Create piggy bank events.

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

@@ -81,6 +81,12 @@ class ReconcileController extends Controller
if (!$start instanceof Carbon && !$end instanceof Carbon) { if (!$start instanceof Carbon && !$end instanceof Carbon) {
throw new FireflyException('Invalid dates submitted.'); throw new FireflyException('Invalid dates submitted.');
} }
if(!is_numeric($startBalance)) {
$startBalance = '0';
}
if(!is_numeric($endBalance)) {
$endBalance = '0';
}
if ($end->lt($start)) { if ($end->lt($start)) {
[$start, $end] = [$end, $start]; [$start, $end] = [$end, $start];
} }