PCoder
								
							 
						 | 
						
							
							
								
							
							
	44900f6a48
						 | 
						
							
							
								
								
								Rename OrderSpecifications to OrderDetail
							
							
							
							
							
							
						 | 
						
							2018-07-01 22:30:23 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	00cb1de75d
						 | 
						
							
							
								
								
								Add type to OrderSpecification string
							
							
							
							
							
							
						 | 
						
							2018-07-01 19:46:21 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	7f57ace92d
						 | 
						
							
							
								
								
								Set default and on_delete attributes
							
							
							
							
							
							
						 | 
						
							2018-07-01 19:23:05 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	900f014d92
						 | 
						
							
							
								
								
								Save order specifications in HostingOrder also
							
							
							
							
							
							
						 | 
						
							2018-07-01 18:33:10 +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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	8fb0d9a48a
						 | 
						
							
							
								
								
								order detail divider lines full width
							
							
							
							
							
							
						 | 
						
							2018-05-12 21:59:06 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	b09604d30f
						 | 
						
							
							
								
								
								add space befor CHF
							
							
							
							
							
							
						 | 
						
							2018-05-12 03:56:04 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	f39f95e1f7
						 | 
						
							
							
								
								
								remove template filter from translation
							
							
							
							
							
							
						 | 
						
							2018-05-12 03:47:54 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	20f1df8a70
						 | 
						
							
							
								
								
								blocktrans variable fix
							
							
							
							
							
							
						 | 
						
							2018-05-12 03:39:38 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	39f7898259
						 | 
						
							
							
								
								
								edit order detail footer text
							
							
							
							
							
							
						 | 
						
							2018-05-12 03:15:07 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	55889499df
						 | 
						
							
							
								
								
								order detail style fix
							
							
							
							
							
							
						 | 
						
							2018-05-12 02:47:27 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	8044e0c2a0
						 | 
						
							
							
								
								
								calculator discount text modified
							
							
							
							
							
							
						 | 
						
							2018-05-11 17:47:27 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	30deae5a20
						 | 
						
							
							
								
								
								strong color fix
							
							
							
							
							
							
						 | 
						
							2018-05-11 17:25:44 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	a14407182f
						 | 
						
							
							
								
								
								font weight for discount name
							
							
							
							
							
							
						 | 
						
							2018-05-11 17:21:02 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	73e3dce8d4
						 | 
						
							
							
								
								
								order detail page font format
							
							
							
							
							
							
						 | 
						
							2018-05-11 17:18:19 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	f3ffbd96e5
						 | 
						
							
							
								
								
								translation fix
							
							
							
							
							
							
						 | 
						
							2018-05-10 21:26:47 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	b351cb9aa0
						 | 
						
							
							
								
								
								translation fix
							
							
							
							
							
							
						 | 
						
							2018-05-10 21:25:38 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	55cbe3244a
						 | 
						
							
							
								
								
								fix testing error
							
							
							
							
							
							
						 | 
						
							2018-05-07 09:14:31 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	0fdb88b8aa
						 | 
						
							
							
								
								
								invoice discount amount fix
							
							
							
							
							
							
						 | 
						
							2018-05-07 07:50:32 +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
								
							 
						 | 
						
							
							
								
							
							
	7a72cc02ab
						 | 
						
							
							
								
								
								translations
							
							
							
							
							
							
						 | 
						
							2018-05-07 05:22:05 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	f8dc2c6bbe
						 | 
						
							
							
								
								
								discount option added to calculator
							
							
							
							
							
							
						 | 
						
							2018-05-07 05:07:58 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	89ed869780
						 | 
						
							
							
								
								
								hosting calculator styles
							
							
							
							
							
							
						 | 
						
							2018-04-25 23:31:27 +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
								
							 
						 | 
						
							
							
								
							
							
	3b6c2b9d4e
						 | 
						
							
							
								
								
								fix vm_id default
							
							
							
							
							
							
						 | 
						
							2018-04-21 22:27:43 +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
								
							 
						 | 
						
							
							
								
							
							
	4e3211b62f
						 | 
						
							
							
								
								
								Make total and subtotal texts bold
							
							
							
							
							
							
						 | 
						
							2018-04-18 21:37:12 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	36c0b9a0a6
						 | 
						
							
							
								
								
								Differentiate price and total_price in hosting order_detail
							
							
							
							
							
							
						 | 
						
							2018-04-17 22:23:46 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	2ac1ac7d97
						 | 
						
							
							
								
								
								Add subtotal and VAT to hosting order detail too
							
							
							
							
							
							
						 | 
						
							2018-04-17 22:20:36 +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
								
							 
						 | 
						
							
							
								
							
							
	6cc40cb67f
						 | 
						
							
							
								
								
								virtual machine detail: show price upto 2 decimal places
							
							
							
							
							
							
						 | 
						
							2018-04-16 04:34:40 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	602ad1b2c0
						 | 
						
							
							
								
								
								Reformat code
							
							
							
							
							
							
						 | 
						
							2018-04-16 04:32:27 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	5738dc8e1b
						 | 
						
							
							
								
								
								Virtual machine detail: use hostingorder for obtaining the price,
							
							
							
							
							
							
							
							
							rather than the serializer 
							
						 | 
						
							2018-04-16 04:32:08 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	adbb8a269e
						 | 
						
							
							
								
								
								Hostingorders: limit amount to 2 decimal places
							
							
							
							
							
							
						 | 
						
							2018-04-16 04:16:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	b71fec7e61
						 | 
						
							
							
								
								
								Fix a bug: use vm_pricing instead of pricing
							
							
							
							
							
							
						 | 
						
							2018-04-16 04:00:48 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	25c0694b6c
						 | 
						
							
							
								
								
								Use vm_pricing for creating HostingOrder
							
							
							
							
							
							
						 | 
						
							2018-04-16 03:36:56 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	a8339a23a9
						 | 
						
							
							
								
								
								Use get_vm_price_with_vat in hosting invoice
							
							
							
							
							
							
						 | 
						
							2018-04-16 03:27:54 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									PCoder
								
							 
						 | 
						
							
							
								
							
							
	c92bf30514
						 | 
						
							
							
								
								
								Associate HostingOrder and VMPricing
							
							
							
							
							
							
						 | 
						
							2018-04-16 03:23:09 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	403f9b5a08
						 | 
						
							
							
								
								
								change logo in hosting emails
							
							
							
							
							
							
						 | 
						
							2018-04-13 17:55:08 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Arvind Tiwari
								
							 
						 | 
						
							
							
								
							
							
	
	
	a306f59327
						 | 
						
							
							
								
								
								Update mixins.py
							
							
							
							
							
							
						 | 
						
							2018-04-09 03:12:41 +05:30 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |