Merge pull request #8417 from cfpb/tccp/detail-fees-cleanup

TCCP: Cleanup detail page fee logic
cfpb · May 17, 2024 · a6e7fe1 · a6e7fe1
2 parents 57fed3e + 0ef644b
commit a6e7fe1
Showing 1 changed file with 8 additions and 41 deletions.
diff --git a/cfgov/tccp/jinja2/tccp/card.html b/cfgov/tccp/jinja2/tccp/card.html
@@ -386,31 +386,12 @@ <h2>
             - Other fee: "$50 {fee name, period}"
             - Annual and other fee: "$495 annual fee + $50 {fee name, period}"
             - No periodic fee: "$0 annual fee"
-            - Fee that varies: "$25 - $55 annual/monthly fee"
         #}
         <div class="m-payment-calculation u-mb15">
-            {% if card.annual_fee or not card.periodic_fee_type %}
+            {% if card.annual_fee %}
                 <div class="m-payment-calculation__part">
                     <div class="h2 u-mb0 u-mt0">
-                        {# A handful of cards have both an annual and monthly
-                            fee with one of those fees varying. Because of how
-                            the data is (not) structured, we can only tell which
-                            fee varies by looking for either "annual" or
-                            "monthly" in the text of the fee explanation.
-                        #}
-                        {% if card.fee_varies %}
-                            {% if card.periodic_fee_type | join == "Annual" %}
-                                {{ currency(card.periodic_min) ~ ' - '
-                                    ~ currency(card.periodic_max) }}
-                            {% elif card.fee_explanation.lower().count('annual') %}
-                                {{ currency(card.periodic_min) ~ ' - '
-                                    ~ currency(card.periodic_max) }}
-                            {% else %}
-                                {{ currency(card.annual_fee) }}
-                            {% endif %}
-                        {% else %}
-                            {{ currency(card.annual_fee) if card.annual_fee else currency(0) }}
-                        {% endif %}
+                        {{ currency(card.annual_fee) if card.annual_fee else currency(0) }}
                         <span class="u-visually-hidden">Annual fee</span>
                     </div>
                     <div class="h4 u-mt0 u-mb0" aria-hidden="true">
@@ -424,25 +405,7 @@ <h2>
                 {% endif %}
                 <div class="m-payment-calculation__part">
                     <div class="h2 u-mb0 u-mt0">
-                        {# A handful of cards have both an annual and monthly
-                            fee with one of those fees varying. Because of how
-                            the data is (not) structured, we can only tell which
-                            fee varies by looking for either "annual" or
-                            "monthly" in the text of the fee explanation.
-                        #}
-                        {% if card.fee_varies %}
-                            {% if card.periodic_fee_type | join == "Monthly" %}
-                                {{ currency(card.periodic_min) ~ ' - '
-                                    ~ currency(card.periodic_max) }}
-                            {% elif card.fee_explanation.lower().count('monthly') %}
-                                {{ currency(card.periodic_min) ~ ' - '
-                                    ~ currency(card.periodic_max) }}
-                            {% else %}
-                                {{ currency(card.monthly_fee) }}
-                            {% endif %}
-                        {% else %}
-                            {{ currency(card.monthly_fee) }}
-                        {% endif %}
+                        {{ currency(card.monthly_fee) if card.monthly_fee else currency(0) }}
                         <span class="u-visually-hidden">Monthly fee</span>
                     </div>
                     <div class="h4 u-mt0 u-mb0" aria-hidden="true">
@@ -465,7 +428,11 @@ <h2>
                 </div>
             {% endif %}
             {% if card.other_periodic_fee_amount %}
-                {% if card.annual_fee or card.monthly_fee or card.weekly_fee %}
+                {% if
+                    card.annual_fee
+                    or card.monthly_fee
+                    or card.weekly_fee
+                %}
                     <div class="m-payment-calculation__operator h2">+</div>
                 {% endif %}
                 <div class="m-payment-calculation__part">