All prices are stated inclusive of value added tax. The price applicable is the price set out next to the product or services in question on the website on the date of ordering.
-The following credit cards and debit cards can be used for payment: Visa, Mastercard, Visa/Dankort. The fee for credit and debit card payments (1,45%/2,75%) is paid by the Customer. Payment can also be done by bank transfer to our bank account or using blockchain payments. All online purchase payment shall be made online.
+The following credit cards and debit cards can be used for payment: Visa, Mastercard, Visa/Dankort. The fee for credit and debit card payments (1,45%/2,75%) is paid by the Customer. Payment can also be done by bank transfer to our bank account or using blockchain payments or by cash. All online purchase payment shall be made online.
The amount has been drawn on your account when our invoice has been sent to you.
diff --git a/shop/migrations/0031_auto_20161109_1000.py b/shop/migrations/0031_auto_20161109_1000.py new file mode 100644 index 00000000..afd129fb --- /dev/null +++ b/shop/migrations/0031_auto_20161109_1000.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2016-11-09 10:00 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('shop', '0030_auto_20160827_0752'), + ] + + operations = [ + migrations.AlterField( + model_name='order', + name='payment_method', + field=models.CharField(choices=[(b'credit_card', b'Credit card'), (b'blockchain', b'Blockchain'), (b'bank_transfer', b'Bank transfer'), (b'cash', b'Cash')], default=b'', max_length=50), + ), + ] diff --git a/shop/models.py b/shop/models.py index a4e69f7d..c78712fc 100644 --- a/shop/models.py +++ b/shop/models.py @@ -87,17 +87,20 @@ class Order(CreatedUpdatedModel): CREDIT_CARD = 'credit_card' BLOCKCHAIN = 'blockchain' BANK_TRANSFER = 'bank_transfer' + CASH = 'cash' PAYMENT_METHODS = [ CREDIT_CARD, BLOCKCHAIN, BANK_TRANSFER, + CASH, ] PAYMENT_METHOD_CHOICES = [ (CREDIT_CARD, 'Credit card'), (BLOCKCHAIN, 'Blockchain'), (BANK_TRANSFER, 'Bank transfer'), + (CASH, 'Cash'), ] payment_method = models.CharField( diff --git a/shop/templates/cash.html b/shop/templates/cash.html new file mode 100644 index 00000000..f8b3ca37 --- /dev/null +++ b/shop/templates/cash.html @@ -0,0 +1,12 @@ +{% extends 'shop_base.html' %} +{% load bootstrap3 %} +{% load shop_tags %} + +{% block shop_content %} + +To pay order #{{ order.id }} you need to locate an organiser (in person) and make the cash payment of {{ order.total|currency }}. You need to bring the order id #{{ order.id }} as well so we can mark your order as paid.
+ +If physically finding an organiser is inconvenient for you (during events you can find us at the Infodesk, but between events geography can make things difficult) you should go back and pick a different payment method.
+When your order has been marked as paid you will receive an invoice by email.
+{% endblock %} diff --git a/shop/templates/order_detail.html b/shop/templates/order_detail.html index 050c6522..ed01525a 100644 --- a/shop/templates/order_detail.html +++ b/shop/templates/order_detail.html @@ -91,6 +91,7 @@ quantities - so make sure your order is correct before proceeding! {% bootstrap_button " Credit card" button_type="submit" button_class="btn-primary" name="payment_method" value="credit_card" %} {% bootstrap_button " Blockchain" button_type="submit" button_class="btn-primary" name="payment_method" value="blockchain" %} {% bootstrap_button " Bank transfer" button_type="submit" button_class="btn-primary" name="payment_method" value="bank_transfer" %} + {% bootstrap_button " Cash" button_type="submit" button_class="btn-primary" name="payment_method" value="cash" %}If you have already paid but your order is still showing unpaid,
diff --git a/shop/urls.py b/shop/urls.py
index 5dc7d29b..ff6e3b88 100644
--- a/shop/urls.py
+++ b/shop/urls.py
@@ -21,6 +21,8 @@ urlpatterns = [
url(r'orders/(?P