reynir/bornhack-website
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

a few t&c related tweaks

Browse source
This commit is contained in:
Thomas Steen Rasmussen 2016-06-01 15:20:42 +02:00
parent 5672d00a2e
commit 809df2e952
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
shop/templates/order_detail.html
View file

@ -78,14 +78,16 @@
<h3>Payment</h3> <h3>Payment</h3>
{% if not order.paid %} {% if not order.paid %}
<p class="lead">Your order is currently unpaid. Please pick a payment option below.</p> <p class="lead">Your order is currently unpaid. Please pick a payment option below.</p>
<p><i>Once you accept the terms and go to the payment your order will be <p>Once you accept the terms and go to the payment your order will be
finalized and you will no longer be able to change the products or finalized and you will no longer be able to change the products or
quantities - so make sure your order is correct before proceeding!</i></p> quantities - so make sure your order is correct before proceeding!</p>
<form method="POST"> <form method="POST">
{% csrf_token %} {% csrf_token %}
<p>
<div class="checkbox"> <div class="checkbox">
<label><input type="checkbox" name="accept_terms"> Accept <a href="{% url 'general-terms' %}">general terms &amp; conditions</a>. If you have puchased merchadise you also accept that the payment will be drawn on your account when you pay, but the merchandise will not be delivered until you pick it up during the event.</label> <label><input type="checkbox" name="accept_terms"> Accept <a href="{% url 'general-terms' %}">general terms &amp; conditions</a>. If you have puchased merchandise you also accept that the payment will be drawn on your account when you pay, but the merchandise will not be delivered until you pick it up during the event.</label>
</div> </div>
</p>
{% bootstrap_button "<i class='glyphicon glyphicon-credit-card'></i> Credit card" button_type="submit" button_class="btn-primary" name="payment_method" value="credit_card" %} {% bootstrap_button "<i class='glyphicon glyphicon-credit-card'></i> Credit card" button_type="submit" button_class="btn-primary" name="payment_method" value="credit_card" %}
{% bootstrap_button "<i class='glyphicon glyphicon-bitcoin'></i> Blockchain" button_type="submit" button_class="btn-primary" name="payment_method" value="blockchain" %} {% bootstrap_button "<i class='glyphicon glyphicon-bitcoin'></i> Blockchain" button_type="submit" button_class="btn-primary" name="payment_method" value="blockchain" %}
{% bootstrap_button "<i class='glyphicon glyphicon-piggy-bank'></i> Bank transfer" button_type="submit" button_class="btn-primary" name="payment_method" value="bank_transfer" %} {% bootstrap_button "<i class='glyphicon glyphicon-piggy-bank'></i> Bank transfer" button_type="submit" button_class="btn-primary" name="payment_method" value="bank_transfer" %}

2
shop/views.py
View file

@ -256,7 +256,7 @@ class OrderDetailView(
payment_method = request.POST.get('payment_method') payment_method = request.POST.get('payment_method')
if not request.POST.get('accept_terms'): if not request.POST.get('accept_terms'):
messages.error(request, "You need to accept the general terms &amp; conditions before you can continue!") messages.error(request, "You need to accept the general terms and conditions before you can continue!")
return HttpResponseRedirect(reverse_lazy('shop:order_detail', kwargs={'pk': order.pk})) return HttpResponseRedirect(reverse_lazy('shop:order_detail', kwargs={'pk': order.pk}))
if payment_method in order.PAYMENT_METHODS: if payment_method in order.PAYMENT_METHODS: