From fd0dc3d289196ac16ce7869d55abf64274999208 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Tue, 23 Feb 2021 17:43:34 +0100
Subject: [PATCH] Experimental fix for
 https://github.com/firefly-iii/firefly-iii/issues/4424

---
 app/Mail/ReportNewJournalsMail.php            | 12 ++--
 app/Support/Twig/General.php                  | 14 +++++
 .../v1/emails/report-new-journals-html.twig   | 58 +++++++++----------
 .../v1/emails/report-new-journals-text.twig   |  4 +-
 .../v2/emails/report-new-journals-html.twig   | 58 +++++++++----------
 .../v2/emails/report-new-journals-text.twig   | 14 ++---
 6 files changed, 85 insertions(+), 75 deletions(-)

diff --git a/app/Mail/ReportNewJournalsMail.php b/app/Mail/ReportNewJournalsMail.php
index fd962f1325..36b1c3fe1c 100644
--- a/app/Mail/ReportNewJournalsMail.php
+++ b/app/Mail/ReportNewJournalsMail.php
@@ -40,14 +40,10 @@ class ReportNewJournalsMail extends Mailable
 {
     use Queueable, SerializesModels;
 
-    /** @var string Email address of the user */
-    public $email;
-    /** @var Collection A collection of groups */
-    public $groups;
-    /** @var string IP address of user (if known) */
-    public $ipAddress;
-    /** @var array All groups, transformed to array. */
-    public $transformed;
+    public string $email;
+    public Collection $groups;
+    public string $ipAddress;
+    public array $transformed;
 
     /**
      * ConfirmEmailChangeMail constructor.
diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php
index acc13aaf5e..7812e9434a 100644
--- a/app/Support/Twig/General.php
+++ b/app/Support/Twig/General.php
@@ -50,6 +50,7 @@ class General extends AbstractExtension
             $this->formatFilesize(),
             $this->mimeIcon(),
             $this->markdown(),
+            $this->floatval(),
         ];
     }
 
@@ -297,6 +298,19 @@ class General extends AbstractExtension
         );
     }
 
+    /**
+     * @return TwigFilter
+     */
+    protected function floatval(): TwigFilter
+    {
+        return new TwigFilter(
+            'floatval',
+            static function ($value): float {
+                return (float)$value;
+            }
+        );
+    }
+
     /**
      * Show icon with attachment.
      *
diff --git a/resources/views/v1/emails/report-new-journals-html.twig b/resources/views/v1/emails/report-new-journals-html.twig
index 50e0a80b02..dd866a5600 100644
--- a/resources/views/v1/emails/report-new-journals-html.twig
+++ b/resources/views/v1/emails/report-new-journals-html.twig
@@ -15,23 +15,23 @@
                 <!-- amount -->
                 {% if journal.type == 'deposit' %}
                     <span style="color:#3c763d;">
-                {{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
+                {{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}
                         {% if null != journal.foreign_amount*-1 %}
-                            ({{ formatAmountBySymbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
+                            ({{ formatAmountBySymbol(journal.foreign_amount|floatval, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
                         {% endif %}
                   </span>
                 {% elseif journal.type == 'transfer' %}
                     <span style="color:#31708f">
-                        {{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
+                        {{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}
                         {% if null != journal.foreign_amount %}
-                            ({{ formatAmountBySymbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
+                            ({{ formatAmountBySymbol((journal.foreign_amount*-1)|floatval, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
                         {% endif %}
                 </span>
                 {% else %}
                     <span style="color:#a94442">
-                    {{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
+                    {{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}
                         {% if null != journal.foreign_amount %}
-                            ({{ formatAmountBySymbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
+                            ({{ formatAmountBySymbol((journal.foreign_amount*-1)|floatval, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
                         {% endif %}
                     </span>
 
@@ -41,33 +41,33 @@
                 <a href="{{ route('transactions.show', [group.id]) }}">{{ group.group_title }}</a>
                 <ol>
                     {% for journal in group.transactions %}
-                    <li>
-                        {{ journal.description }},
-                        <!-- amount -->
-                        {% if journal.type == 'deposit' %}
-                            <span style="color:#3c763d;">
-                {{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
-                                {% if null != journal.foreign_amount*-1 %}
-                                    ({{ formatAmountBySymbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
-                                {% endif %}
+                        <li>
+                            {{ journal.description }},
+                            <!-- amount -->
+                            {% if journal.type == 'deposit' %}
+                                <span style="color:#3c763d;">
+                {{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}
+                                    {% if null != journal.foreign_amount*-1 %}
+                                        ({{ formatAmountBySymbol(journal.foreign_amount|floatval, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
+                                    {% endif %}
                   </span>
-                        {% elseif journal.type == 'transfer' %}
-                            <span style="color:#31708f">
-                        {{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
-                                {% if null != journal.foreign_amount %}
-                                    ({{ formatAmountBySymbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
-                                {% endif %}
+                            {% elseif journal.type == 'transfer' %}
+                                <span style="color:#31708f">
+                        {{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}
+                                    {% if null != journal.foreign_amount %}
+                                        ({{ formatAmountBySymbol((journal.foreign_amount*-1)|floatval, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
+                                    {% endif %}
                 </span>
-                        {% else %}
-                            <span style="color:#a94442">
-                    {{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
-                                {% if null != journal.foreign_amount %}
-                                    ({{ formatAmountBySymbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
-                                {% endif %}
+                            {% else %}
+                                <span style="color:#a94442">
+                    {{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}
+                                    {% if null != journal.foreign_amount %}
+                                        ({{ formatAmountBySymbol((journal.foreign_amount*-1)|floatval, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
+                                    {% endif %}
                     </span>
 
-                        {% endif %}
-                    </li>
+                            {% endif %}
+                        </li>
                     {% endfor %}
                 </ol>
             {% endif %}
diff --git a/resources/views/v1/emails/report-new-journals-text.twig b/resources/views/v1/emails/report-new-journals-text.twig
index 78ca2ae5a8..34c7455536 100644
--- a/resources/views/v1/emails/report-new-journals-text.twig
+++ b/resources/views/v1/emails/report-new-journals-text.twig
@@ -5,10 +5,10 @@
 {% for group in transformed %}
 {% set count = group.transactions|length %}
 {% if 1 == count %}{% set journal = group.transactions[0] %}
-- {{ journal.description }}, {% if journal.type == 'deposit' %}{{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount*-1 %} ({{ formatAmountBySymbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% elseif journal.type == 'transfer' %}{{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount %} ({{ formatAmountBySymbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% else %}{{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount %} ({{ formatAmountBySymbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% endif %}
+- {{ journal.description }}, {% if journal.type == 'deposit' %}{{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount*-1 %} ({{ formatAmountBySymbol(journal.foreign_amount|floatval, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% elseif journal.type == 'transfer' %}{{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount %} ({{ formatAmountBySymbol(journal.foreign_amount|floatval*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% else %}{{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount %} ({{ formatAmountBySymbol(journal.foreign_amount|floatval*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% endif %}
 
 {% else %}- {{ group.group_title }}
-{% for journal in group.transactions %}--  {{ journal.description }}, {% if journal.type == 'deposit' %}{{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount*-1 %} ({{ formatAmountBySymbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% elseif journal.type == 'transfer' %}{{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount %} ({{ formatAmountBySymbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% else %}{{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount %} ({{ formatAmountBySymbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% endif %}
+{% for journal in group.transactions %}--  {{ journal.description }}, {% if journal.type == 'deposit' %}{{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount*-1 %} ({{ formatAmountBySymbol(journal.foreign_amount|floatval, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% elseif journal.type == 'transfer' %}{{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount %} ({{ formatAmountBySymbol(journal.foreign_amount|floatval*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% else %}{{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount %} ({{ formatAmountBySymbol(journal.foreign_amount|floatval*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% endif %}
 
 {% endfor %}
 {% endif %}
diff --git a/resources/views/v2/emails/report-new-journals-html.twig b/resources/views/v2/emails/report-new-journals-html.twig
index e3d39ffa7f..1289dd18e0 100644
--- a/resources/views/v2/emails/report-new-journals-html.twig
+++ b/resources/views/v2/emails/report-new-journals-html.twig
@@ -15,23 +15,23 @@
                 <!-- amount -->
                 {% if journal.type == 'deposit' %}
                     <span style="color:#3c763d;">
-                {{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
+                {{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}
                         {% if null != journal.foreign_amount*-1 %}
-                            ({{ formatAmountBySymbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
+                            ({{ formatAmountBySymbol(journal.foreign_amount|floatval, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
                         {% endif %}
                   </span>
                 {% elseif journal.type == 'transfer' %}
                     <span style="color:#31708f">
-                        {{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
+                        {{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}
                         {% if null != journal.foreign_amount %}
-                            ({{ formatAmountBySymbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
+                            ({{ formatAmountBySymbol((journal.foreign_amount*-1)|floatval, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
                         {% endif %}
                 </span>
                 {% else %}
                     <span style="color:#a94442">
-                    {{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
+                    {{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}
                         {% if null != journal.foreign_amount %}
-                            ({{ formatAmountBySymbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
+                            ({{ formatAmountBySymbol((journal.foreign_amount*-1)|floatval, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
                         {% endif %}
                     </span>
 
@@ -41,33 +41,33 @@
                 <a href="{{ route('transactions.show', [group.id]) }}">{{ group.group_title }}</a>
                 <ol>
                     {% for journal in group.transactions %}
-                    <li>
-                        {{ journal.description }},
-                        <!-- amount -->
-                        {% if journal.type == 'deposit' %}
-                            <span style="color:#3c763d;">
-                {{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
-                                {% if null != journal.foreign_amount*-1 %}
-                                    ({{ formatAmountBySymbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
-                                {% endif %}
+                        <li>
+                            {{ journal.description }},
+                            <!-- amount -->
+                            {% if journal.type == 'deposit' %}
+                                <span style="color:#3c763d;">
+                {{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}
+                                    {% if null != journal.foreign_amount*-1 %}
+                                        ({{ formatAmountBySymbol(journal.foreign_amount|floatval, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
+                                    {% endif %}
                   </span>
-                        {% elseif journal.type == 'transfer' %}
-                            <span style="color:#31708f">
-                        {{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
-                                {% if null != journal.foreign_amount %}
-                                    ({{ formatAmountBySymbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
-                                {% endif %}
+                            {% elseif journal.type == 'transfer' %}
+                                <span style="color:#31708f">
+                        {{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}
+                                    {% if null != journal.foreign_amount %}
+                                        ({{ formatAmountBySymbol((journal.foreign_amount*-1)|floatval, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
+                                    {% endif %}
                 </span>
-                        {% else %}
-                            <span style="color:#a94442">
-                    {{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}
-                                {% if null != journal.foreign_amount %}
-                                    ({{ formatAmountBySymbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
-                                {% endif %}
+                            {% else %}
+                                <span style="color:#a94442">
+                    {{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}
+                                    {% if null != journal.foreign_amount %}
+                                        ({{ formatAmountBySymbol((journal.foreign_amount*-1)|floatval, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }})
+                                    {% endif %}
                     </span>
 
-                        {% endif %}
-                    </li>
+                            {% endif %}
+                        </li>
                     {% endfor %}
                 </ol>
             {% endif %}
diff --git a/resources/views/v2/emails/report-new-journals-text.twig b/resources/views/v2/emails/report-new-journals-text.twig
index c8cab16b1d..c746e0db48 100644
--- a/resources/views/v2/emails/report-new-journals-text.twig
+++ b/resources/views/v2/emails/report-new-journals-text.twig
@@ -3,14 +3,14 @@
 
 
 {% for group in transformed %}
-{% set count = group.transactions|length %}
-{% if 1 == count %}{% set journal = group.transactions[0] %}
-- {{ journal.description }}, {% if journal.type == 'deposit' %}{{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount*-1 %} ({{ formatAmountBySymbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% elseif journal.type == 'transfer' %}{{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount %} ({{ formatAmountBySymbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% else %}{{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount %} ({{ formatAmountBySymbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% endif %}
+    {% set count = group.transactions|length %}
+    {% if 1 == count %}{% set journal = group.transactions[0] %}
+        - {{ journal.description }}, {% if journal.type == 'deposit' %}{{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount*-1 %} ({{ formatAmountBySymbol(journal.foreign_amount|floatval, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% elseif journal.type == 'transfer' %}{{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount %} ({{ formatAmountBySymbol(journal.foreign_amount|floatval*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% else %}{{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount %} ({{ formatAmountBySymbol(journal.foreign_amount|floatval*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% endif %}
 
-{% else %}- {{ group.group_title }}
-{% for journal in group.transactions %}--  {{ journal.description }}, {% if journal.type == 'deposit' %}{{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount*-1 %} ({{ formatAmountBySymbol(journal.foreign_amount, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% elseif journal.type == 'transfer' %}{{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount %} ({{ formatAmountBySymbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% else %}{{ formatAmountBySymbol(journal.amount*-1, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount %} ({{ formatAmountBySymbol(journal.foreign_amount*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% endif %}
+    {% else %}- {{ group.group_title }}
+        {% for journal in group.transactions %}--  {{ journal.description }}, {% if journal.type == 'deposit' %}{{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount*-1 %} ({{ formatAmountBySymbol(journal.foreign_amount|floatval, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% elseif journal.type == 'transfer' %}{{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount %} ({{ formatAmountBySymbol(journal.foreign_amount|floatval*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% else %}{{ formatAmountBySymbol((journal.amount*-1)|floatval, journal.currency_symbol, journal.currency_decimal_places, false) }}{% if null != journal.foreign_amount %} ({{ formatAmountBySymbol(journal.foreign_amount|floatval*-1, journal.foreign_currency_symbol, journal.foreign_currency_decimal_places, false) }}){% endif %}{% endif %}
 
-{% endfor %}
-{% endif %}
+        {% endfor %}
+    {% endif %}
 {% endfor %}
 {% include 'v2.emails.footer-text' %}