diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html index 9231bca8..8a5f39f6 100644 --- a/hosting/templates/hosting/order_detail.html +++ b/hosting/templates/hosting/order_detail.html @@ -20,7 +20,7 @@
-

{% trans "Confirm Order"%}

{% trans "Order #"%} {{order.id}}

+

{{page_header_text}}

{% trans "Order #"%} {{order.id}}


diff --git a/hosting/views.py b/hosting/views.py index 39aaf2e7..19ec5b2a 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -36,7 +36,6 @@ from opennebula_api.serializers import VirtualMachineSerializer, \ VirtualMachineTemplateSerializer from django.utils.translation import ugettext_lazy as _ - CONNECTION_ERROR = "Your VMs cannot be displayed at the moment due to a backend \ connection error. please try again in a few minutes." @@ -639,7 +638,9 @@ class PaymentVMView(LoginRequiredMixin, FormView): email = BaseEmail(**email_data) email.send() - return HttpResponseRedirect(reverse('hosting:orders', kwargs={'pk': order.id})) + return HttpResponseRedirect( + "{url}?{query_params}".format(url=reverse('hosting:orders', kwargs={'pk': order.id}), + query_params='page=payment')) else: return self.form_invalid(form) @@ -658,6 +659,10 @@ class OrdersHostingDetailView(PermissionRequiredMixin, LoginRequiredMixin, Detai owner = self.request.user manager = OpenNebulaManager(email=owner.email, password=owner.password) + if self.request.GET.get('page', '') == 'payment': + context['page_header_text'] = _('Confirm Order') + else: + context['page_header_text'] = _('Invoice') try: vm = manager.get_vm(obj.vm_id) context['vm'] = VirtualMachineSerializer(vm).data