diff --git a/hosting/templates/hosting/emails/vm_canceled.html b/hosting/templates/hosting/emails/vm_canceled.html index 8f10ccda..e0f382cc 100644 --- a/hosting/templates/hosting/emails/vm_canceled.html +++ b/hosting/templates/hosting/emails/vm_canceled.html @@ -3,12 +3,10 @@ {% block email_head %}{{page_header}}{% endblock %} {% block email_body %} {% url 'hosting:virtual_machines' as my_virtual_machines_url %} +{% url 'hosting:orders' order.id as vm_order_url %} {% blocktrans with vm.name as vm_name %}You're receiving this mail because your virtual machine [{{vm_name}}] has been cancelled.
-You can see your order status by clicking [my VM page] below. -If you want to order a new virtual machine, you can do it by clicking this link []. - -Visit [my VM page] Now - +You can see your order status by clicking here.
+If you want to order a new virtual machine, you can do it by clicking this link.
{% endblocktrans %} {% endblock %} diff --git a/hosting/templates/hosting/emails/vm_canceled.txt b/hosting/templates/hosting/emails/vm_canceled.txt index c60ba661..81df786f 100644 --- a/hosting/templates/hosting/emails/vm_canceled.txt +++ b/hosting/templates/hosting/emails/vm_canceled.txt @@ -1,136 +1,13 @@ -{% load static from staticfiles %} - - - - - - -Oxygen Invoice - - - - - - - - - - - - - -
-
- - -
- -
- - - -
- logo - -
-
- -
-
-
-
- - - - - - - - - - -
- Your virtual machine {{vm.name}} status has been updated to {{vm.get_status_display}} -
- You can manage your vm clicking on the button below -
- -
-
-
-
- - -
- ungleich
-
-
-
- - - +{% extends "datacenterlight/emails/base_email_datacenterlight.txt" %} +{% load i18n %} +{% block email_head %}{{page_header}}{% endblock %} +{% block email_body %} +{% url 'hosting:virtual_machines' as my_virtual_machines_url %} +{% url 'hosting:orders' order.id as vm_order_url %} +{% blocktrans with vm.name as vm_name %}{% blocktrans with vm.name as vm_name %}You're receiving this mail because your virtual machine [{{vm_name}}] has been cancelled. +You can see your order status by clicking +{{base_url}}{{vm_order_url}} +If you want to order a new virtual machine, you can do it by clicking this link. +{{base_url}}{{my_virtual_machines_url}} +{% endblocktrans %} +{% endblock %} \ No newline at end of file diff --git a/hosting/views.py b/hosting/views.py index ed72d8f6..4856a0f1 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -891,9 +891,10 @@ class VirtualMachineView(LoginRequiredMixin, View): 'Error terminating VM %s' % (opennebula_vm_id) ) return HttpResponseRedirect(self.get_success_url()) - + order = HostingOrder.objects.filter(vm_id=vm.id).first() context = { 'vm': vm, + 'order': order, 'base_url': "{0}://{1}".format(self.request.scheme, self.request.get_host()), 'page_header': _('Virtual Machine Cancellation')