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; + } +
@@ -40,8 +44,8 @@
{% csrf_token %} - - Go back + + Go back diff --git a/digitalglarus/templates/digitalglarus/membership_payment.html b/digitalglarus/templates/digitalglarus/membership_payment.html index b9ebf8c7..0681a264 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:1000px;} @@ -130,7 +131,7 @@ I accept the Digital Glarus Terms and Conditions, Community Guidelines and Privacy Policy
-
+
diff --git a/digitalglarus/templates/digitalglarus/terms.html b/digitalglarus/templates/digitalglarus/terms.html index e5bbaa81..dc2c48c3 100755 --- a/digitalglarus/templates/digitalglarus/terms.html +++ b/digitalglarus/templates/digitalglarus/terms.html @@ -51,7 +51,7 @@
-
+

General Terms & Conditions of Digital Glarus Membership

@@ -86,7 +86,13 @@

diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 9beacc3d..f6075e1e 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -471,6 +471,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