From 4de04b2663c47d5e367e84570faf39288e49ae5e Mon Sep 17 00:00:00 2001
From: Siarhei Puhach <siarhei.puhach@itechart-group.com>
Date: Mon, 7 Aug 2017 09:56:57 +0300
Subject: [PATCH] Changed visa card error placement

---
 hosting/templates/hosting/payment.html | 6 ++++--
 utils/stripe_utils.py                  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html
index 41c6d3eb..449962a5 100644
--- a/hosting/templates/hosting/payment.html
+++ b/hosting/templates/hosting/payment.html
@@ -59,7 +59,6 @@
                         {% csrf_token %}
                         {% bootstrap_field field show_label=False type='fields'%}
                         {% endfor %}
-                        {% bootstrap_form_errors form type='non_fields'%}
                     </form>
                 </div>
                 <div class="col-xs-12 col-sm-7 col-md-6 creditcard-box dcl-creditcard">
@@ -130,7 +129,7 @@
                                 <div id="card-errors" role="alert"></div>
                                 <div class="row">
                                     <div class="col-xs-12">
-                                        {% if not messages %}
+                                        {% if not messages and not form.errors %}
                                             <p class="card-warning-content">
                                                 {% blocktrans %}
                                                 You are not making any payment yet. After submitting your card
@@ -146,6 +145,9 @@
                                                 </li></ul>
                                                 {% endif %}
                                             {% endfor %}
+                                            {% if form.errors %}
+                                                {% bootstrap_form_errors form type='non_fields'%}
+                                            {% endif %}
                                         </div>
                                     </div>
                                     <div class="col-xs-12">
diff --git a/utils/stripe_utils.py b/utils/stripe_utils.py
index d46cf54d..f7d52157 100644
--- a/utils/stripe_utils.py
+++ b/utils/stripe_utils.py
@@ -11,7 +11,7 @@ def handleStripeError(f):
             'error': None
         }
 
-        common_message = "Currently its not possible to make payments."
+        common_message = "Currently it's not possible to make payments."
         try:
             response_object = f(*args, **kwargs)
             response = {