diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index bedb1653be..d24c1a1c65 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -1006,6 +1006,14 @@ return [ 'no_transactions_intro_transfers' => 'You have no transfers yet. When you move money between asset accounts, it is recorded as a transfer.', 'no_transactions_imperative_transfers' => 'Have you moved some money around? Then you should write it down:', 'no_transactions_create_transfers' => 'Create a new transfer', + 'no_piggies_title_default' => 'Let\'s create a piggy bank', + 'no_piggies_intro_default' => 'You have no piggy banks yet. You can create piggy banks to divide your savings and keep track of what you\'re saving up for.', + 'no_piggies_imperative_default' => 'Do you have things you\'re saving money for? Create a piggy bank and keep track:', + 'no_piggies_create_default' => 'Create a new piggy bank', + 'no_bills_title_default' => 'Let\'s create a bill', + 'no_bills_intro_default' => 'You have no bills yet. You can create bills to keep track of regular expenses, like your rent of insurance.', + 'no_bills_imperative_default' => 'Do you have such regular bills? Create a bill and keep track of your payments:', + 'no_bills_create_default' => 'Create a new bill', ]; diff --git a/resources/views/bills/index.twig b/resources/views/bills/index.twig index 28bc6261fe..b56f32da2b 100644 --- a/resources/views/bills/index.twig +++ b/resources/views/bills/index.twig @@ -5,33 +5,30 @@ {% endblock %} {% block content %} -
-
-
-
-

{{ title }}

+ {% if bills.count == 0 %} + {% include 'partials.empty' with {what: 'default', type: 'bills',route: route('bills.create')} %} + {% else %} +
+
+
+
+

{{ title }}

- -
-
- - + +
+
+ + +
-
-
- {% include 'list/bills' %} +
+ {% include 'list/bills' %} +
-
-{% endblock %} -{% block styles %} - -{% endblock %} - -{% block scripts %} - -{% endblock %} + {% endif %} +{% endblock %} \ No newline at end of file diff --git a/resources/views/piggy-banks/index.twig b/resources/views/piggy-banks/index.twig index 821b731c9a..981fa84fb5 100644 --- a/resources/views/piggy-banks/index.twig +++ b/resources/views/piggy-banks/index.twig @@ -5,54 +5,58 @@ {% endblock %} {% block content %} -
-
-
-
-

{{ 'piggyBanks'|_ }}

-
-
- {% include 'list/piggy-banks' %} + {% if piggyBanks.count == 0 %} + {% include 'partials.empty' with {what: 'default', type: 'piggies',route: route('piggy-banks.create')} %} + {% else %} +
+
+
+
+

{{ 'piggyBanks'|_ }}

+
+
+ {% include 'list/piggy-banks' %} +
-
-
-
-
-
-

{{ 'account_status'|_ }}

-
-
- - - - - - - - - - - - - {% for id,info in accounts %} +
+
+
+
+

{{ 'account_status'|_ }}

+
+
+
{{ 'account'|_ }}{{ 'left_for_piggy_banks'|_ }}
+ - - - - - - + + + + + + - {% endfor %} - -
{{ info.name }}{{ info.leftForPiggyBanks|formatAmount }}{{ 'account'|_ }}{{ 'left_for_piggy_banks'|_ }}
+ + + {% for id,info in accounts %} + + {{ info.name }} + {{ info.balance|formatAmount }} + {{ info.leftForPiggyBanks|formatAmount }} + {{ info.sumOfTargets|formatAmount }} + {{ info.sumOfSaved|formatAmount }} + {{ info.leftToSave|formatAmount }} + + {% endfor %} + + +
-
+ {% endif %} {% endblock %} {% block scripts %}