kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix #1336

Browse Source
This commit is contained in:
James Cole
2018-04-22 07:16:09 +02:00
parent 36329e596e
commit 529dd490b7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -320,10 +320,12 @@ class ReconcileController extends Controller
'notes' => implode(', ', $data['transactions']), 'notes' => implode(', ', $data['transactions']),
]; ];
$journal = $repository->store($journalData); $repository->store($journalData);
} }
Log::debug('End of routine.'); Log::debug('End of routine.');
Preferences::mark();
Session::flash('success', trans('firefly.reconciliation_stored')); Session::flash('success', trans('firefly.reconciliation_stored'));
return redirect(route('accounts.show', [$account->id])); return redirect(route('accounts.show', [$account->id]));
@@ -438,6 +440,8 @@ class ReconcileController extends Controller
$this->repository->update($journal, $data); $this->repository->update($journal, $data);
// @codeCoverageIgnoreStart // @codeCoverageIgnoreStart
if (1 === (int)$request->get('return_to_edit')) { if (1 === (int)$request->get('return_to_edit')) {
Session::put('reconcile.edit.fromUpdate', true); Session::put('reconcile.edit.fromUpdate', true);

5
resources/views/accounts/reconcile/transactions.twig
View File

@@ -88,14 +88,13 @@
{% set transactionAmount = transaction.transaction_foreign_amount %} {% set transactionAmount = transaction.transaction_foreign_amount %}
{% endif %} {% endif %}
{% if transaction.reconciled %} {% if transaction.reconciled %}
{{ transaction|transactionReconciled }} {{ transaction|transactionReconciled }}
<input type="hidden" name="cleared[]" data-younger="{% if transaction.date > end %}true{% else %}false{% endif %}" <input type="hidden" name="cleared[]" data-younger="{% if transaction.date < start %}true{% else %}false{% endif %}"
class="cleared" data-id="{{ transaction.id }}" value="{{ transactionAmount }}"> class="cleared" data-id="{{ transaction.id }}" value="{{ transactionAmount }}">
{% else %} {% else %}
<input type="checkbox" name="reconciled[]" <input type="checkbox" name="reconciled[]"
data-younger="{% if transaction.date > end %}true{% else %}false{% endif %}" data-younger="{% if transaction.date < start %}true{% else %}false{% endif %}"
value="{{ transactionAmount }}" data-id="{{ transaction.id }}" disabled class="reconcile_checkbox"> value="{{ transactionAmount }}" data-id="{{ transaction.id }}" disabled class="reconcile_checkbox">
{% endif %} {% endif %}
</td> </td>