ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

Simplified code

Browse source
This commit is contained in:
M.Ravi 2017-09-22 12:38:05 +02:00
commit 31f7c4a51a
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
datacenterlight/views.py
View file

@ -9,7 +9,7 @@ from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.shortcuts import redirect from django.shortcuts import redirect
from django.shortcuts import render from django.shortcuts import render
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import get_language, ugettext_lazy as _
from django.views.decorators.cache import cache_control from django.views.decorators.cache import cache_control
from django.views.generic import FormView, CreateView, TemplateView, DetailView from django.views.generic import FormView, CreateView, TemplateView, DetailView
@ -585,8 +585,7 @@ class OrderConfirmationView(DetailView):
# Create user if the user is not logged in and if he is not already # Create user if the user is not logged in and if he is not already
# registered # registered
if not request.user.is_authenticated() and CustomUser.objects.filter( if not request.user.is_authenticated():
email=user.get('email')).exists():
try: try:
custom_user = CustomUser.objects.get( custom_user = CustomUser.objects.get(
email=user.get('email')) email=user.get('email'))
@ -605,15 +604,6 @@ class OrderConfirmationView(DetailView):
stripe_customer = StripeCustomer.objects. \ stripe_customer = StripeCustomer.objects. \
create(user=custom_user, stripe_id=stripe_api_cus_id) create(user=custom_user, stripe_id=stripe_api_cus_id)
stripe_customer_id = stripe_customer.id stripe_customer_id = stripe_customer.id
else:
# new user used the email of existing user, fail
messages.error(
self.request,
_('Another user exists with that email!'),
extra_tags='duplicate_email'
)
return HttpResponseRedirect(
reverse('datacenterlight:payment'))
else: else:
customer = StripeCustomer.objects.filter( customer = StripeCustomer.objects.filter(
id=stripe_customer_id).first() id=stripe_customer_id).first()
@ -631,6 +621,14 @@ class OrderConfirmationView(DetailView):
billing_address = billing_address_user_form.save() billing_address = billing_address_user_form.save()
billing_address_id = billing_address.id billing_address_id = billing_address.id
logger.debug("billing address id = {}".format(billing_address_id)) logger.debug("billing address id = {}".format(billing_address_id))
user = {
'name': custom_user.name,
'email': custom_user.email,
'pass': custom_user.password,
'request_scheme': request.scheme,
'request_host': request.get_host(),
'language': get_language(),
}
create_vm_task.delay(vm_template_id, user, specs, template, create_vm_task.delay(vm_template_id, user, specs, template,
stripe_customer_id, billing_address_data, stripe_customer_id, billing_address_data,