diff --git a/datacenterlight/templates/datacenterlight/landing_payment.html b/datacenterlight/templates/datacenterlight/landing_payment.html index d195690b..58246b6a 100644 --- a/datacenterlight/templates/datacenterlight/landing_payment.html +++ b/datacenterlight/templates/datacenterlight/landing_payment.html @@ -122,53 +122,7 @@ {% else %} -
- -
-
-
- -
-
-
-
- -
-
-
- -
-
-
-
- - -
-
-
-
- {% if not messages and not form.non_field_errors %} -

- {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %} -

- {% endif %} -
- {% for message in messages %} - {% if 'failed_payment' in message.tags or 'make_charge_error' in message.tags or 'error' in message.tags %} - - {% endif %} - {% endfor %} -
-
- -
- -
-

-
-
+ {% include "hosting/includes/_card_input.html" %} {% endif %} diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css index 74896a4b..ac2b411f 100644 --- a/hosting/static/hosting/css/commons.css +++ b/hosting/static/hosting/css/commons.css @@ -298,6 +298,10 @@ max-width: 360px; } +.btn-wide { + min-width: 100px; +} + .caps-link { font-weight: 600; color: #8da4c0; @@ -317,6 +321,18 @@ padding-top: 15px; } +.settings-container .new-card-head { + margin-top: 40px; + margin-bottom: 30px; +} + +.settings-container .new-card-head h4 { + font-size: 15px; + margin-top: 8px; + font-weight: 600; +} + + .caps-link .svg-img { margin-right: 5px; height: 13px; @@ -333,7 +349,11 @@ .settings-container .btn-vm-contact { font-weight: 600; font-size: 13px; - /* padding: 4px 15px; */ +} + +.settings-container .choice-btn { + letter-spacing: 1px; + min-width: 127px; } .btn-wide { @@ -375,10 +395,19 @@ fill: #999; } +.card-details-box { + border: 1px solid #eee; + padding: 5px 25px 25px; +} + +.thick-hr { + border-top: 5px solid #eee; +} + .locale_date { opacity: 0; } .locale_date.done{ opacity: 1; -} \ No newline at end of file +} diff --git a/hosting/templates/hosting/includes/_card_input.html b/hosting/templates/hosting/includes/_card_input.html new file mode 100644 index 00000000..59e8d1a6 --- /dev/null +++ b/hosting/templates/hosting/includes/_card_input.html @@ -0,0 +1,59 @@ +{% load i18n %} + +
+ +
+
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+
+ + +
+
+
+
+ {% if not messages and not form.non_field_errors %} +

+ {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %} +

+ {% endif %} +
+ {% for message in messages %} + {% if 'failed_payment' in message.tags or 'make_charge_error' in message.tags %} + + {% elif not form.non_field_errors %} +

+ {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %} +

+ {% endif %} + {% endfor %} + + {% for error in form.non_field_errors %} +

+ {{ error|escape }} +

+ {% endfor %} +
+
+ +
+ +
+

+
+
\ No newline at end of file diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index e9d6476f..a10cfbca 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -105,62 +105,7 @@ {% else %} -
- -
-
-
- -
-
-
-
- -
-
-
- -
-
-
-
- - -
-
-
-
- {% if not messages and not form.non_field_errors %} -

- {% trans "You are not making any payment yet. After submitting your card information, you will be taken to the Confirm Order Page." %} -

- {% endif %} -
- {% for message in messages %} - {% if 'failed_payment' or 'make_charge_error' in message.tags %} - - {% endif %} - {% endfor %} - - {% for error in form.non_field_errors %} -

- {{ error|escape }} -

- {% endfor %} -
-
- -
- - -
-

-
-
+ {% include "hosting/includes/_card_input.html" %} {% endif %} diff --git a/hosting/templates/hosting/settings.html b/hosting/templates/hosting/settings.html index 0bafe8e5..968363d2 100644 --- a/hosting/templates/hosting/settings.html +++ b/hosting/templates/hosting/settings.html @@ -14,7 +14,7 @@
-

{%trans "Billing Address"%}

+

{%trans "Billing Address" %}

{% for field in form %} @@ -27,103 +27,58 @@
-

{%trans "Credit Card"%}

+

{%trans "Credit Card" %}

- {% if credit_card_data.last4 %} + {% for card in cards_list %}
{% trans "Credit Card" %}
-
{% trans "Last" %} 4: *****{{credit_card_data.last4}}
-
{% trans "Type" %}: {{credit_card_data.cc_brand}}
- {% comment %} +
{% trans "Last" %} 4: ***** {{card.last4}}
+
{% trans "Type" %}: {{card.cc_brand}}
{% trans "REMOVE CARD" %}
- {% trans "EDIT CARD" %} + {% trans "SELECT" %}
- {% endcomment %}
- {% else %} + {% empty %}

{% trans "No Credit Cards Added" %}

{% blocktrans %}We are using Stripe for payment and do not store your information in our database.{% endblocktrans %}

+ {% endfor %} - {% comment %} -

{% trans "Add a new Card." %}

-

- {% blocktrans %}Please fill in your credit card information below. We are using Stripe for payment and do not store your information in our database.{% endblocktrans %} -

-
- -
-
- -
-
-
-
- -
-
-
- -
-
-
-
- - -
-
- -
- {% if not messages and not form.non_field_errors %} -

- {% blocktrans %}You are not making any payment here.{% endblocktrans %} -

- {% endif %} -
- {% for message in messages %} - {% if 'failed_payment' or 'make_charge_error' in message.tags %} -
  • -

    {{ message|safe }}

    -
- {% endif %} - {% endfor %} - - {% for error in form.non_field_errors %} -

- {{ error|escape }} -

- {% endfor %} -
-
-
- -
-
-
- -
-

-
-
- {% endcomment %} - {% endif %} +
+
+
+

{% trans "Add a new credit card" %}

+
+
+ +
+
+
+
+
+
+

{%trans "New Credit Card" %}

+
+ {% include "hosting/includes/_card_input.html" %} +
+
- {% comment %} {% if stripe_key %} {% get_current_language as LANGUAGE_CODE %} @@ -138,6 +93,7 @@ {%endif%} + {% comment %} {% if credit_card_data.last4 and credit_card_data.cc_brand %}