From 29fb771afb3aa787d0fec7203f4cde0a1c8f50ff Mon Sep 17 00:00:00 2001
From: Siarhei Puhach <siarhei.puhach@itechart-group.com>
Date: Fri, 4 Aug 2017 11:01:32 +0300
Subject: [PATCH] Changed payment error place, changed message source to Stripe
 errors handler

---
 datacenterlight/views.py               |  2 +-
 hosting/templates/hosting/payment.html | 32 ++++++++++++++------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index 7dd2a76f..993cb508 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -427,7 +427,7 @@ class OrderConfirmationView(DetailView):
         stripe_utils = StripeUtils()
         card_details = stripe_utils.get_card_details(customer.stripe_id, request.session.get('token'))
         if not card_details.get('response_object') and not card_details.get('paid'):
-            msg = _('Currently its not possible to make payments. Please try later.')
+            msg = card_details.get('error')
             messages.add_message(self.request, messages.ERROR, msg, extra_tags='failed_payment')
             return HttpResponseRedirect(reverse('datacenterlight:payment'))
         context = {
diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html
index 5ef7f1ce..acb5d389 100644
--- a/hosting/templates/hosting/payment.html
+++ b/hosting/templates/hosting/payment.html
@@ -49,15 +49,6 @@
                 </div>
             </div>
         </div>
-        <div class="help-block with-errors">
-                {% for message in messages %}
-                    {% if 'failed_payment' in message.tags %}
-                     <ul class="list-unstyled"><li>
-                         <p class="alert alert-danger">{{ message|safe }}</p>
-                    </li></ul>
-                    {% endif %}
-                {% endfor %}
-            </div>
         <div class="row">
             <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 dcl-billing-sec">
                 <div class="col-xs-12 col-sm-5 col-md-6  billing dcl-billing">
@@ -139,12 +130,23 @@
                                 <div id="card-errors" role="alert"></div>
                                 <div class="row">
                                     <div class="col-xs-12">
-                                        <p class="card-warning-content">
-                                            {% blocktrans %}
-                                            You are not making any payment yet. After submitting your card
-                                            information, you will be taken to the Confirm Order Page.
-                                            {% endblocktrans %}
-                                        </p>
+                                        {% if not messages %}
+                                            <p class="card-warning-content">
+                                                {% blocktrans %}
+                                                You are not making any payment yet. After submitting your card
+                                                information, you will be taken to the Confirm Order Page.
+                                                {% endblocktrans %}
+                                            </p>
+                                        {% endif %}
+                                        <div class="help-block with-errors">
+                                            {% for message in messages %}
+                                                {% if 'failed_payment' in message.tags %}
+                                                 <ul class="list-unstyled"><li>
+                                                     <p class="alert alert-danger">{{ message|safe }}</p>
+                                                </li></ul>
+                                                {% endif %}
+                                            {% endfor %}
+                                        </div>
                                     </div>
                                     <div class="col-xs-12">
                                         <div class="col-xs-6 pull-right">