From 6c588e353152eee53b4f0a6ccc6c7888d3c395d4 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Thu, 15 Jun 2017 23:31:19 +0530 Subject: [PATCH 1/3] Deleted the order.html --- .../templates/datacenterlight/order.html | 98 ------------------- 1 file changed, 98 deletions(-) delete mode 100644 datacenterlight/templates/datacenterlight/order.html diff --git a/datacenterlight/templates/datacenterlight/order.html b/datacenterlight/templates/datacenterlight/order.html deleted file mode 100644 index b646ef89..00000000 --- a/datacenterlight/templates/datacenterlight/order.html +++ /dev/null @@ -1,98 +0,0 @@ -{% extends "datacenterlight/base.html" %} -{% load staticfiles i18n %} - -{% block content %} - -
- -
-

{% trans "We are cutting down the costs significantly!" %}

-
- -
- -
-
- -
-
- {% csrf_token %} - -
-

{% trans "VM hosting" %}

-
-
- 15 - CHF -
-

{% trans "VAT included" %}

-
-
-
-
-

{% trans "Hosted in Switzerland" %}

-
-
- - - Core - -
-
- - - GB RAM - -
-
- - - {% trans "GB Storage (SSD)" %} - -
- - -
- - -
- - - -
- - -
-
- - -
-
- - -
-
-
-
-
-
- -
-

{% trans "Simple and affordable: Try our virtual machine with featherlight price." %}

- -
-

{% trans "Our VMs are hosted in Glarus, Switzerland, and our website is currently running in BETA mode. If you want more information that you did not find on our website, or if your order is more detailed, or if you encounter any technical hiccups, please contact us at support@datacenterlight.ch, our team will get in touch with you asap." %}

-
-
-
- - -{% endblock %} - - From e897bb9c22457b224d0cc88706f883f7bcdd4bb9 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Thu, 15 Jun 2017 23:32:20 +0530 Subject: [PATCH 2/3] Removed unused /order url --- datacenterlight/urls.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py index f14e7186..aad6442e 100644 --- a/datacenterlight/urls.py +++ b/datacenterlight/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url -from .views import IndexView, BetaProgramView, LandingProgramView, BetaAccessView, PricingView, SuccessView, OrderView +from .views import IndexView, BetaProgramView, LandingProgramView, BetaAccessView, PricingView, SuccessView urlpatterns = [ @@ -8,7 +8,6 @@ urlpatterns = [ url(r'^/beta-program/?$', BetaProgramView.as_view(), name='beta'), url(r'^/landing/?$', LandingProgramView.as_view(), name='landing'), url(r'^/pricing/?$', PricingView.as_view(), name='pricing'), - url(r'^/order/?$', OrderView.as_view(), name='order'), url(r'^/order-success/?$', SuccessView.as_view(), name='order_success'), url(r'^/beta_access?$', BetaAccessView.as_view(), name='beta_access'), ] From 36567071c0ebfa2309396984c2cfd5afed7bd7da Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Thu, 15 Jun 2017 23:36:58 +0530 Subject: [PATCH 3/3] Removed OrderView as we no longer use it --- datacenterlight/views.py | 76 ++-------------------------------------- 1 file changed, 2 insertions(+), 74 deletions(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index d23c4231..427f8c70 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -70,78 +70,6 @@ class PricingView(TemplateView): return redirect(reverse('hosting:payment')) -class OrderView(TemplateView): - template_name = "datacenterlight/order.html" - - def get(self, request, *args, **kwargs): - try: - manager = OpenNebulaManager() - templates = manager.get_templates() - - context = { - 'templates': VirtualMachineTemplateSerializer(templates, many=True).data, - } - except: - messages.error( request, - 'We have a temporary problem to connect to our backend. \ - Please try again in a few minutes' - ) - context = { - 'error' : 'connection' - } - - return render(request, self.template_name, context) - - def post(self, request): - - cores = request.POST.get('cpu') - memory = request.POST.get('ram') - storage = request.POST.get('storage') - price = request.POST.get('total') - template_id = int(request.POST.get('config')) - manager = OpenNebulaManager() - template = manager.get_template(template_id) - template_data = VirtualMachineTemplateSerializer(template).data - - name = request.POST.get('name') - email = request.POST.get('email') - name_field = forms.CharField() - email_field = forms.EmailField() - try: - name = name_field.clean(name) - except ValidationError as err: - messages.add_message(self.request, messages.ERROR, '%(value) is not a proper name.'.format(name)) - return HttpResponseRedirect(reverse('datacenterlight:order')) - - try: - email = email_field.clean(email) - except ValidationError as err: - messages.add_message(self.request, messages.ERROR, '%(value) is not a proper email.'.format(email)) - return HttpResponseRedirect(reverse('datacenterlight:order')) - - context = { - 'name': name, - 'email': email, - 'cores': cores, - 'memory': memory, - 'storage': storage, - 'price': price, - 'template': template_data['name'], - } - email_data = { - 'subject': "Data Center Light Order from %s" % context['email'], - 'from_address': '(datacenterlight) datacenterlight Support ', - 'to': 'info@ungleich.ch', - 'context': context, - 'template_name': 'new_order_notification', - 'template_path': 'datacenterlight/emails/' - } - email = EmailMessage(**email_data) - email.send() - - return HttpResponseRedirect(reverse('datacenterlight:order_success')) - - class BetaAccessView(FormView): template_name = "datacenterlight/beta_access.html" form_class = BetaAccessForm @@ -277,13 +205,13 @@ class IndexView(CreateView): name = name_field.clean(name) except ValidationError as err: messages.add_message(self.request, messages.ERROR, '%(value) is not a proper name.'.format(name)) - return HttpResponseRedirect(reverse('datacenterlight:order')) + return HttpResponseRedirect(reverse('datacenterlight:index')) try: email = email_field.clean(email) except ValidationError as err: messages.add_message(self.request, messages.ERROR, '%(value) is not a proper email.'.format(email)) - return HttpResponseRedirect(reverse('datacenterlight:order')) + return HttpResponseRedirect(reverse('datacenterlight:index')) context = { 'name': name,