mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-27 05:51:56 +00:00
Small bill related fixes.
This commit is contained in:
@@ -399,6 +399,13 @@ class SingleController extends Controller
|
|||||||
// @codeCoverageIgnoreEnd
|
// @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);
|
$journal = $repository->update($journal, $data);
|
||||||
/** @var array $files */
|
/** @var array $files */
|
||||||
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;
|
$files = $request->hasFile('attachments') ? $request->file('attachments') : null;
|
||||||
|
|||||||
@@ -144,6 +144,10 @@ class SplitController extends Controller
|
|||||||
return $this->redirectToAccount($journal); // @codeCoverageIgnore
|
return $this->redirectToAccount($journal); // @codeCoverageIgnore
|
||||||
}
|
}
|
||||||
$data = $request->getAll();
|
$data = $request->getAll();
|
||||||
|
|
||||||
|
// keep current bill:
|
||||||
|
$data['bill_id'] = $journal->bill_id;
|
||||||
|
|
||||||
$journal = $this->repository->update($journal, $data);
|
$journal = $this->repository->update($journal, $data);
|
||||||
|
|
||||||
/** @var array $files */
|
/** @var array $files */
|
||||||
|
|||||||
@@ -42,16 +42,6 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</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>
|
<tr>
|
||||||
<td>{{ 'next_expected_match'|_ }}</td>
|
<td>{{ 'next_expected_match'|_ }}</td>
|
||||||
<td>
|
<td>
|
||||||
|
|||||||
Reference in New Issue
Block a user