PCoder
								
							 
						 | 
						
							
							
								
							
							
	10e8f0a820
						 | 
						
							
							
								
								
								Show product name in hosting order detail
							
							
							
							
							
							
						 | 
						
							2018-09-26 09:10:15 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	d54bf84b1e
						 | 
						
							
							
								
								
								Format code
							
							
							
							
							
							
						 | 
						
							2018-09-25 02:20:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	a90bec98ec
						 | 
						
							
							
								
								
								Make invoice for generic payment showable
							
							
							
							
							
							
						 | 
						
							2018-09-24 08:22:46 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	304feb4f7b
						 | 
						
							
							
								
								
								Update text
							
							
							
							
							
							
						 | 
						
							2018-09-08 10:46:07 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	e376f38baa
						 | 
						
							
							
								
								
								Correct text
							
							
							
							
							
							
						 | 
						
							2018-09-08 10:33:00 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	84dae63968
						 | 
						
							
							
								
								
								Fix: ugettext_lazy doesn't like string format
							
							
							
							
							
							
						 | 
						
							2018-09-08 10:29:47 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	4914280868
						 | 
						
							
							
								
								
								Set text for vm terminate timeout
							
							
							
							
							
							
						 | 
						
							2018-09-08 10:14:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	a7afbec5b4
						 | 
						
							
							
								
								
								Fix flake8 error
							
							
							
							
							
							
						 | 
						
							2018-09-07 23:14:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	ff6df8cd58
						 | 
						
							
							
								
								
								Simplify logic
							
							
							
							
							
							
						 | 
						
							2018-09-07 23:11:46 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	8e7789462e
						 | 
						
							
							
								
								
								Merge branch 'master' into bugfix/log_vm_terminate_errors
							
							
							
							
							
							
						 | 
						
							2018-09-07 22:43:29 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	8a30100488
						 | 
						
							
							
								
								
								Use price in stripe plan name too
							
							
							
							
							
							
						 | 
						
							2018-09-05 23:26:51 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	df10e84418
						 | 
						
							
							
								
								
								Add owner's email to the subject
							
							
							
							
							
							
						 | 
						
							2018-07-25 22:04:44 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	a5cdfab306
						 | 
						
							
							
								
								
								Send an email to admin if the VM is still there after 30 seconds
							
							
							
							
							
							
							
							
							of the VM terminate calll 
							
						 | 
						
							2018-07-25 21:54:15 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	59b020c0d4
						 | 
						
							
							
								
								
								Replace all occurrences of logger.info with logger.error
							
							
							
							
							
							
						 | 
						
							2018-07-25 21:41:05 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	34ed51a643
						 | 
						
							
							
								
								
								Don't dissociate card if transaction fails
							
							
							
							
							
							
						 | 
						
							2018-07-07 02:03:42 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	0f26917f35
						 | 
						
							
							
								
								
								Fix PEP8 warning
							
							
							
							
							
							
						 | 
						
							2018-07-07 01:54:45 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	678167978c
						 | 
						
							
							
								
								
								Add check to forbid user from deleting the last card
							
							
							
							
							
							
						 | 
						
							2018-07-07 01:50:46 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	c118e86230
						 | 
						
							
							
								
								
								Remove unused context parameters -- introduced during merge
							
							
							
							
							
							
						 | 
						
							2018-07-03 23:56:42 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	c9d01ba95f
						 | 
						
							
							
								
								
								Fix some errors
							
							
							
							
							
							
						 | 
						
							2018-07-03 21:52:44 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	6d2b011925
						 | 
						
							
							
								
								
								Merge master into task/3747/multiple_cards_support
							
							
							
							
							
							
						 | 
						
							2018-07-03 21:29:04 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	5eff54cffe
						 | 
						
							
							
								
								
								Fix a bug -- json not imported; use JsonResponse instead of
							
							
							
							
							
							
							
							
							HttpResponse 
							
						 | 
						
							2018-06-27 12:34:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									M.Ravi
								
							 
						 | 
						
							
							
								
							
							
	2cd73b313a
						 | 
						
							
							
								
								
								Merge master into task/3934/move_hosting_order_out_of_celery_task
							
							
							
							
							
							
							
							
							and resolve some conflicts 
							
						 | 
						
							2018-06-27 12:09:05 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	fae9fce5c6
						 | 
						
							
							
								
								
								Remove unnecessary code
							
							
							
							
							
							
						 | 
						
							2018-06-12 11:15:17 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	6db38d7e29
						 | 
						
							
							
								
								
								Check card_id also for order confirmation
							
							
							
							
							
							
						 | 
						
							2018-06-12 11:14:36 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	86f0526773
						 | 
						
							
							
								
								
								Reformat code
							
							
							
							
							
							
						 | 
						
							2018-06-12 11:13:10 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	7494116468
						 | 
						
							
							
								
								
								Add missing import
							
							
							
							
							
							
						 | 
						
							2018-06-12 09:36:00 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	cf00ff6bd8
						 | 
						
							
							
								
								
								Attempt to merge master into task/3747/multiple_cards_support
							
							
							
							
							
							
						 | 
						
							2018-06-12 08:16:11 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	8044e0c2a0
						 | 
						
							
							
								
								
								calculator discount text modified
							
							
							
							
							
							
						 | 
						
							2018-05-11 17:47:27 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	55cbe3244a
						 | 
						
							
							
								
								
								fix testing error
							
							
							
							
							
							
						 | 
						
							2018-05-07 09:14:31 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	3d2ce27954
						 | 
						
							
							
								
								
								fix discount amount
							
							
							
							
							
							
						 | 
						
							2018-05-07 06:29:53 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	eeed9b2e72
						 | 
						
							
							
								
								
								discount name in templates
							
							
							
							
							
							
						 | 
						
							2018-05-07 06:25:50 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	2ff8c25034
						 | 
						
							
							
								
								
								exclude discount from total price
							
							
							
							
							
							
						 | 
						
							2018-05-07 06:11:44 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	f8dc2c6bbe
						 | 
						
							
							
								
								
								discount option added to calculator
							
							
							
							
							
							
						 | 
						
							2018-05-07 05:07:58 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	0c4c945ec3
						 | 
						
							
							
								
								
								flake8 fix
							
							
							
							
							
							
						 | 
						
							2018-04-25 17:51:36 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	91a65e88ec
						 | 
						
							
							
								
								
								hosting vm payment price fix
							
							
							
							
							
							
						 | 
						
							2018-04-25 16:08:05 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	f66d768ecb
						 | 
						
							
							
								
								
								hosting payment page
							
							
							
							
							
							
						 | 
						
							2018-04-25 15:55:58 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	3bf064a017
						 | 
						
							
							
								
								
								add calculator placeholder to cms_integration
							
							
							
							
							
							
						 | 
						
							2018-04-25 14:52:25 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	a5bd8347e8
						 | 
						
							
							
								
								
								merged master
							
							
							
							
							
							
						 | 
						
							2018-04-21 21:01:42 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	3debf34118
						 | 
						
							
							
								
								
								remove vm creation to util function
							
							
							
							
							
							
						 | 
						
							2018-04-20 20:25:24 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	bd875ffe7d
						 | 
						
							
							
								
								
								Create hostingorder outside celery task
							
							
							
							
							
							
						 | 
						
							2018-04-18 23:50:52 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	36c0b9a0a6
						 | 
						
							
							
								
								
								Differentiate price and total_price in hosting order_detail
							
							
							
							
							
							
						 | 
						
							2018-04-17 22:23:46 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	c2513dc7c3
						 | 
						
							
							
								
								
								Show vat_percent and subtotal for vat exclusive case
							
							
							
							
							
							
						 | 
						
							2018-04-17 21:38:28 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	1e76864821
						 | 
						
							
							
								
								
								Get vm price and vat and pass it to context
							
							
							
							
							
							
						 | 
						
							2018-04-16 04:46:43 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	731fef8ad9
						 | 
						
							
							
								
								
								Show VAT details in hosting/order_details if it is set
							
							
							
							
							
							
						 | 
						
							2018-04-16 04:39:21 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	602ad1b2c0
						 | 
						
							
							
								
								
								Reformat code
							
							
							
							
							
							
						 | 
						
							2018-04-16 04:32:27 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	b71fec7e61
						 | 
						
							
							
								
								
								Fix a bug: use vm_pricing instead of pricing
							
							
							
							
							
							
						 | 
						
							2018-04-16 04:00:48 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	a8339a23a9
						 | 
						
							
							
								
								
								Use get_vm_price_with_vat in hosting invoice
							
							
							
							
							
							
						 | 
						
							2018-04-16 03:27:54 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	698cf7f1ee
						 | 
						
							
							
								
								
								Fix link in signup message
							
							
							
							
							
							
						 | 
						
							2018-04-07 13:16:36 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	7b1cb975df
						 | 
						
							
							
								
								
								Fix Method Resolution Order
							
							
							
							
							
							
						 | 
						
							2018-04-07 13:15:44 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	f911d6b403
						 | 
						
							
							
								
								
								Add HostingContextMixin to various hosting views
							
							
							
							
							
							
						 | 
						
							2018-04-07 12:53:53 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |