From 6536991209fc25af113a91dfa93988ede3a00952 Mon Sep 17 00:00:00 2001
From: Arvind Tiwari <tiwariav@gmail.com>
Date: Fri, 6 Oct 2017 01:17:35 +0530
Subject: [PATCH 1/4] list all cards, card_input template

---
 .../datacenterlight/landing_payment.html      | 58 +--------------
 hosting/templates/hosting/payment.html        | 57 +-------------
 hosting/templates/hosting/settings.html       | 74 +++----------------
 hosting/views.py                              | 19 +++--
 4 files changed, 20 insertions(+), 188 deletions(-)

diff --git a/datacenterlight/templates/datacenterlight/landing_payment.html b/datacenterlight/templates/datacenterlight/landing_payment.html
index fa638d77..1a476797 100644
--- a/datacenterlight/templates/datacenterlight/landing_payment.html
+++ b/datacenterlight/templates/datacenterlight/landing_payment.html
@@ -121,63 +121,7 @@
                                 <button id="payment_button_with_creditcard" class="btn btn-vm-contact" type="submit">{%trans "SUBMIT" %}</button>
                             </div>
                         {% else %}
-                            <form action="" id="payment-form-new" method="POST">
-                                <input type="hidden" name="token"/>
-                                <div class="group">
-                                    <div class="credit-card-goup">
-                                       <div class="card-element card-number-element">
-                                           <label>{%trans "Card Number" %}</label>
-                                           <div id="card-number-element" class="field my-input"></div>
-                                       </div>
-                                       <div class="row">
-                                           <div class="col-xs-5 card-element card-expiry-element">
-                                               <label>{%trans "Expiry Date" %}</label>
-                                               <div id="card-expiry-element" class="field my-input"></div>
-                                           </div>
-                                           <div class="col-xs-3 col-xs-offset-4 card-element card-cvc-element">
-                                               <label>{%trans "CVC" %}</label>
-                                               <div id="card-cvc-element" class="field my-input"></div>
-                                           </div>
-                                       </div>
-                                       <div class="card-element brand">
-                                           <label>{%trans "Card Type" %}</label>
-                                           <i class="pf pf-credit-card" id="brand-icon"></i>
-                                       </div>
-                                    </div>
-                                </div>
-                                <div id="card-errors"></div>
-                                {% if not messages and not form.non_field_errors %}
-                                    <p class="card-warning-content">
-                                        {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %}
-                                    </p>
-                                {% endif %}
-                                <div id='payment_error'>
-                                    {% for message in messages %}
-                                        {% if 'failed_payment' in message.tags or 'make_charge_error' in message.tags %}
-                                            <ul class="list-unstyled">
-                                                <li><p class="card-warning-content card-warning-error">{{ message|safe }}</p></li>
-                                            </ul>
-                                        {% elif not form.non_field_errors %}
-                                            <p class="card-warning-content">
-                                                {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %}
-                                            </p>
-                                        {% endif %}
-                                    {% endfor %}
-
-                                    {% for error in form.non_field_errors %}
-                                        <p class="card-warning-content card-warning-error">
-                                            {{ error|escape }}
-                                        </p>
-                                    {% endfor %}
-                                </div>
-                                <div class="text-right">
-                                    <button class="btn btn-vm-contact btn-wide" type="submit">{%trans "SUBMIT" %}</button>
-                                </div>
-
-                                <div style="display:none;">
-                                    <p class="payment-errors"></p>
-                                </div>
-                            </form>
+                            {% include "hosting/includes/_card_input.html" %}
                         {% endif %}
                     </div>
                 </div>
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 @@
                                     <button id="payment_button_with_creditcard" class="btn btn-vm-contact" type="submit">{%trans "SUBMIT" %}</button>
                                 </div>
                             {% else %}
-                                <form action="" id="payment-form-new" method="POST">
-                                    <input type="hidden" name="token"/>
-                                    <div class="group">
-                                        <div class="credit-card-goup">
-                                            <div class="card-element card-number-element">
-                                                <label>{%trans "Card Number" %}</label>
-                                                <div id="card-number-element" class="field my-input"></div>
-                                            </div>
-                                            <div class="row">
-                                                <div class="col-xs-5 card-element card-expiry-element">
-                                                    <label>{%trans "Expiry Date" %}</label>
-                                                    <div id="card-expiry-element" class="field my-input"></div>
-                                                </div>
-                                                <div class="col-xs-3 col-xs-offset-4 card-element card-cvc-element">
-                                                    <label>{%trans "CVC" %}</label>
-                                                    <div id="card-cvc-element" class="field my-input"></div>
-                                                </div>
-                                            </div>
-                                            <div class="card-element brand">
-                                               <label>{%trans "Card Type" %}</label>
-                                               <i class="pf pf-credit-card" id="brand-icon"></i>
-                                           </div>
-                                        </div>
-                                    </div>
-                                    <div id="card-errors"></div>
-                                        {% if not messages and not form.non_field_errors %}
-                                            <p class="card-warning-content">
-                                                {% trans "You are not making any payment yet. After submitting your card information, you will be taken to the Confirm Order Page." %}
-                                            </p>
-                                        {% endif %}
-                                        <div id='payment_error'>
-                                            {% for message in messages %}
-                                                {% if 'failed_payment' or 'make_charge_error' in message.tags %}
-                                                 <ul class="list-unstyled">
-                                                    <li>
-                                                        <p class="card-warning-content card-warning-error">{{ message|safe }}</p>
-                                                    </li>
-                                                </ul>
-                                                {% endif %}
-                                            {% endfor %}
-
-                                            {% for error in form.non_field_errors %}
-                                                <p class="card-warning-content card-warning-error">
-                                                    {{ error|escape }}
-                                                </p>
-                                            {% endfor %}
-                                        </div>
-                                        <div class="text-right">
-                                            <button class="btn btn-vm-contact btn-wide" type="submit">{%trans "SUBMIT" %}</button>
-                                        </div>
-                                    </div>
-
-                                    <div style="display:none;">
-                                        <p class="payment-errors"></p>
-                                    </div>
-                                </form>
+                                {% include "hosting/includes/_card_input.html" %}
                             {% endif %}
                         </div>
                     </div>
diff --git a/hosting/templates/hosting/settings.html b/hosting/templates/hosting/settings.html
index 0bafe8e5..5e898b04 100644
--- a/hosting/templates/hosting/settings.html
+++ b/hosting/templates/hosting/settings.html
@@ -30,12 +30,13 @@
                     <h3>{%trans "Credit Card"%}</h3>
                     <hr>
                     <div>
-                        {% if credit_card_data.last4 %}
+                        {% for card in cards_list %}
                             <div class="credit-card-details">
                                 <h5 class="billing-head">{% trans "Credit Card" %}</h5>
-                                <h5 class="membership-lead">{% trans "Last" %} 4: *****{{credit_card_data.last4}}</h5>
-                                <h5 class="membership-lead">{% trans "Type" %}: {{credit_card_data.cc_brand}}</h5>
+                                <h5 class="membership-lead">{% trans "Last" %} 4: *****{{card.last4}}</h5>
+                                <h5 class="membership-lead">{% trans "Type" %}: {{card.cc_brand}}</h5>
                                 {% comment %}
+                                {% endcomment %}
                                 <div class="credit-card-details-opt">
                                     <div class="row">
                                         <div class="col-xs-6">
@@ -46,75 +47,18 @@
                                         </div>
                                     </div>
                                 </div>
-                                {% endcomment %}
                             </div>
+                        {% endfor %}
+                        {% if credit_card_data.last4 %}
                         {% else %}
                             <div class="no-cards">
                                 <h4>{% trans "No Credit Cards Added" %}</h4>
                                 <p>{% blocktrans %}We are using <a href="https://stripe.com">Stripe</a> for payment and do not store your information in our database.{% endblocktrans %}</p>
                             </div>
 
-                            {% comment %}
                                 <h4>{% trans "Add a new Card." %}</h4>
-                                <p style="margin-bottom: 15px;">
-                                    {% blocktrans %}Please fill in your credit card information below. We are using <a href="https://stripe.com" target="_blank">Stripe</a> for payment and do not store your information in our database.{% endblocktrans %}
-                                </p>
-                                <form action="" id="payment-form-new" class="credit-card-form" method="POST">
-                                    <input type="hidden" name="token"/>
-                                    <div class="credit-card-goup">
-                                       <div class="card-element card-number-element">
-                                           <label>{%trans "Card Number" %}</label>
-                                           <div id="card-number-element" class="field my-input"></div>
-                                       </div>
-                                       <div class="row">
-                                           <div class="col-xs-6 col-sm-4 card-element card-expiry-element">
-                                               <label>{%trans "Expiry Date" %}</label>
-                                               <div id="card-expiry-element" class="field my-input"></div>
-                                           </div>
-                                           <div class="col-xs-6 col-sm-4 col-sm-offset-4 card-element card-cvc-element">
-                                               <label>{%trans "CVC" %}</label>
-                                               <div id="card-cvc-element" class="field my-input"></div>
-                                           </div>
-                                       </div>
-                                       <div class="card-element brand">
-                                           <label>{%trans "Card Type" %}</label>
-                                           <i class="pf pf-credit-card" id="brand-icon"></i>
-                                       </div>
-                                    </div>
-                                    <div id="card-errors" role="alert"></div>
-                                    <div>
-                                        {% if not messages and not form.non_field_errors %}
-                                            <p class="card-warning-content">
-                                                {% blocktrans %}You are not making any payment here.{% endblocktrans %}
-                                            </p>
-                                        {% endif %}
-                                        <div id='payment_error'>
-                                            {% for message in messages %}
-                                                {% if 'failed_payment' or 'make_charge_error' in message.tags %}
-                                                 <ul class="list-unstyled"><li>
-                                                     <p class="card-warning-content card-warning-error">{{ message|safe }}</p>
-                                                </li></ul>
-                                                {% endif %}
-                                            {% endfor %}
-
-                                            {% for error in form.non_field_errors %}
-                                                <p class="card-warning-content card-warning-error">
-                                                    {{ error|escape }}
-                                                </p>
-                                            {% endfor %}
-                                        </div>
-                                        <div class="row">
-                                            <div class="col-xs-6 col-xs-offset-6 text-right">
-                                                <button class="btn btn-success stripe-payment-btn" type="submit">{%trans "Submit" %}
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                    <div style="display:none;">
-                                        <p class="payment-errors"></p>
-                                    </div>
-                                </form>
+                                {% include "hosting/includes/_card_input.html" %}
+                            {% comment %}
                             {% endcomment %}
                         {% endif %}
                     </div>
@@ -123,7 +67,6 @@
         </div>
     </div>
 
-    {% comment %}
     <!-- stripe key data -->
     {% if stripe_key %}
         {% get_current_language as LANGUAGE_CODE %}
@@ -138,6 +81,7 @@
         </script>
     {%endif%}
 
+    {% comment %}
     {% if credit_card_data.last4 and credit_card_data.cc_brand %}
         <script type="text/javascript">
             (function () {
diff --git a/hosting/views.py b/hosting/views.py
index 8dbf50fb..9c176f23 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -534,17 +534,16 @@ class SettingsView(LoginRequiredMixin, FormView):
         context = super(SettingsView, self).get_context_data(**kwargs)
         # Get user
         user = self.request.user
-        # Get user last order
-        last_hosting_order = HostingOrder.objects.filter(
-            customer__user=user).last()
-        # If user has already an hosting order, get the credit card data from
-        # it
-        if last_hosting_order:
-            credit_card_data = last_hosting_order.get_cc_data()
-            context.update({
-                'credit_card_data': credit_card_data if credit_card_data else None,
-            })
+        # Get user's all orders
+        hosting_orders = HostingOrder.objects.filter(customer__user=user)
+        # If user has hosting orders, get the credit card data from it
+        cards_list = []
+        for order in hosting_orders:
+            credit_card_data = order.get_cc_data()
+            if credit_card_data:
+                cards_list.append(credit_card_data)
         context.update({
+            'cards_list': cards_list,
             'stripe_key': settings.STRIPE_API_PUBLIC_KEY
         })
 

From bd3c59eb3e10714fc099686fc1ec1da771098410 Mon Sep 17 00:00:00 2001
From: Arvind Tiwari <tiwariav@gmail.com>
Date: Fri, 6 Oct 2017 01:17:50 +0530
Subject: [PATCH 2/4] card_input template

---
 .../hosting/includes/_card_input.html         | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 hosting/templates/hosting/includes/_card_input.html

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 %}
+
+<form action="" id="payment-form-new" method="POST">
+    <input type="hidden" name="token"/>
+    <div class="group">
+        <div class="credit-card-goup">
+           <div class="card-element card-number-element">
+               <label>{%trans "Card Number" %}</label>
+               <div id="card-number-element" class="field my-input"></div>
+           </div>
+           <div class="row">
+               <div class="col-xs-5 card-element card-expiry-element">
+                   <label>{%trans "Expiry Date" %}</label>
+                   <div id="card-expiry-element" class="field my-input"></div>
+               </div>
+               <div class="col-xs-3 col-xs-offset-4 card-element card-cvc-element">
+                   <label>{%trans "CVC" %}</label>
+                   <div id="card-cvc-element" class="field my-input"></div>
+               </div>
+           </div>
+           <div class="card-element brand">
+               <label>{%trans "Card Type" %}</label>
+               <i class="pf pf-credit-card" id="brand-icon"></i>
+           </div>
+        </div>
+    </div>
+    <div id="card-errors"></div>
+    {% if not messages and not form.non_field_errors %}
+        <p class="card-warning-content">
+            {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %}
+        </p>
+    {% endif %}
+    <div id='payment_error'>
+        {% for message in messages %}
+            {% if 'failed_payment' in message.tags or 'make_charge_error' in message.tags %}
+                <ul class="list-unstyled">
+                    <li><p class="card-warning-content card-warning-error">{{ message|safe }}</p></li>
+                </ul>
+            {% elif not form.non_field_errors %}
+                <p class="card-warning-content">
+                    {% trans "You are not making any payment yet. After placing your order, you will be taken to the Submit Payment Page." %}
+                </p>
+            {% endif %}
+        {% endfor %}
+
+        {% for error in form.non_field_errors %}
+            <p class="card-warning-content card-warning-error">
+                {{ error|escape }}
+            </p>
+        {% endfor %}
+    </div>
+    <div class="text-right">
+        <button class="btn btn-vm-contact btn-wide" type="submit">{%trans "SUBMIT" %}</button>
+    </div>
+
+    <div style="display:none;">
+        <p class="payment-errors"></p>
+    </div>
+</form>
\ No newline at end of file

From ba8eaa29378b2b9d3e6b91e0c5b45f8d1f620319 Mon Sep 17 00:00:00 2001
From: Arvind Tiwari <tiwariav@gmail.com>
Date: Fri, 6 Oct 2017 01:59:18 +0530
Subject: [PATCH 3/4] new card details option added

---
 hosting/static/hosting/css/commons.css  | 26 +++++++++++++++--
 hosting/templates/hosting/settings.html | 38 ++++++++++++++++---------
 hosting/views.py                        |  2 +-
 3 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css
index 317caabc..7dad471e 100644
--- a/hosting/static/hosting/css/commons.css
+++ b/hosting/static/hosting/css/commons.css
@@ -315,8 +315,15 @@
   text-decoration: none;
 }
 
-.settings-container .credit-card-details-opt {
-  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 {
@@ -335,7 +342,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,4 +386,13 @@
   outline: none;
   color: #999;
   fill: #999;
+}
+
+.card-details-box {
+  border: 1px solid #eee;
+  padding: 5px 25px 25px;
+}
+
+.thick-hr {
+  border-top: 5px solid #eee;
 }
\ No newline at end of file
diff --git a/hosting/templates/hosting/settings.html b/hosting/templates/hosting/settings.html
index 5e898b04..968363d2 100644
--- a/hosting/templates/hosting/settings.html
+++ b/hosting/templates/hosting/settings.html
@@ -14,7 +14,7 @@
         <div class="settings-container">
             <div class="row">
                 <div class="col-sm-5 col-md-6  billing dcl-billing">
-                    <h3>{%trans "Billing Address"%}</h3>
+                    <h3>{%trans "Billing Address" %}</h3>
                     <hr>
                     <form role="form" id="billing-form" method="post" action="" novalidate>
                         {% for field in form %}
@@ -27,40 +27,52 @@
                     </form>
                 </div>
                 <div class="col-sm-7 col-md-6 creditcard-box dcl-creditcard">
-                    <h3>{%trans "Credit Card"%}</h3>
+                    <h3>{%trans "Credit Card" %}</h3>
                     <hr>
                     <div>
                         {% for card in cards_list %}
                             <div class="credit-card-details">
                                 <h5 class="billing-head">{% trans "Credit Card" %}</h5>
-                                <h5 class="membership-lead">{% trans "Last" %} 4: *****{{card.last4}}</h5>
+                                <h5 class="membership-lead">{% trans "Last" %} 4: ***** {{card.last4}}</h5>
                                 <h5 class="membership-lead">{% trans "Type" %}: {{card.cc_brand}}</h5>
-                                {% comment %}
-                                {% endcomment %}
                                 <div class="credit-card-details-opt">
                                     <div class="row">
                                         <div class="col-xs-6">
                                             <a class="caps-link" href=""><img src="{% static 'hosting/img/delete.svg' %}" class="svg-img">{% trans "REMOVE CARD" %}</a>
                                         </div>
                                         <div class="col-xs-6 text-right">
-                                            <a class="btn btn-vm-contact" href="">{% trans "EDIT CARD" %}</a>
+                                            <a class="btn choice-btn choice-btn-faded" href="">{% trans "SELECT" %}</a>
                                         </div>
                                     </div>
                                 </div>
                             </div>
-                        {% endfor %}
-                        {% if credit_card_data.last4 %}
-                        {% else %}
+                        {% empty %}
                             <div class="no-cards">
                                 <h4>{% trans "No Credit Cards Added" %}</h4>
                                 <p>{% blocktrans %}We are using <a href="https://stripe.com">Stripe</a> for payment and do not store your information in our database.{% endblocktrans %}</p>
                             </div>
+                        {% endfor %}
 
-                                <h4>{% trans "Add a new Card." %}</h4>
+                        <div class="new-card-head">
+                            <div class="row">
+                                <div class="col-xs-6">
+                                    <h4>{% trans "Add a new credit card" %}</h4>
+                                </div>
+                                <div class="col-xs-6 text-right">
+                                    <button data-toggle="collapse" data-target="#newcard" class="btn choice-btn">
+                                        <span class="fa fa-plus"></span>&nbsp;&nbsp;{% trans "NEW CARD" %}
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                        <div id="newcard" class="collapse">
+                            <hr class="thick-hr">
+                            <div class="card-details-box">
+                                <h3>{%trans "New Credit Card" %}</h3>
+                                <hr>
                                 {% include "hosting/includes/_card_input.html" %}
-                            {% comment %}
-                            {% endcomment %}
-                        {% endif %}
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/hosting/views.py b/hosting/views.py
index 9c176f23..9a27b671 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -540,7 +540,7 @@ class SettingsView(LoginRequiredMixin, FormView):
         cards_list = []
         for order in hosting_orders:
             credit_card_data = order.get_cc_data()
-            if credit_card_data:
+            if credit_card_data and (credit_card_data not in cards_list):
                 cards_list.append(credit_card_data)
         context.update({
             'cards_list': cards_list,

From cc2e08aff51d922aa6701547801dcc7d51a514ec Mon Sep 17 00:00:00 2001
From: Arvind Tiwari <tiwariav@gmail.com>
Date: Fri, 6 Oct 2017 02:02:22 +0530
Subject: [PATCH 4/4] translations

---
 .../locale/de/LC_MESSAGES/django.po           | 38 +++++------
 hosting/locale/de/LC_MESSAGES/django.po       | 66 ++++++++++++-------
 2 files changed, 59 insertions(+), 45 deletions(-)

diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po
index 7acb295f..d2e5fa60 100644
--- a/datacenterlight/locale/de/LC_MESSAGES/django.po
+++ b/datacenterlight/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-03 18:13+0530\n"
+"POT-Creation-Date: 2017-10-06 01:59+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -360,25 +360,6 @@ msgstr ""
 "Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst ausgelöst, "
 "nachdem Du die Bestellung auf der nächsten Seite bestätigt hast."
 
-msgid "Card Number"
-msgstr "Kreditkartennummer"
-
-msgid "Expiry Date"
-msgstr "Ablaufdatum"
-
-msgid "CVC"
-msgstr ""
-
-msgid "Card Type"
-msgstr "Kartentyp"
-
-msgid ""
-"You are not making any payment yet. After placing your order, you will be "
-"taken to the Submit Payment Page."
-msgstr ""
-"Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst ausgelöst, "
-"nachdem Du die Bestellung auf der nächsten Seite bestätigt hast."
-
 msgid "Processing"
 msgstr "Weiter"
 
@@ -512,6 +493,23 @@ msgstr ""
 "Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du "
 "auf sie zugreifen kannst."
 
+#~ msgid "Card Number"
+#~ msgstr "Kreditkartennummer"
+
+#~ msgid "Expiry Date"
+#~ msgstr "Ablaufdatum"
+
+#~ msgid "Card Type"
+#~ msgstr "Kartentyp"
+
+#~ msgid ""
+#~ "You are not making any payment yet. After placing your order, you will be "
+#~ "taken to the Submit Payment Page."
+#~ msgstr ""
+#~ "Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst "
+#~ "ausgelöst, nachdem Du die Bestellung auf der nächsten Seite bestätigt "
+#~ "hast."
+
 #~ msgid "Submit"
 #~ msgstr "Absenden"
 
diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index a3e3c2b4..52dd33da 100644
--- a/hosting/locale/de/LC_MESSAGES/django.po
+++ b/hosting/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-03 18:13+0530\n"
+"POT-Creation-Date: 2017-10-06 01:59+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -173,6 +173,9 @@ msgstr "Anmelden"
 msgid "Create VM"
 msgstr "VM erstellen"
 
+msgid "Affordable VM hosting based in Switzerland"
+msgstr "Bezahlbares VM Hosting in der Schweiz"
+
 msgid "My Dashboard"
 msgstr "Mein Dashboard"
 
@@ -288,6 +291,28 @@ msgstr ""
 "tun, indem Du diesen Link klickst.\n"
 "%(base_url)s%(my_virtual_machines_url)s\n"
 
+msgid "Card Number"
+msgstr "Kreditkartennummer"
+
+msgid "Expiry Date"
+msgstr "Ablaufdatum"
+
+msgid "CVC"
+msgstr ""
+
+msgid "Card Type"
+msgstr "Kartentyp"
+
+msgid ""
+"You are not making any payment yet. After placing your order, you will be "
+"taken to the Submit Payment Page."
+msgstr ""
+"Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst ausgelöst, "
+"nachdem Du die Bestellung auf der nächsten Seite bestätigt hast."
+
+msgid "SUBMIT"
+msgstr "ABSENDEN"
+
 msgid "Toggle navigation"
 msgstr "Umschalten"
 
@@ -451,21 +476,6 @@ msgstr ""
 "Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst ausgelöst, "
 "nachdem Du die Bestellung auf der nächsten Seite bestätigt hast."
 
-msgid "SUBMIT"
-msgstr "ABSENDEN"
-
-msgid "Card Number"
-msgstr "Kreditkartennummer"
-
-msgid "Expiry Date"
-msgstr "Ablaufdatum"
-
-msgid "CVC"
-msgstr ""
-
-msgid "Card Type"
-msgstr "Kartentyp"
-
 msgid "Processing"
 msgstr "Weiter"
 
@@ -487,6 +497,12 @@ msgstr ""
 msgid "Type"
 msgstr "Kartentyp"
 
+msgid "REMOVE CARD"
+msgstr "KARTE ENTFERNEN"
+
+msgid "SELECT"
+msgstr ""
+
 msgid "No Credit Cards Added"
 msgstr "Es wurde keine Kreditkarte hinzugefügt"
 
@@ -497,6 +513,15 @@ msgstr ""
 "Wir nutzen <a href=\"https://stripe.com\" target=\"_blank\">Stripe</a> für "
 "die Bezahlung und speichern keine Informationen in unserer Datenbank."
 
+msgid "Add a new credit card"
+msgstr "Neue Kreditkarte hinzufügen."
+
+msgid "NEW CARD"
+msgstr "NEUE KREDITKARTE"
+
+msgid "New Credit Card"
+msgstr "Neue Kreditkarte"
+
 msgid "Add your public SSH key"
 msgstr "Füge deinen öffentlichen SSH-Key hinzu"
 
@@ -780,15 +805,6 @@ msgstr ""
 #~ msgid "Notifications "
 #~ msgstr "Benachrichtigungen"
 
-#~ msgid "REMOVE CARD"
-#~ msgstr "KARTE ENTFERNEN"
-
-#~ msgid "EDIT CARD"
-#~ msgstr "BEARBEITEN"
-
-#~ msgid "Add a new Card."
-#~ msgstr "Neue Kreditkarte hinzufügen."
-
 #~ msgid "You are not making any payment here."
 #~ msgstr "Es wird noch keine Bezahlung vorgenommen"