Removed order id from cancel vm email templates

hosting/locale/de/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-02 19:31+0000\n"
+"POT-Creation-Date: 2017-09-03 14:48+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -258,6 +258,42 @@ msgstr ""
 "dann ignoriere diese E-Mail.\n"
 "Dankeschön!\n"
 
+#, python-format
+msgid ""
+"You're receiving this mail because your virtual machine [%(vm_name)s] has "
+"been cancelled.<br/>\n"
+"You can see your order status by clicking [my VM page] below.<br/>\n"
+"If you want to order a new virtual machine, you can do it by clicking <a "
+"href=\"%(base_url)s%(my_virtual_machines_url)s\">this link</a>.<br/>\n"
+msgstr ""
+"Du erhälst diese E-Mail, da deine virtuelle Maschine [%(vm_name)s] gekündigt "
+"wurde.<br/>\n"
+"Um deinen Auftragsstatus zu sehen, klicke auf die [my VM page] unten.<br/>\n"
+"Falls du eine neue virtuelle Maschine bestellen möchtest, kannst du dies "
+"tun, indem du <a \"href=\"%(base_url)s%(my_virtual_machines_url)s\">diesen "
+"Link klickst</a>.<br/>\n"
+
+msgid "My VM page"
+msgstr ""
+
+#, python-format
+msgid ""
+"You're receiving this mail because your virtual machine [%(vm_name)s] has "
+"been cancelled.\n"
+"You can see your order status by clicking here\n"
+"%(base_url)s%(vm_order_url)s\n"
+"If you want to order a new virtual machine, you can do it by clicking this "
+"link.\n"
+"%(base_url)s%(my_virtual_machines_url)s\n"
+msgstr ""
+"Du erhälst diese E-Mail, da deine virtuelle Maschine [%(vm_name)s] gekündigt "
+"wurde.\n"
+"Um deinen Auftragsstatus zu sehen, klicke hier.\n"
+"%(base_url)s%(vm_order_url)s\n"
+"Falls du eine neue virtuelle Maschine bestellen möchtest, kannst du dies "
+"tun, indem du diesen Link klickst.\n"
+"%(base_url)s%(my_virtual_machines_url)s"
+
 msgid "Don't have an account yet ? "
 msgstr "Besitzt du kein Benutzerkonto?"
 
@@ -575,6 +611,9 @@ msgid ""
 "contact Data Center Light Support."
 msgstr "Kontaktiere den Data Center Light Support."
 
+msgid "Virtual Machine Cancellation"
+msgstr "VM Kündigung"
+
 #~ msgid "Your SSH Keys"
 #~ msgstr "Deine SSH Keys"
 

hosting/templates/hosting/emails/vm_canceled.html

@@ -3,10 +3,13 @@
 {% 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 %}
+{% url 'hosting:orders' as vm_orders_url %}
 {% blocktrans with vm.name as vm_name %}You're receiving this mail because your virtual machine [{{vm_name}}] has been cancelled.<br/>
-You can see your order status by clicking <a href="{{base_url}}{{vm_order_url}}">here</a>.<br/>
+You can see your order status by clicking [my VM page] below.<br/>
 If you want to order a new virtual machine, you can do it by clicking <a href="{{base_url}}{{my_virtual_machines_url}}">this link</a>.<br/>
 {% endblocktrans %}
+<div class="button" style="border-collapse: collapse; font-family: 'Lato', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; padding: 30px 0;" align="center">
+    <a href="{{ base_url }}{{vm_orders_url}}" style="border-radius: 5px; color: #ffffff; display: inline-block; font-family: 'Oxygen', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: regular; line-height: 45px; text-align: center; text-decoration: none !important; width: 155px; -webkit-text-size-adjust: none; mso-hide: all; background: #ff6f6f;">{% trans 'My VM page' %}</a>
+</div>
 {% endblock %}
 

hosting/templates/hosting/emails/vm_canceled.txt

@@ -4,8 +4,8 @@
 {% 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.
+{% 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
+You can see your order status by clicking here
 {{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}}

hosting/views.py

@@ -891,10 +891,8 @@ 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')