From ed3a4e466329e185cf64731de152eb105c3b189d Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 11 Mar 2018 14:19:28 +0100 Subject: [PATCH] View extension for amounts [skip ci] --- resources/views/transactions/show.twig | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig index 0867e62dcb..f6e2702124 100644 --- a/resources/views/transactions/show.twig +++ b/resources/views/transactions/show.twig @@ -91,8 +91,17 @@ {% if transactions|length > 2 %} ({% for transaction in transactions %} - {{ transaction|transactionArrayAmount }} - {% if loop.index != loop.length %}, {% endif %} + {% if transaction.type == 'Deposit' and transaction.amount > 0 %} + {{ transaction|transactionArrayAmount }}{% if loop.index != loop.length %}, {% endif %} + {% endif %} + {% if transaction.type == 'Withdrawal' and transaction.amount < 0 %} + {{ transaction|transactionArrayAmount }}{% if loop.index != loop.length %}, {% endif %} + {% endif %} + + {% if transaction.type == 'Transfer' and transaction.amount > 0 %} + {{ transaction|transactionArrayAmount }}{% if loop.index != loop.length %}, {% endif %} + {% endif %} + {% endfor %}) {% endif %} @@ -391,8 +400,7 @@ {% if ((transaction.type == 'Withdrawal') and transaction.identifier == x and transaction.amount < 0) or - ((transaction.type == 'Deposit' or transaction.type == 'Transfer') and transaction.identifier == x and transaction.amount > 0) - %} + ((transaction.type == 'Deposit' or transaction.type == 'Transfer') and transaction.identifier == x and transaction.amount > 0) %} {% if transaction.description == "" %} {{ journal.description }} @@ -420,12 +428,14 @@ {% if transaction.budget_id %} - {{ transaction.budget_name }} + {{ transaction.budget_name }} {% endif %} {% if transaction.category_id %} - {{ transaction.category_name }} + {{ transaction.category_name }} {% endif %} {% endif %}