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

Fix #3437

Browse Source
This commit is contained in:
Florian Dupret 2020-06-16 14:07:40 +02:00
parent b4aafefc2b
commit 7c78708865
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Transformers/BillTransformer.php
View File

@ -83,7 +83,8 @@ class BillTransformer extends AbstractTransformer
'skip' => (int)$bill->skip, 'skip' => (int)$bill->skip,
'active' => $bill->active, 'active' => $bill->active,
'notes' => $notes, 'notes' => $notes,
'next_expected_match' => $paidData['next_expected_match'], 'next_expected_match' => $paidData['next_expected_match']->format('Y-m-d'),
'next_expected_match_diff'=> $paidData['next_expected_match']->isToday() ? trans('firefly.today') : $paidData['next_expected_match']->diffForHumans(Carbon::today(), Carbon::DIFF_RELATIVE_TO_NOW),
'pay_dates' => $payDates, 'pay_dates' => $payDates,
'paid_dates' => $paidData['paid_dates'], 'paid_dates' => $paidData['paid_dates'],
'links' => [ 'links' => [
@ -216,7 +217,7 @@ class BillTransformer extends AbstractTransformer
} }
$result = [ $result = [
'paid_dates' => $result, 'paid_dates' => $result,
'next_expected_match' => $nextMatch->format('Y-m-d'), 'next_expected_match' => $nextMatch,
]; ];
Log::debug('Result', $result); Log::debug('Result', $result);

3
resources/lang/en_US/firefly.php
View File

@ -886,7 +886,8 @@ return [
'bill_store_error' => 'An unexpected error occurred while storing your new bill. Please check the log files', 'bill_store_error' => 'An unexpected error occurred while storing your new bill. Please check the log files',
'list_inactive_rule' => 'inactive rule', 'list_inactive_rule' => 'inactive rule',
'bill_edit_rules' => 'Firefly III will attempt to edit the rule related to this bill as well. If you\'ve edited this rule yourself however, Firefly III won\'t change anything.|Firefly III will attempt to edit the :count rules related to this bill as well. If you\'ve edited these rules yourself however, Firefly III won\'t change anything.', 'bill_edit_rules' => 'Firefly III will attempt to edit the rule related to this bill as well. If you\'ve edited this rule yourself however, Firefly III won\'t change anything.|Firefly III will attempt to edit the :count rules related to this bill as well. If you\'ve edited these rules yourself however, Firefly III won\'t change anything.',
'bill_expected_date' => 'Expected :date',
// accounts: // accounts:
'inactive_account_link' => 'You have :count inactive (archived) account, which you can view on this separate page.|You have :count inactive (archived) accounts, which you can view on this separate page.', 'inactive_account_link' => 'You have :count inactive (archived) account, which you can view on this separate page.|You have :count inactive (archived) accounts, which you can view on this separate page.',
'all_accounts_inactive' => 'These are your inactive accounts.', 'all_accounts_inactive' => 'These are your inactive accounts.',

3
resources/views/v1/list/bills.twig
View File

@ -75,11 +75,10 @@
#} #}
{% if entry.paid_dates|length == 0 and entry.pay_dates|length > 0 and entry.active %} {% if entry.paid_dates|length == 0 and entry.pay_dates|length > 0 and entry.active %}
<td class="paid_in_period text-danger" data-value="0002-00-00"> <td class="paid_in_period text-danger" data-value="0002-00-00">
{{ trans('firefly.not_or_not_yet') }} {{ trans('firefly.bill_expected_date', {date: entry.next_expected_match_diff }) }}
</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 }}">
{% for date in entry.pay_dates %} {% for date in entry.pay_dates %}
{#{{ formatDate(entry.next_expected_match, monthAndDayFormat) }}<br>#}
{{ formatDate(date, monthAndDayFormat) }}<br> {{ formatDate(date, monthAndDayFormat) }}<br>
{% endfor %} {% endfor %}