shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #2611 and #2612 Fixed: Reconciliations Do Not Save Properly, Reconciliations Saving Unchecked Transactions as Cleared

Browse Source
This commit is contained in:
Cüneyt Şentürk 2022-09-05 17:03:29 +03:00
parent 2421bd9a8e
commit 05aa6a84c3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Jobs/Banking/UpdateReconciliation.php
View File

@ -21,14 +21,16 @@ class UpdateReconciliation extends Job implements ShouldUpdate
if ($transactions) { if ($transactions) {
foreach ($transactions as $key => $value) { foreach ($transactions as $key => $value) {
if (empty($value)) { $transaction_reconcile = $reconcile;
continue;
if (empty($value) || $value === 'false') {
$transaction_reconcile = 0;
} }
$t = explode('_', $key); $t = explode('_', $key);
$transaction = Transaction::find($t[1]); $transaction = Transaction::find($t[1]);
$transaction->reconciled = $reconcile; $transaction->reconciled = $transaction_reconcile;
$transaction->save(); $transaction->save();
} }
} }

2
resources/views/banking/reconciliations/edit.blade.php
View File

@ -90,7 +90,7 @@
$checked = $item->reconciled; $checked = $item->reconciled;
if (! $reconciliation->reconciled && array_key_exists($name, $reconciliation->transactions)) { if (! $reconciliation->reconciled && array_key_exists($name, $reconciliation->transactions)) {
$checked = $reconciliation->transactions[$name]; $checked = (empty($reconciliation->transactions[$name]) || $reconciliation->transactions[$name] === 'false') ? 0 : 1;
} }
@endphp @endphp