Merge branch 'master' into bugfix/log_vm_terminate_errors
This commit is contained in:
		
				commit
				
					
						8e7789462e
					
				
			
		
					 24 changed files with 284 additions and 68 deletions
				
			
		| 
						 | 
				
			
			@ -1032,14 +1032,20 @@ class OrdersHostingDetailView(LoginRequiredMixin, DetailView):
 | 
			
		|||
        memory = specs.get('memory')
 | 
			
		||||
        disk_size = specs.get('disk_size')
 | 
			
		||||
        amount_to_be_charged = specs.get('total_price')
 | 
			
		||||
        plan_name = StripeUtils.get_stripe_plan_name(cpu=cpu,
 | 
			
		||||
                                                     memory=memory,
 | 
			
		||||
                                                     disk_size=disk_size)
 | 
			
		||||
        stripe_plan_id = StripeUtils.get_stripe_plan_id(cpu=cpu,
 | 
			
		||||
                                                        ram=memory,
 | 
			
		||||
                                                        ssd=disk_size,
 | 
			
		||||
                                                        version=1,
 | 
			
		||||
                                                        app='dcl')
 | 
			
		||||
        plan_name = StripeUtils.get_stripe_plan_name(
 | 
			
		||||
            cpu=cpu,
 | 
			
		||||
            memory=memory,
 | 
			
		||||
            disk_size=disk_size,
 | 
			
		||||
            price=amount_to_be_charged
 | 
			
		||||
        )
 | 
			
		||||
        stripe_plan_id = StripeUtils.get_stripe_plan_id(
 | 
			
		||||
            cpu=cpu,
 | 
			
		||||
            ram=memory,
 | 
			
		||||
            ssd=disk_size,
 | 
			
		||||
            version=1,
 | 
			
		||||
            app='dcl',
 | 
			
		||||
            price=amount_to_be_charged
 | 
			
		||||
        )
 | 
			
		||||
        stripe_plan = stripe_utils.get_or_create_stripe_plan(
 | 
			
		||||
            amount=amount_to_be_charged,
 | 
			
		||||
            name=plan_name,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue