IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-28 18:01:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add links to transaction from dates in bill

Browse Source
This commit is contained in:
HamuZ HamuZ 2018-10-17 18:17:16 +03:00
parent 67cd3b6f81
commit 43c9737e6e
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Repositories/Bill/BillRepository.php
View File

@ -381,7 +381,9 @@ class BillRepository implements BillRepositoryInterface
*/ */
public function getPaidDatesInRange(Bill $bill, Carbon $start, Carbon $end): Collection public function getPaidDatesInRange(Bill $bill, Carbon $start, Carbon $end): Collection
{ {
$dates = $bill->transactionJournals()->before($end)->after($start)->get(['transaction_journals.date'])->pluck('date'); $dates = $bill->transactionJournals()->before($end)->after($start)->get([
'transaction_journals.id','transaction_journals.date'
])->pluck('date', 'id');
return $dates; return $dates;
} }

7
resources/views/list/bills.twig
View File

@ -97,8 +97,11 @@
#} #}
{% if entry.paid_dates|length > 0 and entry.active %} {% if entry.paid_dates|length > 0 and entry.active %}
<td class="paid_in_period text-success" data-value="{{ entry.paid_dates[0] }}"> <td class="paid_in_period text-success" data-value="{{ entry.paid_dates[0] }}">
{% for date in entry.paid_dates %} {% for transaction_id, date in entry.paid_dates %}
{{ formatDate(date, monthAndDayFormat) }}<br/> <a href="{{ route('transactions.show',transaction_id) }}">
{{ formatDate(date, monthAndDayFormat) }}
</a>
<br/>
{% endfor %} {% endfor %}
</td> </td>
<td class="expected_in_period hidden-sm hidden-xs" data-value="{{ entry.next_expected_match }}"> <td class="expected_in_period hidden-sm hidden-xs" data-value="{{ entry.next_expected_match }}">