Merge branch 'feature/new_digitalglarus' of github.com:ungleich/dynamicweb into feature/new_digitalglarus
This commit is contained in:
Levi
commit
082cb09e9b
11 changed files with 311 additions and 43 deletions
|
|
@ -67,7 +67,6 @@
|
|||
|
||||
.caption-style-1 .caption{
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
opacity: 0;
|
||||
-webkit-transition:all 0.45s ease-in-out;
|
||||
-moz-transition:all 0.45s ease-in-out;
|
||||
|
|
@ -91,7 +90,6 @@
|
|||
.caption-style-1 .caption-text{
|
||||
z-index: 0;
|
||||
color: #fff;
|
||||
position: relative;
|
||||
width: 400px;
|
||||
height: 200px;
|
||||
text-align: center;
|
||||
|
|
@ -250,34 +248,34 @@
|
|||
</div>-->
|
||||
</div>
|
||||
<div class="row no-gutter popup-gallery">
|
||||
|
||||
|
||||
<div class="col-lg-4 col-md-4 col-sm-6 portfolio-item wow fadeInDown text-center" data-wow-delay="0.5s">
|
||||
<ul class="caption-style-1">
|
||||
<li>
|
||||
<img src="{% static 'digitalglarus/img/portfolio/excursion.png' %}" class="img-responsive inline-block" alt="">
|
||||
<div class="caption">
|
||||
<div class="blur"></div>
|
||||
<div class="caption-text">
|
||||
<div class="caption portfolio-caption-white">excursions</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="caption portfolio-caption-white">excursions</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="col-lg-4 col-md-4 col-sm-6 portfolio-item wow fadeInDown text-center" data-wow-delay="0.8s">
|
||||
<ul class="caption-style-1">
|
||||
<li>
|
||||
<img src="{% static 'digitalglarus/img/portfolio/ski.png' %}" class="img-responsive inline-block" alt="">
|
||||
<div class="caption">
|
||||
<div class="blur"></div>
|
||||
<div class="caption-text">
|
||||
<div class="caption portfolio-caption-white">enjoy the great outdoors</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="caption portfolio-caption-white">enjoy the great outdoors</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
|
@ -287,12 +285,11 @@
|
|||
<img src="{% static 'digitalglarus/img/portfolio/concert.png' %}" class="img-responsive inline-block" alt="">
|
||||
<div class="caption">
|
||||
<div class="blur"></div>
|
||||
<div class="caption-text">
|
||||
<div class="caption portfolio-caption-white">cultural events</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="caption portfolio-caption-white">cultural events</div>
|
||||
</div>
|
||||
|
||||
<div class="col-lg-4 col-md-4 col-sm-6 portfolio-item wow fadeInDown text-center" data-wow-delay="1.2s">
|
||||
|
|
@ -301,12 +298,11 @@
|
|||
<img src="{% static 'digitalglarus/img/portfolio/inspire.png' %}" class="img-responsive inline-block" alt="">
|
||||
<div class="caption">
|
||||
<div class="blur"></div>
|
||||
<div class="caption-text">
|
||||
<div class="caption portfolio-caption-white">be inspired</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="caption portfolio-caption-white">be inspired</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
|
@ -317,12 +313,10 @@
|
|||
<img src="{% static 'digitalglarus/img/portfolio/workshop.png' %}" class="img-responsive inline-block" alt="">
|
||||
<div class="caption">
|
||||
<div class="blur"></div>
|
||||
<div class="caption-text">
|
||||
<div class="caption portfolio-caption-white">workshops</div>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="caption portfolio-caption-white">workshops</div>
|
||||
</div>
|
||||
|
||||
<div class="col-lg-4 col-md-4 col-sm-6 portfolio-item wow fadeInDown text-center" data-wow-delay="1.4s">
|
||||
|
|
@ -331,15 +325,19 @@
|
|||
<img src="{% static 'digitalglarus/img/portfolio/recharge.png' %}" class="img-responsive inline-block" alt="">
|
||||
<div class="caption">
|
||||
<div class="blur"></div>
|
||||
<div class="caption-text">
|
||||
<div class="caption portfolio-caption-white">recharge</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="caption portfolio-caption-white">recharge</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
|
||||
<!--aside-->
|
||||
<aside class="bg-dark">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,106 @@
|
|||
{% extends "new_base_glarus.html" %}
|
||||
{% load staticfiles cms_tags bootstrap3%}
|
||||
{% block title %}crowdfunding{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<style type="text/css">
|
||||
|
||||
#cancel-subscription-modal{
|
||||
margin-top:10%;
|
||||
}
|
||||
|
||||
#cancel-subscription-modal .modal-header{
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
#cancel-subscription-modal .modal-footer{
|
||||
border-top: none;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<section id="price">
|
||||
<div class="signup-container">
|
||||
<div class="col-xs-12 col-sm-3 col-lg-4 text-center wow fadeInDown"> </div>
|
||||
<div class="col-xs-12 col-sm-6 col-lg-4 text-center wow fadeInDown">
|
||||
|
||||
<!-- <span class="glyphicon glyphicon-user"></span> -->
|
||||
<div class="payment-box">
|
||||
<h2 class="billing-head">Membership Deactivation</h2>
|
||||
<hr class="greyline-long">
|
||||
<h2 class="membership-lead">Do you want to cancel your membership with us ?</h2>
|
||||
<div class="date-box">
|
||||
</div>
|
||||
<!--<hr class="primary">-->
|
||||
<div class="signup-form form-group row">
|
||||
|
||||
<div class="button-booking-box form-inline row">
|
||||
|
||||
<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>
|
||||
|
||||
|
||||
|
||||
<div class="modal fade bs-example-modal-sm" id="cancel-subscription-modal" tabindex="-1" role="dialog">
|
||||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
|
||||
<h4 class="modal-title">Cancel Subscription</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p>Do you want to cancel your subscription?</p>
|
||||
</div>
|
||||
<div class="modal-footer text-center">
|
||||
<button type="button" class="btn btn-primary btn-grey" data-dismiss="modal">No</button>
|
||||
<button type="submit" class="btn btn-primary">Yes</button>
|
||||
</div>
|
||||
</div><!-- /.modal-content -->
|
||||
</div><!-- /.modal-dialog -->
|
||||
</div><!-- /.modal -->
|
||||
|
||||
|
||||
</form>
|
||||
|
||||
</div>
|
||||
<div class="notice-box text-left">
|
||||
<p class="order-bottom-text">
|
||||
Your membership wouldn't be automatically renewed each month.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-3 col-lg-4 text-center wow fadeInDown"> </div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<section id="contact">
|
||||
<div class="fill">
|
||||
<div class="row" class="wow fadeInDown">
|
||||
<div class="col-lg-12 text-center wow fadeInDown">
|
||||
<div class="col-md-4 map-title">
|
||||
Digital Glarus<br>
|
||||
<span class="map-caption">In der Au 7 Schwanden 8762 Switzerland
|
||||
<br>info@digitalglarus.ch
|
||||
<br>
|
||||
(044) 534-66-22
|
||||
<p> </p>
|
||||
</span>
|
||||
</div>
|
||||
<p> </p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
{% endblock %}
|
||||
|
|
@ -1,7 +1,18 @@
|
|||
{% extends "new_base_glarus.html" %}
|
||||
{% load staticfiles bootstrap3 i18n %}
|
||||
{% block content %}
|
||||
|
||||
<style type="text/css">
|
||||
|
||||
|
||||
@media only screen and (max-width: 320px) {
|
||||
|
||||
body { font-size: 2em; }
|
||||
|
||||
|
||||
|
||||
}
|
||||
h2 {text-transform: lowercase;}
|
||||
</style>
|
||||
|
||||
<!-- Header -->
|
||||
<!-- Services Section -->
|
||||
|
|
@ -18,7 +29,7 @@
|
|||
{% if membership_start_date and membership_end_date%}
|
||||
<h2 class="member-name">{{membership_start_date|date}}-{{membership_end_date|date}}</h2>
|
||||
{% else %}
|
||||
<h2 class="member-name">You don't have an active membership</h2>
|
||||
<h2>You don't have an active membership</h2>
|
||||
{% endif %}
|
||||
<hr class="greyline-long">
|
||||
<h2 class="order-head">Orders history</h2>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,10 @@
|
|||
padding: .5em;
|
||||
padding-right: 1.5em
|
||||
}
|
||||
|
||||
@media screen and (min-width: 768px) {
|
||||
|
||||
#cancel-subscription-modal .modal-dialog {width:900px;}
|
||||
|
||||
</style>
|
||||
|
||||
|
|
@ -105,8 +109,8 @@
|
|||
<br/>
|
||||
<input type="checkbox" class="custom-control-input agree-terms">
|
||||
<span class="custom-control-indicator"></span>
|
||||
<span class="custom-control-description">I accept the Digital Glarus <a href="{% url 'digitalglarus:TermsAndConditions' %}" target="_blank">Terms and Conditions</a>, <a href=#>Community Guidelines</a> and <a href=#>Privacy Policy</a></span>
|
||||
</label>
|
||||
<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">
|
||||
<button class="btn btn-primary btn-md btn-blck submit-payment" type="submit">Purchase membership</button>
|
||||
|
|
@ -185,6 +189,78 @@
|
|||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="modal fade bs-example-modal-sm" id="cancel-subscription-modal" tabindex="-1" role="dialog" aria-hidden ="true">
|
||||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
|
||||
<h4 class="text-center">General Terms & Conditions of Digital Glarus Membership</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
|
||||
<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="price-box">
|
||||
<span class="glyphicon glyphicon-flag"></span>
|
||||
<h2 class="section-heading">General Terms & Conditions of Digital Glarus Membership</h2>
|
||||
<h2 class="price">Valid from 31 October 2016, v1.0 dated 31 October 2016</h2>
|
||||
<hr class="primary">
|
||||
<div class="price-exp-box">
|
||||
<p class="text-left">
|
||||
<p class="term-head">1. Membership</p>
|
||||
1.1. The membership fee is 35CHF per month and charged on the 1st day of each month after your first month of subscription. <br>
|
||||
1.2. Each additional day costs 15CHF for members.<br>
|
||||
<br>
|
||||
<p class="term-head">2. Coworking days</p>
|
||||
2.1. Coworking days are counted as 1 calendar day. <br>
|
||||
2.2. Free coworking days are included in the membership. <br>
|
||||
2.3. Unused working days are not refunded and can not be compensated for. <br><br>
|
||||
<p class="term-head">3. Possible reduction</p>
|
||||
3.1. Your first month's membership fee is calculated according to the date of your subscription. <br>
|
||||
3.2. The days already passed in the first month are discounted from the first month's membership fee.<br>
|
||||
3.3. A member booking more than 19 days for coworking gets a reduction in total cost and will only pay maximum 290CHF per month. The reduction will be applied automatically on Digital Glarus website.<br><br>
|
||||
<p class="term-head">4. Member's right to cancellation </p>
|
||||
4.1. The member may cancel or change the booking of working day at any time prior to 7 days before the working day with no extra cost. <br>
|
||||
4.2. Bookings cancelled less than 7 days before the working date will not be refunded.<br><br>
|
||||
<p class="term-head">5. Digital Glarus' right to cancel a membership </p>
|
||||
5.1. Digital Glarus may cancel a membership contract without notice at any time, stating the reasons for the cancellation.<br>
|
||||
5.2. Members disrupting the environment of coworking may be rejected to join the membership.<br><br>
|
||||
<p class="term-head">6. Digital Glarus' right to cancel a membership </p>
|
||||
6.1. Digital Glarus may cancel a membership contract without notice at any time, stating the reasons for the cancellation.<br>
|
||||
6.2. Digital Glarus may reject a member who disrupts the environment of coworking space from joining the membership.<br>
|
||||
6.3. Digital Glarus may terminate the membership of a member who disrupts the environment of coworking space. <br>
|
||||
6.4. Digital Glarus may expell a member who disrupts the environment of coworking space from the coworking space, stating the reasons for the expulsion.
|
||||
<br><br>
|
||||
|
||||
</p>
|
||||
<div class="text-center">
|
||||
<button type="submit" class="btn btn-primary btn-blue">Still have a question?</button>
|
||||
<a href="mailto:info@ungleich.ch" class="btn btn-primary btn-blue">Still have a question?</a>
|
||||
</div>
|
||||
<div class="row col-md-2 text-center wow fadeInDown">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="row col-md-3 text-center wow fadeInDown"></div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
<div class="modal-footer text-center">
|
||||
<button type="button" class="btn btn-primary btn-grey" data-dismiss="modal">No</button>
|
||||
<button type="submit" class="btn btn-primary">Yes</button>
|
||||
</div>
|
||||
</div><!-- /.modal-content -->
|
||||
</div><!-- /.modal-dialog -->
|
||||
</div><!-- /.modal -->
|
||||
|
||||
|
||||
<!-- stripe key data -->
|
||||
{% if stripe_key %}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,13 @@
|
|||
{% block title %}crowdfunding{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<style type="text/css">
|
||||
@media screen and (min-width: 768px) {
|
||||
|
||||
#cancel-subscription-modal .modal-dialog {width:900px;}
|
||||
</style>
|
||||
|
||||
<section id="price">
|
||||
<div class="container">
|
||||
<div class="row col-md-2 text-center wow fadeInDown"></div>
|
||||
|
|
@ -23,9 +30,14 @@
|
|||
workspace.
|
||||
</p>
|
||||
<div class="text-center">
|
||||
<a class="btn btn-primary btn-blue" href="{% url 'digitalglarus:membership_payment' %}">become a member</a>
|
||||
<a class="btn btn-primary btn-blue" href="{% url 'digitalglarus:membership_payment' %}">become a member</a>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-center">
|
||||
<br>
|
||||
<a data-toggle="modal" data-target="#cancel-subscription-modal" target="_blank">How to pay?</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -73,4 +85,52 @@
|
|||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
<div class="modal fade bs-example-modal-sm" id="cancel-subscription-modal" tabindex="-1" role="dialog" aria-hidden ="true">
|
||||
<div class="modal-dialog" role="document">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
|
||||
<h4 class="text-center">Payment information</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
|
||||
|
||||
<section id="price">
|
||||
<div class="signup-container">
|
||||
<div class="col-xs-12 col-sm-3 col-lg-4 text-center wow fadeInDown"> </div>
|
||||
<div class="col-xs-12 col-sm-6 col-lg-4 text-center wow fadeInDown">
|
||||
<div class="signup-box">
|
||||
<span class="glyphicon glyphicon-calendar"></span>
|
||||
<h2 class="section-heading">How the pricing works</h2>
|
||||
<hr class="primary">
|
||||
<h2 class="signup-lead text-left"><ul><li>All members get 2 free days per month for booking.<br></li> </ul><ul><li>Additional booking costs 15CHF per day. <br></li></ul><ul><li>But your coworking after 17th day is free of charge. </li></ul><ul><li>So more you work, more you can save money! <br></li></ul><ul><li>You will never be charged more than 290CHF per month. <br> </li></ul> </h2></ul>
|
||||
|
||||
|
||||
|
||||
<p class="signup-notice">Still have questions?<a href=#terms>Contact us!</a>.</p>
|
||||
<div class="notice-box">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-3 col-lg-4 text-center wow fadeInDown"> </div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
<div class="modal-footer text-center">
|
||||
<button type="button" class="btn btn-primary btn-grey" data-dismiss="modal">No</button>
|
||||
<button type="submit" class="btn btn-primary">Yes</button>
|
||||
</div>
|
||||
</div><!-- /.modal-content -->
|
||||
</div><!-- /.modal-dialog -->
|
||||
</div><!-- /.modal -->
|
||||
{% endblock %}
|
||||
|
|
@ -122,7 +122,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
>>>>>>> upstream/feature/new_digitalglarus
|
||||
|
||||
</style>
|
||||
{% block extra_css %} {% endblock %}
|
||||
</head>
|
||||
|
|
@ -142,17 +142,17 @@
|
|||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<p><a class="navbar-brand page-scroll"href="{% url 'digitalglarus:landing' %}"><img src="{% static 'digitalglarus/img/logo_white.svg' %}"></a></p>
|
||||
<p><a class="navbar-brand page-scroll" href="{% url 'digitalglarus:landing' %}"><img src="{% static 'digitalglarus/img/logo_white.svg' %}"></a></p>
|
||||
</div>
|
||||
|
||||
<!-- Collect the nav links, forms, and other content for toggling -->
|
||||
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<ul class="nav navbar-nav navbar-right" style="margin-right: -; margin-left: 0px;margin-right: 0px;">
|
||||
<li class="hidden active">
|
||||
<a href="#page-top"></a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="page-scroll" href="{% url 'digitalglarus:booking' %}">booking & price</a>
|
||||
<a class="page-scroll" href="{% url 'digitalglarus:booking' %}" >booking & price</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="page-scroll" href="{% url 'digitalglarus:history' %}">history</a>
|
||||
|
|
@ -164,15 +164,18 @@
|
|||
<a class="page-scroll" href="#contact">Contact</a>
|
||||
</li>
|
||||
|
||||
|
||||
{% if request.user.is_authenticated %}
|
||||
<li class="dropdown home-dropdown-mobile open">
|
||||
|
||||
|
||||
<li class="dropdown home-dropdown-mobile open">
|
||||
<a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">
|
||||
<i class="glyphicon glyphicon-user"></i>{{request.user.name}} <span class="caret"></span>
|
||||
</a>
|
||||
<ul id="g-account-menu" class="dropdown-menu" role="menu">
|
||||
<ul id="g-account-menu" class="dropdown-menu" role="menu" aria-hidden="true">
|
||||
<li>
|
||||
<a href="{% url 'digitalglarus:booking_orders_list' %}">
|
||||
<i class="fa fa-home" aria-hidden="true"></i> {% trans "Bookings"%}
|
||||
<i class="fa fa-home" aria-hidden="true"></i> {% trans "Bookings"%}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
|
|
@ -186,7 +189,7 @@
|
|||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
</li>
|
||||
|
||||
<li class="dropdown home-dropdown">
|
||||
<a class="dropdown-toggle" role="button" data-toggle="dropdown" href="#">
|
||||
|
|
@ -195,7 +198,7 @@
|
|||
<ul id="g-account-menu" class="dropdown-menu" role="menu">
|
||||
<li>
|
||||
<a href="{% url 'digitalglarus:booking_orders_list' %}">
|
||||
<i class="fa fa-home" aria-hidden="true"></i> {% trans "Bookings"%}
|
||||
<i class="fa fa-home" aria-hidden="true"></i> {% trans "Bookings"%}
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
|
|
|
|||
|
|
@ -7,13 +7,14 @@ from .views import ContactView, IndexView, AboutView, HistoryView, LoginView, Si
|
|||
MembershipPricingView, BookingSelectDatesView, BookingPaymentView, OrdersBookingDetailView,\
|
||||
BookingOrdersListView, MembershipOrdersListView, OrdersMembershipDetailView, \
|
||||
MembershipDeactivateView, MembershipDeactivateSuccessView, UserBillingAddressView, \
|
||||
MembershipReactivateView,TermsAndConditions,ValidateUser,SupportusView
|
||||
MembershipReactivateView,TermsAndConditions,ValidateUser,SupportusView,Probar
|
||||
|
||||
|
||||
# from membership.views import LoginRegistrationView
|
||||
|
||||
urlpatterns = [
|
||||
|
||||
url(_(r'probar/?$'), Probar, name='probar'),
|
||||
url(_(r'login/validate/(?P<pk>\!\w+)/?$'), ValidateUser.as_view(), name='validate-login'),
|
||||
url(_(r'^$'), IndexView.as_view(), name='landing'),
|
||||
url(_(r'terms_conditions/?$'), TermsAndConditions.as_view(), name='TermsAndConditions'),
|
||||
|
|
|
|||
|
|
@ -41,6 +41,13 @@ from .models import MembershipType, Membership, MembershipOrder, Booking, Bookin
|
|||
|
||||
from .mixins import MembershipRequiredMixin, IsNotMemberMixin
|
||||
|
||||
class Probar(LoginRequiredMixin, UpdateView):
|
||||
template_name='digitalglarus/membership_deactivated.html'
|
||||
model = Membership
|
||||
success_url = reverse_lazy('digitalglarus:probar')
|
||||
|
||||
|
||||
|
||||
class ValidateUser(TemplateView):
|
||||
#print ("ENTRE AQUI AL MENOS Y",pk)
|
||||
template_name = "digitalglarus/signup.html"
|
||||
|
|
|
|||
|
|
@ -182,6 +182,7 @@ DATABASES = {
|
|||
'default': {
|
||||
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
||||
'NAME': 'app'
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -472,3 +473,5 @@ 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'
|
||||
|
|
|
|||
|
|
@ -63,11 +63,8 @@ INSTALLED_APPS = (
|
|||
'django_select2',
|
||||
'meta',
|
||||
'meta_mixin',
|
||||
<<<<<<< HEAD
|
||||
# 'admin_enhancer',
|
||||
# 'admin_enhancer',
|
||||
'djangocms_blog',
|
||||
=======
|
||||
>>>>>>> 006d49d7dbddcfd9bb24c40d1f1939b902bc1fc4
|
||||
'bootstrap3',
|
||||
'compressor',
|
||||
'filer',
|
||||
|
|
@ -438,3 +435,7 @@ REGISTRATION_MESSAGE = {'subject': "Validation mail",
|
|||
|
||||
#dont migrate test
|
||||
# SOUTH_TESTS_MIGRATE = False
|
||||
|
||||
STRIPE_API_PUBLIC_KEY = 'pk_test_uvWyHNJgVL2IB8kjfgJkGjg4' # used in frontend to call from user browser
|
||||
STRIPE_API_PRIVATE_KEY = 'sk_test_uIPMdgXoRGydrcD7fkwcn7dj' # used in backend payment
|
||||
STRIPE_DESCRIPTION_ON_PAYMENT = "Payment for ungleich GmbH services"
|
||||
2
stripe_keys.sh
Normal file
2
stripe_keys.sh
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
export STRIPE_API_PRIVATE_KEY='sk_test_dqAmbKAij12QCGfkYZ3poGt2'
|
||||
export STRIPE_API_PUBLIC_KEY='pk_test_QqBZ50Am8KOxaAlOxbcm9Psl'
|
||||
Loading…
Reference in a new issue