From 0c1b7b1885caa8e47555f0e131b1aa156157e37f Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Wed, 23 Dec 2020 14:33:32 +0530
Subject: [PATCH] Do clear session vars at the end

---
 datacenterlight/utils.py |  2 --
 datacenterlight/views.py | 50 ++++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/datacenterlight/utils.py b/datacenterlight/utils.py
index d0c4b0f3..8a087e3e 100644
--- a/datacenterlight/utils.py
+++ b/datacenterlight/utils.py
@@ -103,8 +103,6 @@ def create_vm(billing_address_data, stripe_customer_id, specs,
 
     create_vm_task.delay(vm_template_id, user, specs, template, order.id)
 
-    clear_all_session_vars(request)
-
 
 def clear_all_session_vars(request):
     if request.session is not None:
diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index f373d9b0..6ce1562b 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -717,6 +717,30 @@ class OrderConfirmationView(DetailView, FormView):
         stripe_utils = StripeUtils()
         logger.debug("user=%s stripe_api_cus_id=%s" % (user, stripe_api_cus_id))
         card_details_response = None
+        new_user_hosting_key_id = None
+        card_id = None
+        generic_payment_type = None
+        generic_payment_details = None
+        stripe_subscription_obj = None
+        if 'generic_payment_details' in request.session:
+            generic_payment_details = request.session[
+                'generic_payment_details']
+        if 'generic_payment_type' in request.session:
+            generic_payment_type = request.session['generic_payment_type']
+        if 'new_user_hosting_key_id' in self.request.session:
+            new_user_hosting_key_id = request.session[
+                'new_user_hosting_key_id']
+        if 'card_id' in request.session:
+            card_id = request.session.get('card_id')
+        req = {
+            'scheme': self.request.scheme,
+            'host': self.request.get_host(),
+            'language': get_language(),
+            'new_user_hosting_key_id': new_user_hosting_key_id,
+            'card_id': card_id,
+            'generic_payment_type': generic_payment_type,
+            'generic_payment_details': generic_payment_details
+        }
 
         if 'token' in request.session:
             card_details = stripe_utils.get_cards_details_from_token(
@@ -899,31 +923,6 @@ class OrderConfirmationView(DetailView, FormView):
             logger.debug(stripe_subscription_obj)
             latest_invoice = stripe.Invoice.retrieve(
                 stripe_subscription_obj.latest_invoice)
-
-            new_user_hosting_key_id = None
-            card_id = None
-            generic_payment_type = None
-            generic_payment_details = None
-            if 'generic_payment_details' in request.session:
-                generic_payment_details = request.session[
-                    'generic_payment_details']
-            if 'generic_payment_type' in request.session:
-                generic_payment_type = request.session['generic_payment_type']
-            if 'new_user_hosting_key_id' in self.request.session:
-                new_user_hosting_key_id = request.session[
-                    'new_user_hosting_key_id']
-            if 'card_id' in request.session:
-                card_id = request.session.get('card_id')
-            req = {
-                'scheme': self.request.scheme,
-                'host': self.request.get_host(),
-                'language': get_language(),
-                'new_user_hosting_key_id': new_user_hosting_key_id,
-                'card_id': card_id,
-                'generic_payment_type': generic_payment_type,
-                'generic_payment_details': generic_payment_details
-            }
-
             subscription_status = ''
             if stripe_subscription_obj:
                 subscription_status = stripe_subscription_obj.status
@@ -1043,6 +1042,7 @@ class OrderConfirmationView(DetailView, FormView):
                   ' We will send you a confirmation email as soon as'
                   ' it is ready.'))
         }
+        clear_all_session_vars(request)
 
         return JsonResponse(response)