From 86c4e7b4083435cbe14cff3642b42e2ded9ff26d Mon Sep 17 00:00:00 2001
From: deaspo <polycarpokock@live.com>
Date: Wed, 5 Jul 2017 01:53:01 +0300
Subject: [PATCH 1/7] Task: Improve credit card section - letting the user know
 that they're not making any payment there but on the next page

Signed-off-by: deaspo <polycarpokock@live.com>
---
 hosting/templates/hosting/payment.html | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html
index a09061bb..d934acef 100644
--- a/hosting/templates/hosting/payment.html
+++ b/hosting/templates/hosting/payment.html
@@ -52,6 +52,10 @@
 				<h3><b>{%trans "Payment Details"%}</b></h3>
 				<hr>
 	            <div>
+					<div>
+						<p> {% trans "Please fill in your credit card information below. We are using Stripe for payment and do not store your information in our database." %}</p>
+					</div>
+					<br>
 	                <div>
                     {% if credit_card_data.last4 %}
                       <form role="form" id="payment-form-with-creditcard"novalidate>
@@ -59,10 +63,10 @@
                         <h5 class="membership-lead">Last 4: *****{{credit_card_data.last4}}</h5>
                         <h5 class="membership-lead">Type: {{credit_card_data.cc_brand}}</h5>
                         <input type="hidden" name="credit_card_needed" value="false"/>
-                      </form>  
+                      </form>
                       <div class="col-xs-6">
-                        <button id="payment_button_with_creditcard" class="btn btn-success btn-sm btn-block" type="submit">
-							 {% trans "Submit Payment" %}
+                        <button style="width: 100px;" id="payment_button_with_creditcard" class="btn btn-success btn-sm btn-block" type="submit">
+							 {% trans "Place Order" %}
 					   </button>
                      </div>
                     {% else %}
@@ -89,7 +93,7 @@
 											placeholder="{%trans "Valid Card Number"%}" required autofocus data-stripe="number" />
 	                                        <span class="input-group-addon"><i class="fa fa-credit-card"></i></span>
 	                                    </div>
-	                                </div>                            
+	                                </div>
 	                            </div>
 	                        </div>
 	                        <div class="row">
@@ -112,8 +116,12 @@
 	                            </div>
 	                        </div> -->
 	                        <div class="row">
-	                            <div class="col-xs-6 float-right">
-	                                <button class="btn btn-success btn-sm btn-block" type="submit">Submit Payment</button>
+								<br>
+								<div>
+									<p style="font-family: Lato;border: 1px solid #a1a1a1;border-radius: 3px; padding: 5px; "> {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %}</p>
+								</div>
+	                            <div class="col-xs-6 pull-right">
+	                                <button style="width: 100px; float: right; font-style: normal; font-weight: bold; position: absolute; right: 0;" class="btn btn-success" type="submit">{% trans "Place Order" %}</button>
 	                            </div>
 	                        </div>
 	                        <div class="row" style="display:none;">

From e4d0ec43a8fac1ff3cd1fec16311eda804749ee7 Mon Sep 17 00:00:00 2001
From: Siarhei Puhach <siarhei.puhach@itechart-group.com>
Date: Wed, 5 Jul 2017 13:11:01 +0300
Subject: [PATCH 2/7] Fixed Pull request #372

---
 hosting/templates/hosting/payment.html | 31 ++++++++++++++------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html
index d934acef..8bde4d47 100644
--- a/hosting/templates/hosting/payment.html
+++ b/hosting/templates/hosting/payment.html
@@ -1,6 +1,6 @@
 {% extends "hosting/base_short.html" %}
 {% load staticfiles bootstrap3 i18n %}
-{% block content %} 
+{% block content %}
 <!-- Credit card form -->
 <div>
 	<div class="payment-container">
@@ -32,7 +32,7 @@
 						</div>
 					</div>
 				</form>
-				
+
 			</div>
 			<div class="col-xs-12 col-md-4  billing">
 				<h3><b>{%trans "Billing Address"%}</b></h3>
@@ -74,11 +74,11 @@
 
 	                    <form role="form" id="payment-form" novalidate>
                             <div class="row">
-                            <div class="form-group">
-                            <div id="card-element">
-                              <!-- a Stripe Element will be inserted here. -->
-                              </div>
-                            </div>
+								<div class="form-group col-xs-12">
+									<div id="card-element">
+										<!-- a Stripe Element will be inserted here. -->
+									</div>
+								</div>
                              </div>
                              <div id="card-errors" role="alert"></div>
 
@@ -117,12 +117,15 @@
 	                        </div> -->
 	                        <div class="row">
 								<br>
-								<div>
+								<div class="col-xs-12">
 									<p style="font-family: Lato;border: 1px solid #a1a1a1;border-radius: 3px; padding: 5px; "> {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %}</p>
 								</div>
-	                            <div class="col-xs-6 pull-right">
-	                                <button style="width: 100px; float: right; font-style: normal; font-weight: bold; position: absolute; right: 0;" class="btn btn-success" type="submit">{% trans "Place Order" %}</button>
-	                            </div>
+								<div class="col-xs-12">
+									<div class="col-xs-6 pull-right">
+										<button style="width: 100px; float: right; font-style: normal; font-weight: bold; position: absolute; right: 0;" class="btn btn-success" type="submit">{% trans "Place Order" %}</button>
+									</div>
+								</div>
+
 	                        </div>
 	                        <div class="row" style="display:none;">
 	                            <div class="col-xs-12">
@@ -139,7 +142,7 @@
 	                        </div>
 	                        {% endif %}
 
-                           
+
 	                    </form>
                     {% endif %}
 
@@ -154,7 +157,7 @@
 <!-- stripe key data -->
 {% if stripe_key %}
 {% get_current_language as LANGUAGE_CODE %}
-<script type="text/javascript"> 
+<script type="text/javascript">
 
 
      (function () {
@@ -165,7 +168,7 @@
 {%endif%}
 
 {% if credit_card_data.last4 and credit_card_data.cc_brand %}
-<script type="text/javascript"> 
+<script type="text/javascript">
      (function () {window.hasCreditcard = true;})();
 </script>
 

From e90d0faa9e187b7ae8c5ef67f34fd1071e3584eb Mon Sep 17 00:00:00 2001
From: Polycarp Okock <deaspo@users.noreply.github.com>
Date: Fri, 7 Jul 2017 22:19:59 +0300
Subject: [PATCH 3/7] Fixing missing warning text and alignment

Fixed the missing warning text and alignment for {% if credit_card_data.last4 %}
---
 hosting/templates/hosting/payment.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html
index d934acef..af3660a0 100644
--- a/hosting/templates/hosting/payment.html
+++ b/hosting/templates/hosting/payment.html
@@ -64,11 +64,17 @@
                         <h5 class="membership-lead">Type: {{credit_card_data.cc_brand}}</h5>
                         <input type="hidden" name="credit_card_needed" value="false"/>
                       </form>
-                      <div class="col-xs-6">
-                        <button style="width: 100px;" id="payment_button_with_creditcard" class="btn btn-success btn-sm btn-block" type="submit">
+		       <div class="row">
+			       <br>
+			       <div>
+				       <p style="font-family: Lato;border: 1px solid #a1a1a1;border-radius: 3px; padding: 5px; "> {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %}</p>
+			       </div>
+                      <div class="col-xs-6 pull-right">
+                        <button style="width: 100px; float: right; font-style: normal; font-weight: bold; position: absolute; right: 0;" id="payment_button_with_creditcard" class="btn btn-success" type="submit">
 							 {% trans "Place Order" %}
 					   </button>
                      </div>
+				</div>
                     {% else %}
 
 

From efd90f8ddd2deb61969248f3a6c7f5e216a2fb78 Mon Sep 17 00:00:00 2001
From: Polycarp Okock <deaspo@users.noreply.github.com>
Date: Sat, 8 Jul 2017 00:50:41 +0300
Subject: [PATCH 4/7] Removed the extra btn

---
 hosting/templates/hosting/payment.html | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html
index 12d3baea..f5780427 100644
--- a/hosting/templates/hosting/payment.html
+++ b/hosting/templates/hosting/payment.html
@@ -73,12 +73,7 @@
                       <div class="col-xs-6 pull-right">
                         <button style="width: 100px; float: right; font-style: normal; font-weight: bold; position: absolute; right: 0;" id="payment_button_with_creditcard" class="btn btn-success" type="submit">
 							 {% trans "Place Order" %}
-                      <div class="col-xs-6">
-                        <button id="payment_button_with_creditcard" class="btn btn-success btn-sm btn-block" type="submit">
-							 {% trans "Submit Payment" %}
-
-					   </button>
-                     </div>
+				</button>
 				</div>
                     {% else %}
 

From 37de810cc39cdc0279c87b31553f2c2a753acbd9 Mon Sep 17 00:00:00 2001
From: Polycarp Okock <deaspo@users.noreply.github.com>
Date: Sat, 8 Jul 2017 01:39:53 +0300
Subject: [PATCH 5/7] Fixed the alignment issue

---
 hosting/templates/hosting/payment.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html
index f5780427..4f291fe8 100644
--- a/hosting/templates/hosting/payment.html
+++ b/hosting/templates/hosting/payment.html
@@ -123,12 +123,14 @@
 	                        </div> -->
 	                        <div class="row">
 								<br>
-								<div>
+								<div class="col-xs-12>
 									<p style="font-family: Lato;border: 1px solid #a1a1a1;border-radius: 3px; padding: 5px; "> {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %}</p>
 								</div>
-	                            <div class="col-xs-6 pull-right">
-	                                <button style="width: 100px; float: right; font-style: normal; font-weight: bold; position: absolute; right: 0;" class="btn btn-success" type="submit">{% trans "Place Order" %}</button>
-	                            </div>
+								<div class="col-xs-12">
+	                                                            <div class="col-xs-6 pull-right">
+	                                                                <button style="width: 100px; float: right; font-style: normal; font-weight: bold; position: absolute; right: 0;" class="btn btn-success" type="submit">{% trans "Place Order" %}</button>
+	                                                            </div>
+				                                </div>
 	                        </div>
 	                        <div class="row" style="display:none;">
 	                            <div class="col-xs-12">

From 0da78502a51b1bea7577570a660809a1da69a0b7 Mon Sep 17 00:00:00 2001
From: Polycarp Okock <deaspo@users.noreply.github.com>
Date: Sat, 8 Jul 2017 01:44:52 +0300
Subject: [PATCH 6/7] Fixed second alignment issue

---
 hosting/templates/hosting/payment.html | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html
index 4f291fe8..cd6480af 100644
--- a/hosting/templates/hosting/payment.html
+++ b/hosting/templates/hosting/payment.html
@@ -67,14 +67,17 @@
 
 		       <div class="row">
 			       <br>
-			       <div>
+			       <div class="col-xs-12>
 				       <p style="font-family: Lato;border: 1px solid #a1a1a1;border-radius: 3px; padding: 5px; "> {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %}</p>
 			       </div>
-                      <div class="col-xs-6 pull-right">
-                        <button style="width: 100px; float: right; font-style: normal; font-weight: bold; position: absolute; right: 0;" id="payment_button_with_creditcard" class="btn btn-success" type="submit">
+			       <div class="col-xs-12">
+                      	           <div class="col-xs-6 pull-right">
+                                       <button style="width: 100px; float: right; font-style: normal; font-weight: bold; position: absolute; right: 0;" id="payment_button_with_creditcard" class="btn btn-success" type="submit">
 							 {% trans "Place Order" %}
-				</button>
-				</div>
+				       </button>
+				   </div>
+		               </div>
+		      </div>
                     {% else %}
 
 

From 46859ffcbc1652352cc40a6436f0beb41a1ff818 Mon Sep 17 00:00:00 2001
From: Polycarp Okock <deaspo@users.noreply.github.com>
Date: Sat, 8 Jul 2017 02:14:04 +0300
Subject: [PATCH 7/7] Fixed missing border and alignment

---
 hosting/templates/hosting/payment.html | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html
index cd6480af..b6550925 100644
--- a/hosting/templates/hosting/payment.html
+++ b/hosting/templates/hosting/payment.html
@@ -83,7 +83,7 @@
 
 	                    <form role="form" id="payment-form" novalidate>
                             <div class="row">
-                            <div class="form-group">
+                            <div class="form-group col-xs-12">
                             <div id="card-element">
                               <!-- a Stripe Element will be inserted here. -->
                               </div>
@@ -126,14 +126,14 @@
 	                        </div> -->
 	                        <div class="row">
 								<br>
-								<div class="col-xs-12>
-									<p style="font-family: Lato;border: 1px solid #a1a1a1;border-radius: 3px; padding: 5px; "> {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %}</p>
-								</div>
 								<div class="col-xs-12">
-	                                                            <div class="col-xs-6 pull-right">
-	                                                                <button style="width: 100px; float: right; font-style: normal; font-weight: bold; position: absolute; right: 0;" class="btn btn-success" type="submit">{% trans "Place Order" %}</button>
-	                                                            </div>
-				                                </div>
+									<p style="font-family: Lato;border: 1px solid #a1a1a1;border-radius: 3px; padding: 5px;"> {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %}</p>
+								</div>
+							    <div class="col-xs-12">
+									<div class="col-xs-6 pull-right">
+										<button style="width: 100px; float: right; font-style: normal; font-weight: bold; position: absolute; right: 0;" class="btn btn-success" type="submit">{% trans "Place Order" %}</button>
+									</div>
+								</div>
 	                        </div>
 	                        <div class="row" style="display:none;">
 	                            <div class="col-xs-12">
@@ -183,7 +183,3 @@
 {%endif%}
 
 {%endblock%}
-
-
-
-