From 00c96f5b71d4255a0a3ef30ad0fa755ecef4e17f Mon Sep 17 00:00:00 2001
From: tleb <theo.lebrun@live.fr>
Date: Thu, 24 Oct 2019 14:40:26 +0200
Subject: [PATCH] eboutic: fix account amount

---
 eboutic/templates/eboutic/eboutic_main.jinja        |  3 +++
 eboutic/templates/eboutic/eboutic_makecommand.jinja |  4 ++++
 eboutic/views.py                                    | 10 ++++++++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/eboutic/templates/eboutic/eboutic_main.jinja b/eboutic/templates/eboutic/eboutic_main.jinja
index 86d1e66a..d416161e 100644
--- a/eboutic/templates/eboutic/eboutic_main.jinja
+++ b/eboutic/templates/eboutic/eboutic_main.jinja
@@ -33,10 +33,13 @@
     </ul>
     <p>
         <strong>{% trans %}Basket amount: {% endtrans %}{{ "%0.2f"|format(basket.get_total()) }} €</strong>
+
+        {% if customer_amount != None %}
         <br>
         {% trans %}Current account amount: {% endtrans %}<strong>{{ "%0.2f"|format(customer_amount) }} €</strong>
         <br>
         {% trans %}Remaining account amount: {% endtrans %}<strong>{{ "%0.2f"|format(customer_amount - basket.get_total()) }} €</strong>
+        {% endif %}
     </p>
 
     <form method="post" action="{{ url('eboutic:command') }}">
diff --git a/eboutic/templates/eboutic/eboutic_makecommand.jinja b/eboutic/templates/eboutic/eboutic_makecommand.jinja
index 676bcda5..b9a3ed4d 100644
--- a/eboutic/templates/eboutic/eboutic_makecommand.jinja
+++ b/eboutic/templates/eboutic/eboutic_makecommand.jinja
@@ -27,12 +27,16 @@
             {% endfor %}
         <tbody>
     </table>
+
     <p>
         <strong>{% trans %}Basket amount: {% endtrans %}{{ "%0.2f"|format(basket.get_total()) }} €</strong>
+
+        {% if customer_amount != None %}
         <br>
         {% trans %}Current account amount: {% endtrans %}<strong>{{ "%0.2f"|format(customer_amount) }} €</strong>
         <br>
         {% trans %}Remaining account amount: {% endtrans %}<strong>{{ "%0.2f"|format(customer_amount - basket.get_total()) }} €</strong>
+        {% endif %}
     </p>
     {% if settings.SITH_EBOUTIC_CB_ENABLED %}
     <form method="post" action="{{ settings.SITH_EBOUTIC_ET_URL }}">
diff --git a/eboutic/views.py b/eboutic/views.py
index a5697dce..45d79249 100644
--- a/eboutic/views.py
+++ b/eboutic/views.py
@@ -107,7 +107,10 @@ class EbouticMain(TemplateView):
         kwargs["basket"] = self.basket
         kwargs["eboutic"] = Counter.objects.filter(type="EBOUTIC").first()
         kwargs["categories"] = ProductType.objects.all()
-        kwargs["customer_amount"] = self.request.user.customer.amount
+        if hasattr(self.request.user, "customer"):
+            kwargs["customer_amount"] = self.request.user.customer.amount
+        else:
+            kwargs["customer_amount"] = None
         if not self.request.user.was_subscribed:
             kwargs["categories"] = kwargs["categories"].exclude(
                 id=settings.SITH_PRODUCTTYPE_SUBSCRIPTION
@@ -151,7 +154,10 @@ class EbouticCommand(TemplateView):
 
     def get_context_data(self, **kwargs):
         kwargs = super(EbouticCommand, self).get_context_data(**kwargs)
-        kwargs["customer_amount"] = self.request.user.customer.amount
+        if hasattr(self.request.user, "customer"):
+            kwargs["customer_amount"] = self.request.user.customer.amount
+        else:
+            kwargs["customer_amount"] = None
         kwargs["et_request"] = OrderedDict()
         kwargs["et_request"]["PBX_SITE"] = settings.SITH_EBOUTIC_PBX_SITE
         kwargs["et_request"]["PBX_RANG"] = settings.SITH_EBOUTIC_PBX_RANG