IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-20 11:48:27 -06:00
Code Issues Packages 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
Show Stats 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];
}

7
public/v1/js/ff/accounts/reconcile.js
View File

@ -201,7 +201,12 @@ function getTransactionsForRange() {
var index = indexUri.replace('%start%', $('input[name="start_date"]').val()).replace('%end%', $('input[name="end_date"]').val());
window.history.pushState('object or string', "Reconcile account", index);
$.getJSON(uri).done(placeTransactions);
$.getJSON(uri).done(placeTransactions).catch(exceptionHandling)
}
function exceptionHandling() {
$('#transactions_holder').empty().append($('<p>').addClass('text-center lead').html(selectRangeAndBalance));
$('.start_reconcile').show();
$('.initial_instructions').show();
}
// /**

1
resources/views/v1/accounts/reconcile/index.twig
View File

@ -131,6 +131,7 @@
var transactionsUri = '{{ transactionsUri }}';
var overviewUri = '{{ overviewUri }}';
var indexUri = '{{ indexUri }}';
var selectRangeAndBalance = '{{ 'select_range_and_balance'|_|escape('js') }}';
</script>
<script src="v1/js/ff/accounts/reconcile.js?v={{ FF_VERSION }}" type="text/javascript" nonce="{{ JS_NONCE }}"></script>
{% endblock %}