Merge branch 'eboutic' into 'master'

eboutic: don't display future account balance if contains refilling item

See merge request ae/Sith!258

eboutic/models.py

@@ -24,6 +24,7 @@
 
 from django.db import models, DataError
 from django.utils.translation import ugettext_lazy as _
+from django.utils.functional import cached_property
 from django.conf import settings
 
 from accounting.models import CurrencyField
@@ -68,6 +69,12 @@ class Basket(models.Model):
         if item.quantity <= 0:
             item.delete()
 
+    @cached_property
+    def contains_refilling_item(self):
+        return self.items.filter(
+            type_id=settings.SITH_COUNTER_PRODUCTTYPE_REFILLING
+        ).exists()
+
     def get_total(self):
         total = 0
         for i in self.items.all():

eboutic/templates/eboutic/eboutic_main.jinja

@@ -37,9 +37,12 @@
         {% if customer_amount != None %}
             <br>
             {% trans %}Current account amount: {% endtrans %}<strong>{{ "%0.2f"|format(customer_amount) }} €</strong>
+
+            {% if not basket.contains_refilling_item %}
             <br>
             {% trans %}Remaining account amount: {% endtrans %}<strong>{{ "%0.2f"|format(customer_amount - basket.get_total()) }} €</strong>
             {% endif %}
+        {% endif %}
     </p>
 
     <form method="post" action="{{ url('eboutic:command') }}">

eboutic/templates/eboutic/eboutic_makecommand.jinja

@@ -34,9 +34,12 @@
         {% if customer_amount != None %}
             <br>
             {% trans %}Current account amount: {% endtrans %}<strong>{{ "%0.2f"|format(customer_amount) }} €</strong>
+
+            {% if not basket.contains_refilling_item %}
             <br>
             {% trans %}Remaining account amount: {% endtrans %}<strong>{{ "%0.2f"|format(customer_amount - basket.get_total()) }} €</strong>
             {% endif %}
+        {% endif %}
     </p>
     {% if settings.SITH_EBOUTIC_CB_ENABLED %}
     <form method="post" action="{{ settings.SITH_EBOUTIC_ET_URL }}">
@@ -48,7 +51,7 @@
         </p>
     </form>
     {% endif %}
-    {% if basket.items.filter(type_id=settings.SITH_COUNTER_PRODUCTTYPE_REFILLING).exists() %}
+    {% if basket.contains_refilling_item %}
     <p>{% trans %}AE account payment disabled because your basket contains refilling items.{% endtrans %}</p>
     {% else %}
     <form method="post" action="{{ url('eboutic:pay_with_sith') }}">