diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 5fd2d646..5f59a319 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -84,18 +84,18 @@ INSTALLED_APPS = ( 'djangocms_file', 'djangocms_picture', 'djangocms_video', - 'djangocms_flash', - 'djangocms_googlemap', - 'djangocms_inherit', - 'djangocms_link', - 'djangocms_teaser', + # 'djangocms_flash', + # 'djangocms_googlemap', + # 'djangocms_inherit', + # 'djangocms_link', + # 'djangocms_teaser', 'djangocms_page_meta', 'djangocms_text_ckeditor', 'djangocms_admin_style', 'cmsplugin_filer_file', 'cmsplugin_filer_folder', 'cmsplugin_filer_link', - 'cmsplugin_filer_teaser', + # 'cmsplugin_filer_teaser', 'cmsplugin_filer_video', # # blog @@ -103,10 +103,9 @@ INSTALLED_APPS = ( 'reversion', # ungleich 'ungleich', -# 'ungleich_page', + 'ungleich_page', 'hosting', 'digitalglarus', - ) MIDDLEWARE_CLASSES = ( @@ -176,7 +175,7 @@ CMS_TEMPLATES = ( DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'app_new', + 'NAME': 'app', } } @@ -280,12 +279,12 @@ CACHES = { } } -#if LOGIN_URL is None: -# LOGIN_URL = APP_ROOT_ENDPOINT + 'login/' -#if LOGOUT_URL is None: -# LOGOUT_URL = APP_ROOT_ENDPOINT + 'logout/' -#if LOGIN_REDIRECT_URL is None: -# LOGIN_REDIRECT_URL = APP_ROOT_ENDPOINT +if LOGIN_URL is None: + LOGIN_URL = APP_ROOT_ENDPOINT + 'login/' +if LOGOUT_URL is None: + LOGOUT_URL = APP_ROOT_ENDPOINT + 'logout/' +if LOGIN_REDIRECT_URL is None: + LOGIN_REDIRECT_URL = APP_ROOT_ENDPOINT # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/1.7/howto/static-files/ @@ -302,7 +301,7 @@ META_SITE_PROTOCOL = 'http' META_USE_SITES = True MIGRATION_MODULES = { 'cms': 'cms.migrations', - #'filer': 'filer.migrations_django', + # 'filer': 'filer.migrations_django', # 'menus': 'menus.migrations_django', 'djangocms_flash': 'djangocms_flash.migrations_django', 'djangocms_googlemap': 'djangocms_googlemap.migrations_django', @@ -337,7 +336,6 @@ STATICFILES_FINDERS = ( THUMBNAIL_PROCESSORS = ( 'easy_thumbnails.processors.colorspace', 'easy_thumbnails.processors.autocrop', - #'easy_thumbnails.processors.scale_and_crop', 'filer.thumbnail_processors.scale_and_crop_with_subject_location', 'easy_thumbnails.processors.filters', ) @@ -443,12 +441,6 @@ PARLER_LANGUAGES = {1: ({'code': 'en-us'}, {'code': 'de'},)} AUTH_USER_MODEL = 'membership.CustomUser' - -ALLOWED_HOSTS = [ - "*" - ] - - # PAYMENT STRIPE_DESCRIPTION_ON_PAYMENT = "Payment for ungleich GmbH services" diff --git a/hosting/templates/hosting/orders.html b/hosting/templates/hosting/orders.html index ce408783..188786c6 100644 --- a/hosting/templates/hosting/orders.html +++ b/hosting/templates/hosting/orders.html @@ -1,64 +1,102 @@ {% extends "hosting/base_short.html" %} {% load staticfiles bootstrap3 %} -{% block content %} +{% block content %} -
-
-
-
- -

My Orders

-
- - - - - - - - - - - {% for order in orders %} - - - - - - - - {% endfor %} - -
#DateAmountStatus
{{order.id}}{{order.created_at}}{{order.vm_plan.price}} CHF{% if order.approved %} - Approved - {% else%} - Declined - {% endif%} - - -
+
+
+
+
+ +

My Orders

+
+ + + + + + + + + + + {% for order in orders %} + + + + + + + + +
#DateAmountStatus
{{ order.id }}{{ order.created_at }}{{ order.vm_plan.price }} CHF{% if order.approved %} + Approved + {% else %} + Declined + {% endif %} + + + +
+ + {% if is_paginated %} + - {% endif %} +
+ {% endif %} -
+
-
-
+
+
-
+ -{%endblock%} \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/hosting/urls.py b/hosting/urls.py index 9801e100..702f2b30 100644 --- a/hosting/urls.py +++ b/hosting/urls.py @@ -3,7 +3,7 @@ from django.conf.urls import url from .views import DjangoHostingView, RailsHostingView, PaymentVMView, \ NodeJSHostingView, LoginView, SignupView, IndexView, \ OrdersHostingListView, OrdersHostingDetailView, VirtualMachinesPlanListView,\ - VirtualMachineDetailView, GenerateVMSSHKeysView + VirtualMachineDetailView, GenerateVMSSHKeysView, OrdersHostingDeleteView urlpatterns = [ # url(r'pricing/?$', VMPricingView.as_view(), name='pricing'), @@ -14,6 +14,7 @@ urlpatterns = [ url(r'payment/?$', PaymentVMView.as_view(), name='payment'), url(r'orders/?$', OrdersHostingListView.as_view(), name='orders'), url(r'orders/(?P\d+)/?$', OrdersHostingDetailView.as_view(), name='orders'), + url(r'cancel_order/(?P\d+)/?$', OrdersHostingDeleteView.as_view(), name='delete_order'), url(r'my-virtual-machines/?$', VirtualMachinesPlanListView.as_view(), name='virtual_machines'), url(r'my-virtual-machines/(?P\d+)/?$', VirtualMachineDetailView.as_view(), name='virtual_machines'), diff --git a/hosting/views.py b/hosting/views.py index 8478be74..ef19bc7f 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -3,7 +3,7 @@ from django.shortcuts import get_object_or_404, render from django.core.urlresolvers import reverse_lazy, reverse from django.contrib.auth.mixins import LoginRequiredMixin -from django.views.generic import View, CreateView, FormView, ListView, DetailView, UpdateView +from django.views.generic import View, CreateView, FormView, ListView, DetailView, UpdateView, DeleteView from django.http import HttpResponseRedirect, HttpResponse from django.contrib.auth import authenticate, login from django.conf import settings @@ -126,7 +126,7 @@ class LoginView(FormView): class SignupView(CreateView): template_name = 'hosting/signup.html' form_class = HostingUserSignupForm - moodel = CustomUser + model = CustomUser def get_success_url(self): next_url = self.request.session.get('next', reverse_lazy('hosting:signup')) @@ -169,6 +169,7 @@ class GenerateVMSSHKeysView(LoginRequiredMixin, UpdateView): # return response # return HttpResponseRedirect(reverse('')) + class PaymentVMView(LoginRequiredMixin, FormView): template_name = 'hosting/payment.html' login_url = reverse_lazy('hosting:login') @@ -264,6 +265,10 @@ class OrdersHostingListView(LoginRequiredMixin, ListView): self.queryset = HostingOrder.objects.filter(customer__user=user) return super(OrdersHostingListView, self).get_queryset() +class OrdersHostingDeleteView(LoginRequiredMixin,DeleteView): + login_url=reverse_lazy('hosting:login') + success_url = reverse_lazy('hosting:orders') + model = HostingOrder class VirtualMachinesPlanListView(LoginRequiredMixin, ListView): template_name = "hosting/virtual_machines.html"