IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Small bill related fixes.

Browse Source
This commit is contained in:
James Cole 2018-04-22 12:01:18 +02:00
parent c2e8a67330
commit ea484a7787
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Transaction/SingleController.php
View File

@ -398,7 +398,14 @@ class SingleController extends Controller
}
// @codeCoverageIgnoreEnd
$data = $request->getJournalData();
$data = $request->getJournalData();
// keep current bill:
$data['bill_id'] = $journal->bill_id;
var_dump($data);
exit;
$journal = $repository->update($journal, $data);
/** @var array $files */
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;

4
app/Http/Controllers/Transaction/SplitController.php
View File

@ -144,6 +144,10 @@ class SplitController extends Controller
return $this->redirectToAccount($journal); // @codeCoverageIgnore
}
$data = $request->getAll();
// keep current bill:
$data['bill_id'] = $journal->bill_id;
$journal = $this->repository->update($journal, $data);
/** @var array $files */

10
resources/views/bills/show.twig
View File

@ -42,16 +42,6 @@
{% endif %}
</td>
</tr>
<tr>
<td>{{ 'bill_will_automatch'|_ }}</td>
<td>
{% if object.data.automatch %}
<i class="fa fa-check fa-fw" title="{{ 'auto_match_on'|_ }}"></i> {{ 'yes'|_ }}
{% else %}
<i class="fa fa-times fa-fw" title="{{ 'auto_match_off'|_ }}"></i> {{ 'no'|_ }}
{% endif %}
</td>
</tr>
<tr>
<td>{{ 'next_expected_match'|_ }}</td>
<td>