Merge pull request #513 from tiwariav/bugfix/stripe_customer_id
bugfix/stripe_customer_id
This commit is contained in:
		
				commit
				
					
						242f4edf8c
					
				
			
		
					 1 changed files with 12 additions and 15 deletions
				
			
		| 
						 | 
					@ -637,7 +637,7 @@ class PaymentVMView(LoginRequiredMixin, FormView):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            request.session['billing_address_data'] = billing_address_data
 | 
					            request.session['billing_address_data'] = billing_address_data
 | 
				
			||||||
            request.session['token'] = token
 | 
					            request.session['token'] = token
 | 
				
			||||||
            request.session['customer'] = customer.id
 | 
					            request.session['customer'] = customer.stripe_id
 | 
				
			||||||
            return HttpResponseRedirect("{url}?{query_params}".format(
 | 
					            return HttpResponseRedirect("{url}?{query_params}".format(
 | 
				
			||||||
                url=reverse('hosting:order-confirmation'),
 | 
					                url=reverse('hosting:order-confirmation'),
 | 
				
			||||||
                query_params='page=payment'))
 | 
					                query_params='page=payment'))
 | 
				
			||||||
| 
						 | 
					@ -662,16 +662,12 @@ class OrdersHostingDetailView(LoginRequiredMixin,
 | 
				
			||||||
        context = super(DetailView, self).get_context_data(**kwargs)
 | 
					        context = super(DetailView, self).get_context_data(**kwargs)
 | 
				
			||||||
        obj = self.get_object()
 | 
					        obj = self.get_object()
 | 
				
			||||||
        owner = self.request.user
 | 
					        owner = self.request.user
 | 
				
			||||||
        stripe_customer_id = self.request.session.get('customer')
 | 
					        stripe_api_cus_id = self.request.session.get('customer')
 | 
				
			||||||
        customer = StripeCustomer.objects.filter(id=stripe_customer_id).first()
 | 
					 | 
				
			||||||
        stripe_utils = StripeUtils()
 | 
					        stripe_utils = StripeUtils()
 | 
				
			||||||
        if customer:
 | 
					 | 
				
			||||||
        card_details = stripe_utils.get_card_details(
 | 
					        card_details = stripe_utils.get_card_details(
 | 
				
			||||||
                customer.stripe_id,
 | 
					            stripe_api_cus_id,
 | 
				
			||||||
            self.request.session.get('token')
 | 
					            self.request.session.get('token')
 | 
				
			||||||
        )
 | 
					        )
 | 
				
			||||||
        else:
 | 
					 | 
				
			||||||
            card_details = {}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if self.request.GET.get('page') == 'payment':
 | 
					        if self.request.GET.get('page') == 'payment':
 | 
				
			||||||
            context['page_header_text'] = _('Confirm Order')
 | 
					            context['page_header_text'] = _('Confirm Order')
 | 
				
			||||||
| 
						 | 
					@ -749,14 +745,15 @@ class OrdersHostingDetailView(LoginRequiredMixin,
 | 
				
			||||||
    def post(self, request):
 | 
					    def post(self, request):
 | 
				
			||||||
        template = request.session.get('template')
 | 
					        template = request.session.get('template')
 | 
				
			||||||
        specs = request.session.get('specs')
 | 
					        specs = request.session.get('specs')
 | 
				
			||||||
        stripe_customer_id = request.session.get('customer')
 | 
					        # We assume that if the user is here, his/her StripeCustomer
 | 
				
			||||||
        customer = StripeCustomer.objects.filter(id=stripe_customer_id).first()
 | 
					        # object already exists
 | 
				
			||||||
 | 
					        stripe_customer_id = request.user.stripecustomer.id
 | 
				
			||||||
        billing_address_data = request.session.get('billing_address_data')
 | 
					        billing_address_data = request.session.get('billing_address_data')
 | 
				
			||||||
        vm_template_id = template.get('id', 1)
 | 
					        vm_template_id = template.get('id', 1)
 | 
				
			||||||
 | 
					        stripe_api_cus_id = self.request.session.get('customer')
 | 
				
			||||||
        # Make stripe charge to a customer
 | 
					        # Make stripe charge to a customer
 | 
				
			||||||
        stripe_utils = StripeUtils()
 | 
					        stripe_utils = StripeUtils()
 | 
				
			||||||
        card_details = stripe_utils.get_card_details(customer.stripe_id,
 | 
					        card_details = stripe_utils.get_card_details(stripe_api_cus_id,
 | 
				
			||||||
                                                     request.session.get(
 | 
					                                                     request.session.get(
 | 
				
			||||||
                                                         'token'))
 | 
					                                                         'token'))
 | 
				
			||||||
        if not card_details.get('response_object'):
 | 
					        if not card_details.get('response_object'):
 | 
				
			||||||
| 
						 | 
					@ -783,7 +780,7 @@ class OrdersHostingDetailView(LoginRequiredMixin,
 | 
				
			||||||
            name=plan_name,
 | 
					            name=plan_name,
 | 
				
			||||||
            stripe_plan_id=stripe_plan_id)
 | 
					            stripe_plan_id=stripe_plan_id)
 | 
				
			||||||
        subscription_result = stripe_utils.subscribe_customer_to_plan(
 | 
					        subscription_result = stripe_utils.subscribe_customer_to_plan(
 | 
				
			||||||
            customer.stripe_id,
 | 
					            stripe_api_cus_id,
 | 
				
			||||||
            [{"plan": stripe_plan.get(
 | 
					            [{"plan": stripe_plan.get(
 | 
				
			||||||
                'response_object').stripe_plan_id}])
 | 
					                'response_object').stripe_plan_id}])
 | 
				
			||||||
        stripe_subscription_obj = subscription_result.get('response_object')
 | 
					        stripe_subscription_obj = subscription_result.get('response_object')
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue