| {{vm.name}} |
- {{vm.hosting_company_name}} |
+ {{vm.location}} |
{{vm.price}} CHF |
diff --git a/hosting/urls.py b/hosting/urls.py
index 702f2b30..bc72a636 100644
--- a/hosting/urls.py
+++ b/hosting/urls.py
@@ -1,9 +1,10 @@
from django.conf.urls import url
-from .views import DjangoHostingView, RailsHostingView, PaymentVMView, \
+from .views import DjangoHostingView, RailsHostingView, PaymentVMView,\
NodeJSHostingView, LoginView, SignupView, IndexView, \
OrdersHostingListView, OrdersHostingDetailView, VirtualMachinesPlanListView,\
- VirtualMachineDetailView, GenerateVMSSHKeysView, OrdersHostingDeleteView
+ VirtualMachineDetailView, GenerateVMSSHKeysView, OrdersHostingDeleteView, NotificationsView, \
+ MarkAsReadNotificationView
urlpatterns = [
# url(r'pricing/?$', VMPricingView.as_view(), name='pricing'),
@@ -20,6 +21,9 @@ urlpatterns = [
name='virtual_machines'),
url(r'my-virtual-machines/(?P\d+)/key/?$', GenerateVMSSHKeysView.as_view(),
name='virtual_machine_key'),
+ url(r'^notifications/$', NotificationsView.as_view(), name='notifications'),
+ url(r'^notifications/(?P\d+)/?$', MarkAsReadNotificationView.as_view(),
+ name='read_notification'),
url(r'login/?$', LoginView.as_view(), name='login'),
url(r'signup/?$', SignupView.as_view(), name='signup'),
url(r'^logout/?$', 'django.contrib.auth.views.logout',
diff --git a/hosting/views.py b/hosting/views.py
index ad892143..bb4b5b1e 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -2,17 +2,22 @@
from django.shortcuts import get_object_or_404, render,render_to_response
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, DeleteView
-from django.http import HttpResponseRedirect, HttpResponse
+from django.views.generic import View, CreateView, FormView, ListView, DetailView,\
+ DeleteView, TemplateView, UpdateView
+from django.http import HttpResponseRedirect
from django.contrib.auth import authenticate, login
from django.conf import settings
-from django.contrib import messages
+
+
+from stored_messages.settings import stored_messages_settings
+from stored_messages.models import Message
+from stored_messages.api import mark_read
+
from membership.models import CustomUser, StripeCustomer
from utils.stripe_utils import StripeUtils
from utils.forms import BillingAddressForm
-from utils.models import BillingAddress
+from utils.mailer import BaseEmail
from .models import VirtualMachineType, VirtualMachinePlan, HostingOrder
from .forms import HostingUserSignupForm, HostingUserLoginForm
from .mixins import ProcessVMSelectionMixin
@@ -145,6 +150,34 @@ class SignupView(CreateView):
return HttpResponseRedirect(self.get_success_url())
+class NotificationsView(TemplateView):
+ template_name = 'hosting/notifications.html'
+
+ def get_context_data(self, **kwargs):
+ context = super(NotificationsView, self).get_context_data(**kwargs)
+ backend = stored_messages_settings.STORAGE_BACKEND()
+ unread_notifications = backend.inbox_list(self.request.user)
+ read_notifications = backend.archive_list(self.request.user)
+ context.update({
+ 'unread_notifications': unread_notifications,
+ 'all_notifications': read_notifications + unread_notifications
+ })
+ return context
+
+
+class MarkAsReadNotificationView(LoginRequiredMixin, UpdateView):
+ model = Message
+ success_url = reverse_lazy('hosting:notifications')
+ fields = '__all__'
+
+ def post(self, *args, **kwargs):
+ message = self.get_object()
+ backend = stored_messages_settings.STORAGE_BACKEND()
+ backend.archive_store([self.request.user], message)
+ mark_read(self.request.user, message)
+ return HttpResponseRedirect(reverse('hosting:notifications'))
+
+
class GenerateVMSSHKeysView(LoginRequiredMixin, DetailView):
model = VirtualMachinePlan
template_name = 'hosting/virtual_machine_key.html'
@@ -174,6 +207,7 @@ class PaymentVMView(LoginRequiredMixin, FormView):
context.update({
'stripe_key': settings.STRIPE_API_PUBLIC_KEY
})
+
return context
def post(self, request, *args, **kwargs):
@@ -199,7 +233,7 @@ class PaymentVMView(LoginRequiredMixin, FormView):
customer = StripeCustomer.get_or_create(email=self.request.user.email,
token=token)
if not customer:
- form.add_error("__all__","Invalid credit card")
+ form.add_error("__all__", "Invalid credit card")
return self.render_to_response(self.get_context_data(form=form))
# Create Virtual Machine Plan
@@ -233,6 +267,18 @@ class PaymentVMView(LoginRequiredMixin, FormView):
# If the Stripe payment was successed, set order status approved
order.set_approved()
+
+ # Send notification to ungleich as soon as VM has been booked
+ # TODO send email using celery
+ email_data = {
+ 'subject': 'New VM request',
+ 'to': 'info@ungleich.ch',
+ 'template_name': 'new_booked_vm',
+ 'template_path': 'emails/'
+ }
+ email = BaseEmail(**email_data)
+ email.send()
+
request.session.update({
'charge': charge,
'order': order.id,
@@ -265,10 +311,11 @@ class OrdersHostingListView(LoginRequiredMixin, ListView):
class OrdersHostingDeleteView(LoginRequiredMixin, DeleteView):
- login_url=reverse_lazy('hosting:login')
+ login_url = reverse_lazy('hosting:login')
success_url = reverse_lazy('hosting:orders')
model = HostingOrder
+
class VirtualMachinesPlanListView(LoginRequiredMixin, ListView):
template_name = "hosting/virtual_machines.html"
login_url = reverse_lazy('hosting:login')
diff --git a/membership/migrations/0006_auto_20160526_0445.py b/membership/migrations/0006_auto_20160526_0445.py
new file mode 100644
index 00000000..6d92c564
--- /dev/null
+++ b/membership/migrations/0006_auto_20160526_0445.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-05-26 04:45
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('auth', '0007_alter_validators_add_error_messages'),
+ ('membership', '0005_customuser_is_admin'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='customuser',
+ name='groups',
+ field=models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups'),
+ ),
+ migrations.AddField(
+ model_name='customuser',
+ name='is_superuser',
+ field=models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status'),
+ ),
+ migrations.AddField(
+ model_name='customuser',
+ name='user_permissions',
+ field=models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions'),
+ ),
+ ]
diff --git a/membership/models.py b/membership/models.py
index 97d3ee06..ea235f06 100644
--- a/membership/models.py
+++ b/membership/models.py
@@ -2,7 +2,7 @@ from datetime import datetime
from django.db import models
from django.utils.translation import ugettext_lazy as _
-from django.contrib.auth.models import User, AbstractBaseUser, BaseUserManager, AbstractUser
+from django.contrib.auth.models import User, AbstractBaseUser, BaseUserManager, AbstractUser, PermissionsMixin
from django.contrib.auth.hashers import make_password
from django.core.validators import RegexValidator
from django.contrib.auth.models import User
@@ -47,7 +47,7 @@ class MyUserManager(BaseUserManager):
return user
-class CustomUser(AbstractBaseUser):
+class CustomUser(AbstractBaseUser, PermissionsMixin):
VALIDATED_CHOICES = ((0, 'Not validated'), (1, 'Validated'))
site = models.ForeignKey(Site, default=1)
name = models.CharField(max_length=50)
diff --git a/requirements.txt b/requirements.txt
index dcf2b02b..4bd93ee0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,6 +18,7 @@ easy_thumbnails
django-polymorphic
model-mommy
pycryptodome
+django-stored-messages
#PLUGINS
djangocms_flash
diff --git a/utils/mailer.py b/utils/mailer.py
index a12ffba6..130b74ee 100644
--- a/utils/mailer.py
+++ b/utils/mailer.py
@@ -1,9 +1,32 @@
import six
from django.core.mail import send_mail
+from django.core.mail import EmailMultiAlternatives
+from django.template.loader import render_to_string
+
from django.conf import settings
+class BaseEmail(object):
+
+ def __init__(self, *args, **kwargs):
+ self.to = kwargs.get('to')
+ self.template_name = kwargs.get('template_name')
+ self.template_path = kwargs.get('template_path')
+ self.subject = kwargs.get('subject')
+ self.context = kwargs.get('context', {})
+ self.template_full_path = '%s%s' % (self.template_path, self.template_name)
+ text_content = render_to_string('%s.txt' % self.template_full_path, self.context)
+ html_content = render_to_string('%s.html' % self.template_full_path, self.context)
+
+ self.email = EmailMultiAlternatives(self.subject, text_content)
+ self.email.attach_alternative(html_content, "text/html")
+ self.email.to = ['info@digitalglarus.ch']
+
+ def send(self):
+ self.email.send()
+
+
class BaseMailer(object):
def __init__(self):
self._slug = None
@@ -50,3 +73,4 @@ class DigitalGlarusRegistrationMailer(BaseMailer):
self.registration = self.message
self._message = self._message.format(slug=self._slug)
super().__init__()
+
|
diff --git a/hosting/templates/hosting/notifications.html b/hosting/templates/hosting/notifications.html
new file mode 100644
index 00000000..959dfe4f
--- /dev/null
+++ b/hosting/templates/hosting/notifications.html
@@ -0,0 +1,90 @@
+{% extends "hosting/base_short.html" %}
+{% load staticfiles bootstrap3 %}
+{% block content %}
+++ +{%endblock%} + + + + + + + + + diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html index 55d07b86..210739d6 100644 --- a/hosting/templates/hosting/virtual_machine_detail.html +++ b/hosting/templates/hosting/virtual_machine_detail.html @@ -122,12 +122,16 @@++ +++++ +++