From 5cfcf13e7da13284099086cfea97569abce20e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Tue, 10 May 2016 22:20:01 +0200 Subject: [PATCH] We don't only operate on tickets - renaming and refactoring accordingly --- bornhack/settings/base.py | 2 +- bornhack/templates/base.html | 4 +- bornhack/urls.py | 4 +- camps/migrations/0005_auto_20160510_2011.py | 24 ++ camps/models.py | 6 +- {tickets => shop}/__init__.py | 0 shop/admin.py | 46 ++++ shop/apps.py | 5 + shop/epayintegration.py | 218 ++++++++++++++++++ shop/forms.py | 1 + {tickets => shop}/managers.py | 2 +- shop/migrations/0001_initial.py | 127 ++++++++++ .../0002_orderproductrelation_handed_out.py | 20 ++ {tickets => shop}/migrations/__init__.py | 0 {tickets => shop}/models.py | 81 ++++--- .../templates/shop}/detail.html | 0 .../templates/shop}/epay_form.html | 0 .../templates/shop}/index.html | 21 +- .../templates/shop}/order.html | 0 {tickets => shop}/tests.py | 0 shop/urls.py | 27 +++ shop/views.py | 102 ++++++++ tickets/admin.py | 29 --- tickets/apps.py | 5 - tickets/forms.py | 21 -- tickets/migrations/0001_initial.py | 62 ----- tickets/migrations/0002_auto_20160506_1602.py | 36 --- tickets/migrations/0003_auto_20160506_2016.py | 31 --- .../migrations/0004_ticket_payment_method.py | 20 -- tickets/urls.py | 29 --- tickets/views.py | 150 ------------ 31 files changed, 634 insertions(+), 439 deletions(-) create mode 100644 camps/migrations/0005_auto_20160510_2011.py rename {tickets => shop}/__init__.py (100%) create mode 100644 shop/admin.py create mode 100644 shop/apps.py create mode 100644 shop/epayintegration.py create mode 100644 shop/forms.py rename {tickets => shop}/managers.py (88%) create mode 100644 shop/migrations/0001_initial.py create mode 100644 shop/migrations/0002_orderproductrelation_handed_out.py rename {tickets => shop}/migrations/__init__.py (100%) rename {tickets => shop}/models.py (58%) rename {tickets/templates/tickets => shop/templates/shop}/detail.html (100%) rename {tickets/templates/tickets => shop/templates/shop}/epay_form.html (100%) rename {tickets/templates/tickets => shop/templates/shop}/index.html (73%) rename {tickets/templates/tickets => shop/templates/shop}/order.html (100%) rename {tickets => shop}/tests.py (100%) create mode 100644 shop/urls.py create mode 100644 shop/views.py delete mode 100644 tickets/admin.py delete mode 100644 tickets/apps.py delete mode 100644 tickets/forms.py delete mode 100644 tickets/migrations/0001_initial.py delete mode 100644 tickets/migrations/0002_auto_20160506_1602.py delete mode 100644 tickets/migrations/0003_auto_20160506_2016.py delete mode 100644 tickets/migrations/0004_ticket_payment_method.py delete mode 100644 tickets/urls.py delete mode 100644 tickets/views.py diff --git a/bornhack/settings/base.py b/bornhack/settings/base.py index 816b468a..73ae5bda 100644 --- a/bornhack/settings/base.py +++ b/bornhack/settings/base.py @@ -26,7 +26,7 @@ INSTALLED_APPS = [ 'profiles', 'camps', - 'tickets', + 'shop', 'allauth', 'allauth.account', diff --git a/bornhack/templates/base.html b/bornhack/templates/base.html index 04073465..d94c98b0 100644 --- a/bornhack/templates/base.html +++ b/bornhack/templates/base.html @@ -37,8 +37,8 @@