From 764a79a89c7f4416418427e410c78ee899a73f24 Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Thu, 8 Dec 2016 18:29:28 -0500
Subject: [PATCH 1/2] #2770

---
 digitalglarus/mixins.py                                |  1 -
 .../digitalglarus/membership_deactivated.html          |  8 ++++++--
 .../templates/digitalglarus/membership_payment.html    |  3 ++-
 digitalglarus/templates/digitalglarus/terms.html       | 10 ++++++++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/digitalglarus/mixins.py b/digitalglarus/mixins.py
index 54b738d2..7c214e14 100644
--- a/digitalglarus/mixins.py
+++ b/digitalglarus/mixins.py
@@ -48,7 +48,6 @@ class Ordereable(models.Model):
     @classmethod
     def create(cls, data):
         stripe_charge = data.pop('stripe_charge', None)
-        # del(data['status'])
         instance = cls.objects.create(**data)
         if not stripe_charge:
             return instance
diff --git a/digitalglarus/templates/digitalglarus/membership_deactivated.html b/digitalglarus/templates/digitalglarus/membership_deactivated.html
index 4283b8b5..9eeb5c39 100644
--- a/digitalglarus/templates/digitalglarus/membership_deactivated.html
+++ b/digitalglarus/templates/digitalglarus/membership_deactivated.html
@@ -19,6 +19,10 @@
     text-align: center;
   }
 
+  .space-above {
+    margin-top: 10px;
+  }
+
 </style>
 
   <section id="price">
@@ -40,8 +44,8 @@
 
                           <form method="POST" action="">
                             {% csrf_token %} 
-                            <button type="button" class="btn btn-primary btn-blue" data-toggle="modal" data-target="#cancel-subscription-modal">Cancel my Membership</button>
-                            <a class="btn btn-primary btn-blue" href="{{request.META.HTTP_REFERER}}">Go back</a>
+                            <button type="button" class="btn btn-primary btn-blue space-above" data-toggle="modal" data-target="#cancel-subscription-modal">Cancel my Membership</button>
+                            <a class="btn btn-primary btn-grey space-above" href="{{request.META.HTTP_REFERER}}">Go back</a>
 
 
 
diff --git a/digitalglarus/templates/digitalglarus/membership_payment.html b/digitalglarus/templates/digitalglarus/membership_payment.html
index 44ce4762..61c60af9 100644
--- a/digitalglarus/templates/digitalglarus/membership_payment.html
+++ b/digitalglarus/templates/digitalglarus/membership_payment.html
@@ -20,6 +20,7 @@
   }
   
   @media screen and (min-width: 768px) {
+  }
 	
 	#cancel-subscription-modal .modal-dialog  {width:900px;}
 
@@ -112,7 +113,7 @@
                                      <span class="custom-control-description">I accept the Digital Glarus <a data-toggle="modal" data-target="#cancel-subscription-modal" target="_blank">Terms and Conditions</a>, <a href=#>Community Guidelines</a> and <a href=#>Privacy Policy</a></span>
 									 </label>
                                     <div class="row">
-                                      <div class="col-xs-6 col-md-12">
+                                      <div class="col-xs-6 col-md-6 col-xs-offset-1 col-md-offset-3">
                                           <button class="btn btn-primary btn-md btn-blck submit-payment" type="submit">Purchase membership</button>
                                       </div>
                                     </div>
diff --git a/digitalglarus/templates/digitalglarus/terms.html b/digitalglarus/templates/digitalglarus/terms.html
index d0b02999..8f0da8b4 100755
--- a/digitalglarus/templates/digitalglarus/terms.html
+++ b/digitalglarus/templates/digitalglarus/terms.html
@@ -101,7 +101,7 @@
   <section id="price">
     <div class="container">
      <div class="row col-md-2 text-center wow fadeInDown"></div> 
-    <div class="row col-md-8 text-center wow fadeInDown">
+    <div class="row col-md-8 col-sm-6 text-center wow fadeInDown">
        <div class="price-box">
        <span class="glyphicon glyphicon-flag"></span>
         <h2 class="section-heading">General Terms & Conditions of Digital Glarus Membership</h2>
@@ -136,7 +136,13 @@
               
                 </p>
                 <div class="text-center">
-              <a href="mailto:info@ungleich.ch" class="btn btn-primary btn-blue">Still have a question?</a>
+                  <div class="row">
+                    <div class="col-sm-3 col-md-offset-4">
+                      <a href="mailto:info@ungleich.ch" class="btn btn-primary btn-blue">Still have a question?</a>
+                    
+                    </div>
+                    
+                  </div>
               </div>
               <div class="row col-md-2 text-center wow fadeInDown"> 
               </div>

From 8d92ebca88bb7e726dbc2fd482e6c09d2ecddceb Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Thu, 8 Dec 2016 20:51:44 -0500
Subject: [PATCH 2/2] removed stripe keys from settings and script

---
 dynamicweb/settings/base.py | 4 +---
 stripe_keys.sh              | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 stripe_keys.sh

diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py
index a12cce56..2b94c820 100644
--- a/dynamicweb/settings/base.py
+++ b/dynamicweb/settings/base.py
@@ -472,6 +472,4 @@ else:
 
 
 ANONYMOUS_USER_NAME = 'anonymous@ungleich.ch'
-GUARDIAN_GET_INIT_ANONYMOUS_USER = 'membership.models.get_anonymous_user_instance'
-STRIPE_API_PRIVATE_KEY='sk_test_dqAmbKAij12QCGfkYZ3poGt2'
-STRIPE_API_PUBLIC_KEY='pk_test_QqBZ50Am8KOxaAlOxbcm9Psl'
+GUARDIAN_GET_INIT_ANONYMOUS_USER = 'membership.models.get_anonymous_user_instance'
\ No newline at end of file
diff --git a/stripe_keys.sh b/stripe_keys.sh
deleted file mode 100644
index 6ec79ff6..00000000
--- a/stripe_keys.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export STRIPE_API_PRIVATE_KEY='sk_test_dqAmbKAij12QCGfkYZ3poGt2'
-export STRIPE_API_PUBLIC_KEY='pk_test_QqBZ50Am8KOxaAlOxbcm9Psl'
\ No newline at end of file