kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 03:43:07 +00:00
Code Issues Projects Releases Wiki Activity

Error handling for https://github.com/firefly-iii/firefly-iii/issues/5575

Browse Source
This commit is contained in:
James Cole
2022-01-20 06:23:42 +01:00
parent 78ebec01a4
commit 8238ae7d0a
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,14 +83,18 @@ class ReconcileController extends Controller
*
* @return JsonResponse
*/
public function overview(Request $request, Account $account, Carbon $start, Carbon $end): JsonResponse
public function overview(Request $request, Account $account = null, Carbon $start = null, Carbon $end = null): JsonResponse
{
$startBalance = $request->get('startBalance');
$endBalance = $request->get('endBalance');
$accountCurrency = $this->accountRepos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrency();
$amount = '0';
$clearedAmount = '0';
$route = '';
if (null === $start && null === $end) {
throw new FireflyException('Invalid dates submitted.');
}
if ($end->lt($start)) {
[$start, $end] = [$end, $start];
}
@@ -220,8 +224,11 @@ class ReconcileController extends Controller
* @throws FireflyException
* @throws JsonException
*/
public function transactions(Account $account, Carbon $start, Carbon $end)
public function transactions(Account $account, Carbon $start = null, Carbon $end = null)
{
if (null === $start || null === $end) {
throw new FireflyException('Invalid dates submitted.');
}
if ($end->lt($start)) {
[$end, $start] = [$start, $end];
}