hosting settings url, view and template added
This commit is contained in:
		
					parent
					
						
							
								63635f158e
							
						
					
				
			
			
				commit
				
					
						c87e2cd36b
					
				
			
		
					 2 changed files with 21 additions and 3 deletions
				
			
		| 
						 | 
					@ -7,7 +7,8 @@ from .views import DjangoHostingView, RailsHostingView, PaymentVMView,\
 | 
				
			||||||
    VirtualMachineView, OrdersHostingDeleteView, NotificationsView, \
 | 
					    VirtualMachineView, OrdersHostingDeleteView, NotificationsView, \
 | 
				
			||||||
    MarkAsReadNotificationView, PasswordResetView, PasswordResetConfirmView, HostingPricingView,\
 | 
					    MarkAsReadNotificationView, PasswordResetView, PasswordResetConfirmView, HostingPricingView,\
 | 
				
			||||||
    CreateVirtualMachinesView, HostingBillListView, HostingBillDetailView, \
 | 
					    CreateVirtualMachinesView, HostingBillListView, HostingBillDetailView, \
 | 
				
			||||||
    SSHKeyDeleteView, SSHKeyCreateView, SSHKeyListView, SSHKeyChoiceView
 | 
					    SSHKeyDeleteView, SSHKeyCreateView, SSHKeyListView, SSHKeyChoiceView, \
 | 
				
			||||||
 | 
					    SettingsView
 | 
				
			||||||
 | 
					
 | 
				
			||||||
urlpatterns = [
 | 
					urlpatterns = [
 | 
				
			||||||
    url(r'index/?$', IndexView.as_view(), name='index'),
 | 
					    url(r'index/?$', IndexView.as_view(), name='index'),
 | 
				
			||||||
| 
						 | 
					@ -16,6 +17,7 @@ urlpatterns = [
 | 
				
			||||||
    url(r'rails/?$', RailsHostingView.as_view(), name='railshosting'),
 | 
					    url(r'rails/?$', RailsHostingView.as_view(), name='railshosting'),
 | 
				
			||||||
    url(r'pricing/?$', HostingPricingView.as_view(), name='pricing'),
 | 
					    url(r'pricing/?$', HostingPricingView.as_view(), name='pricing'),
 | 
				
			||||||
    url(r'payment/?$', PaymentVMView.as_view(), name='payment'),
 | 
					    url(r'payment/?$', PaymentVMView.as_view(), name='payment'),
 | 
				
			||||||
 | 
					    url(r'settings/?$', SettingsView.as_view(), name='settings'),
 | 
				
			||||||
    url(r'orders/?$', OrdersHostingListView.as_view(), name='orders'),
 | 
					    url(r'orders/?$', OrdersHostingListView.as_view(), name='orders'),
 | 
				
			||||||
    url(r'orders/(?P<pk>\d+)/?$', OrdersHostingDetailView.as_view(), name='orders'),
 | 
					    url(r'orders/(?P<pk>\d+)/?$', OrdersHostingDetailView.as_view(), name='orders'),
 | 
				
			||||||
    url(r'bills/?$', HostingBillListView.as_view(), name='bills'),
 | 
					    url(r'bills/?$', HostingBillListView.as_view(), name='bills'),
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -40,6 +40,20 @@ CONNECTION_ERROR = "Your VMs cannot be displayed at the moment due to a backend
 | 
				
			||||||
                    connection error. please try again in a few minutes."
 | 
					                    connection error. please try again in a few minutes."
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class SettingsView(View):
 | 
				
			||||||
 | 
					    template_name = "hosting/settings.html"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    def get_context_data(self, **kwargs):
 | 
				
			||||||
 | 
					        context = {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        return context
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    def get(self, request, *args, **kwargs):
 | 
				
			||||||
 | 
					        context = self.get_context_data()
 | 
				
			||||||
 | 
					        return render(request, self.template_name, context)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class DjangoHostingView(ProcessVMSelectionMixin, View):
 | 
					class DjangoHostingView(ProcessVMSelectionMixin, View):
 | 
				
			||||||
    template_name = "hosting/django.html"
 | 
					    template_name = "hosting/django.html"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -558,7 +572,8 @@ class PaymentVMView(LoginRequiredMixin, FormView):
 | 
				
			||||||
                                                    token=token)
 | 
					                                                    token=token)
 | 
				
			||||||
            if not customer:
 | 
					            if not customer:
 | 
				
			||||||
                msg = _("Invalid credit card")
 | 
					                msg = _("Invalid credit card")
 | 
				
			||||||
                messages.add_message(self.request, messages.ERROR, msg, extra_tags='make_charge_error')
 | 
					                messages.add_message(
 | 
				
			||||||
 | 
					                    self.request, messages.ERROR, msg, extra_tags='make_charge_error')
 | 
				
			||||||
                return HttpResponseRedirect(reverse('hosting:payment') + '#payment_error')
 | 
					                return HttpResponseRedirect(reverse('hosting:payment') + '#payment_error')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            # Create Billing Address
 | 
					            # Create Billing Address
 | 
				
			||||||
| 
						 | 
					@ -572,7 +587,8 @@ class PaymentVMView(LoginRequiredMixin, FormView):
 | 
				
			||||||
            # Check if the payment was approved
 | 
					            # Check if the payment was approved
 | 
				
			||||||
            if not charge_response.get('response_object'):
 | 
					            if not charge_response.get('response_object'):
 | 
				
			||||||
                msg = charge_response.get('error')
 | 
					                msg = charge_response.get('error')
 | 
				
			||||||
                messages.add_message(self.request, messages.ERROR, msg, extra_tags='make_charge_error')
 | 
					                messages.add_message(
 | 
				
			||||||
 | 
					                    self.request, messages.ERROR, msg, extra_tags='make_charge_error')
 | 
				
			||||||
                return HttpResponseRedirect(reverse('hosting:payment') + '#payment_error')
 | 
					                return HttpResponseRedirect(reverse('hosting:payment') + '#payment_error')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            charge = charge_response.get('response_object')
 | 
					            charge = charge_response.get('response_object')
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue