diff --git a/resources/views/v1/accounts/delete.twig b/resources/views/v1/accounts/delete.twig index bd366b509b..76b61ae2a3 100644 --- a/resources/views/v1/accounts/delete.twig +++ b/resources/views/v1/accounts/delete.twig @@ -33,7 +33,7 @@ {% endif %}

{% endif %} - {% if account.transactions.count > 0 and account.accountType.type == 'Asset account' %} + {% if account.transactions.count() > 0 and account.accountType.type == 'Asset account' %}

{{ trans_choice('firefly.save_transactions_by_moving', account.transactions|length ) }}

diff --git a/resources/views/v1/accounts/show.twig b/resources/views/v1/accounts/show.twig index 944083cfe8..9744a83cdf 100644 --- a/resources/views/v1/accounts/show.twig +++ b/resources/views/v1/accounts/show.twig @@ -7,7 +7,7 @@ {% block content %}
-
+

@@ -32,7 +32,7 @@

- {% if attachments.count > 0 %} + {% if attachments.count() > 0 %}
@@ -115,7 +115,7 @@
{% endif %} - {% if account.notes.count == 1 %} + {% if account.notes.count() == 1 %}
diff --git a/resources/views/v1/bills/delete.twig b/resources/views/v1/bills/delete.twig index b717d8bf37..3f3284af8e 100644 --- a/resources/views/v1/bills/delete.twig +++ b/resources/views/v1/bills/delete.twig @@ -24,8 +24,8 @@

- {% if bill.transactionjournals.count > 0 %} - {{ Lang.choice('form.bill_keep_transactions', bill.transactionjournals.count,{count: bill.transactionjournals.count}) }} + {% if bill.transactionjournals.count() > 0 %} + {{ Lang.choice('form.bill_keep_transactions', bill.transactionjournals.count(),{count: bill.transactionjournals.count()}) }} {% endif %}

diff --git a/resources/views/v1/bills/edit.twig b/resources/views/v1/bills/edit.twig index d916d702a4..f55a38dc95 100644 --- a/resources/views/v1/bills/edit.twig +++ b/resources/views/v1/bills/edit.twig @@ -17,8 +17,8 @@

{{ 'mandatoryFields'|_ }}

- {% if rules.count > 0 %} - {{ ExpandedForm.text('name',null, {helpText: trans_choice('firefly.bill_edit_rules', rules.count)}) }} + {% if rules.count() > 0 %} + {{ ExpandedForm.text('name',null, {helpText: trans_choice('firefly.bill_edit_rules', rules.count())}) }} {% else %} {{ ExpandedForm.text('name') }} {% endif %} diff --git a/resources/views/v1/bills/show.twig b/resources/views/v1/bills/show.twig index 05c2f751bb..7efc81111f 100644 --- a/resources/views/v1/bills/show.twig +++ b/resources/views/v1/bills/show.twig @@ -85,7 +85,7 @@

{{ 'bill_related_rules'|_ }}

- {% if rules.count > 0 %} + {% if rules.count() > 0 %}
    {% for rule in rules %}
  • {{ rule.title }} @@ -116,7 +116,7 @@ {% endif %} - {% if attachments.count > 0 %} + {% if attachments.count() > 0 %}

    {{ 'attachments'|_ }}

    diff --git a/resources/views/v1/budgets/delete.twig b/resources/views/v1/budgets/delete.twig index 523f8e8781..be71b1d140 100644 --- a/resources/views/v1/budgets/delete.twig +++ b/resources/views/v1/budgets/delete.twig @@ -25,8 +25,8 @@

    - {% if budget.transactionjournals.count > 0 %} - {{ Lang.choice('form.budget_keep_transactions', budget.transactionjournals.count, {count: budget.transactionjournals.count }) }} + {% if budget.transactionjournals.count() > 0 %} + {{ Lang.choice('form.budget_keep_transactions', budget.transactionjournals.count(), {count: budget.transactionjournals.count() }) }} {% endif %}

    diff --git a/resources/views/v1/budgets/index.twig b/resources/views/v1/budgets/index.twig index b296cd689e..1e0b0fa08d 100644 --- a/resources/views/v1/budgets/index.twig +++ b/resources/views/v1/budgets/index.twig @@ -197,7 +197,7 @@ {% endif %}
    {% endif %} - {% if budgets|length == 0 and inactive.count == 0 %} + {% if budgets|length == 0 and inactive.count() == 0 %} {% include 'partials.empty' with {objectType: 'default', type: 'budgets',route: route('budgets.create')} %} {# make FF ignore demo for now. #} {% set shownDemo = true %} @@ -243,7 +243,7 @@ {% endif %} {% endif %} - {% if budget.attachments.count > 0 %} + {% if budget.attachments.count() > 0 %} {% endif %} @@ -284,7 +284,7 @@ style="display:none;"> {% endfor %} {% endif %} - {% if budget.budgeted|length < currencies.count %} + {% if budget.budgeted|length < currencies.count() %} @@ -394,7 +394,7 @@
- {% if paginator.count > 0 and inactive.count > 0 %} + {% if paginator.count() > 0 and inactive.count() > 0 %}
diff --git a/resources/views/v1/budgets/show.twig b/resources/views/v1/budgets/show.twig index d4cfbdb76a..0c18acd7b1 100644 --- a/resources/views/v1/budgets/show.twig +++ b/resources/views/v1/budgets/show.twig @@ -6,7 +6,7 @@ {% block content %}
-
+

@@ -38,7 +38,7 @@ {% endif %}

- {% if attachments.count > 0 %} + {% if attachments.count() > 0 %}
diff --git a/resources/views/v1/categories/delete.twig b/resources/views/v1/categories/delete.twig index 2873573ec5..9d5c4dec09 100644 --- a/resources/views/v1/categories/delete.twig +++ b/resources/views/v1/categories/delete.twig @@ -24,8 +24,8 @@

- {% if category.transactionjournals.count > 0 %} - {{ Lang.choice('form.category_keep_transactions', category.transactionjournals.count, {count: category.transactionjournals.count }) }} + {% if category.transactionjournals.count() > 0 %} + {{ Lang.choice('form.category_keep_transactions', category.transactionjournals.count(), {count: category.transactionjournals.count() }) }} {% endif %}

diff --git a/resources/views/v1/categories/index.twig b/resources/views/v1/categories/index.twig index 4754267898..e73ec09bdf 100644 --- a/resources/views/v1/categories/index.twig +++ b/resources/views/v1/categories/index.twig @@ -5,7 +5,7 @@ {% endblock %} {% block content %} - {% if categories.count > 0 %} + {% if categories.count() > 0 %}
diff --git a/resources/views/v1/categories/show.twig b/resources/views/v1/categories/show.twig index 5865a04a12..0c519ee6c7 100644 --- a/resources/views/v1/categories/show.twig +++ b/resources/views/v1/categories/show.twig @@ -8,7 +8,7 @@
{% if Route.getCurrentRoute.getName == 'categories.show' %} {# both charts #} -
+

@@ -20,7 +20,7 @@

-
+

@@ -35,7 +35,7 @@ {% endif %} {% if Route.getCurrentRoute.getName == 'categories.show.all' %} {# all chart #} -
+

@@ -48,7 +48,7 @@

{% endif %} - {% if attachments.count > 0 %} + {% if attachments.count() > 0 %}
diff --git a/resources/views/v1/list/accounts.twig b/resources/views/v1/list/accounts.twig index eed834c4e5..02e3e21b48 100644 --- a/resources/views/v1/list/accounts.twig +++ b/resources/views/v1/list/accounts.twig @@ -36,7 +36,7 @@ {% if account.location %} {% endif %} - {% if account.attachments.count > 0 %} + {% if account.attachments.count() > 0 %} {% endif %} diff --git a/resources/views/v1/list/bills.twig b/resources/views/v1/list/bills.twig index 92fb9047df..958ba080d3 100644 --- a/resources/views/v1/list/bills.twig +++ b/resources/views/v1/list/bills.twig @@ -38,7 +38,7 @@ {% endif %} {{ entry.name }} {# count attachments #} - {% if entry.attachments.count > 0 %} + {% if entry.attachments.count() > 0 %} {% endif %} diff --git a/resources/views/v1/list/categories.twig b/resources/views/v1/list/categories.twig index de31f39fc8..115f4a131c 100644 --- a/resources/views/v1/list/categories.twig +++ b/resources/views/v1/list/categories.twig @@ -25,7 +25,7 @@ {{ category.name }} - {% if category.attachments.count > 0 %} + {% if category.attachments.count() > 0 %} {% endif %} diff --git a/resources/views/v1/list/piggy-banks.twig b/resources/views/v1/list/piggy-banks.twig index b7e010d120..12f0bc8d1f 100644 --- a/resources/views/v1/list/piggy-banks.twig +++ b/resources/views/v1/list/piggy-banks.twig @@ -41,7 +41,7 @@ {{ piggy.name }} - {% if piggy.attachments.count > 0 %} + {% if piggy.attachments.count() > 0 %} {% endif %} diff --git a/resources/views/v1/piggy-banks/show.twig b/resources/views/v1/piggy-banks/show.twig index 5dba31c53b..100e99feda 100644 --- a/resources/views/v1/piggy-banks/show.twig +++ b/resources/views/v1/piggy-banks/show.twig @@ -117,7 +117,7 @@
{% endif %} - {% if attachments.count > 0 %} + {% if attachments.count() > 0 %}
diff --git a/resources/views/v1/rules/index.twig b/resources/views/v1/rules/index.twig index 2e4bcb4072..0bb763b408 100644 --- a/resources/views/v1/rules/index.twig +++ b/resources/views/v1/rules/index.twig @@ -55,7 +55,7 @@ {{ ruleGroup.description }}

- {% if ruleGroup.rules.count > 0 %} + {% if ruleGroup.rules.count() > 0 %} @@ -120,7 +120,7 @@
{% if rule.strict %}{{ 'rule_is_strict'|_ }}{% else %}{{ 'rule_is_not_strict'|_ }}{% endif %}