ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/feature/new_digitalglarus' into hover_digitalglarus

Browse source
This commit is contained in:
unknown 2016-12-09 11:11:47 -04:00
commit 8e01e07a88
5 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
digitalglarus/mixins.py
View file

@ -48,7 +48,6 @@ class Ordereable(models.Model):
@classmethod @classmethod
def create(cls, data): def create(cls, data):
stripe_charge = data.pop('stripe_charge', None) stripe_charge = data.pop('stripe_charge', None)
# del(data['status'])
instance = cls.objects.create(**data) instance = cls.objects.create(**data)
if not stripe_charge: if not stripe_charge:
return instance return instance

8
digitalglarus/templates/digitalglarus/membership_deactivated.html
View file

@ -19,6 +19,10 @@
text-align: center; text-align: center;
} }
.space-above {
margin-top: 10px;
}
</style> </style>
<section id="price"> <section id="price">
@ -40,8 +44,8 @@
<form method="POST" action=""> <form method="POST" action="">
{% csrf_token %} {% csrf_token %}
<button type="button" class="btn btn-primary btn-blue" data-toggle="modal" data-target="#cancel-subscription-modal">Cancel my Membership</button> <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-blue" href="{{request.META.HTTP_REFERER}}">Go back</a> <a class="btn btn-primary btn-grey space-above" href="{{request.META.HTTP_REFERER}}">Go back</a>

3
digitalglarus/templates/digitalglarus/membership_payment.html
View file

@ -20,6 +20,7 @@
} }
@media screen and (min-width: 768px) { @media screen and (min-width: 768px) {
}
#cancel-subscription-modal .modal-dialog {width:1000px;} #cancel-subscription-modal .modal-dialog {width:1000px;}
@ -130,7 +131,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> <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> </label>
<div class="row"> <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> <button class="btn btn-primary btn-md btn-blck submit-payment" type="submit">Purchase membership</button>
</div> </div>
</div> </div>

8
digitalglarus/templates/digitalglarus/terms.html
View file

@ -51,7 +51,7 @@
<section id="price"> <section id="price">
<div class="container"> <div class="container">
<div class="row col-md-2 text-center wow fadeInDown"></div> <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"> <div class="price-box">
<span class="glyphicon glyphicon-flag"></span> <span class="glyphicon glyphicon-flag"></span>
<h2 class="section-heading">General Terms & Conditions of Digital Glarus Membership</h2> <h2 class="section-heading">General Terms & Conditions of Digital Glarus Membership</h2>
@ -86,7 +86,13 @@
</p> </p>
<div class="text-center"> <div class="text-center">
<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> <a href="mailto:info@ungleich.ch" class="btn btn-primary btn-blue">Still have a question?</a>
</div>
</div>
</div> </div>
<div class="row col-md-2 text-center wow fadeInDown"> <div class="row col-md-2 text-center wow fadeInDown">
</div> </div>

2
dynamicweb/settings/base.py
View file

@ -472,5 +472,3 @@ else:
ANONYMOUS_USER_NAME = 'anonymous@ungleich.ch' ANONYMOUS_USER_NAME = 'anonymous@ungleich.ch'
GUARDIAN_GET_INIT_ANONYMOUS_USER = 'membership.models.get_anonymous_user_instance' 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'