| 
								
								
									 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 | 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 | ccf55acbaf | Update navbar_dropdown.html | 2018-05-01 04:36:29 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | 6ff03d8f48 | Merge pull request #627 from tiwariav/task/dcl_calculator_on_non_cms_pages Task/4527 dcl calculator on non-cms pages | 2018-05-01 02:35:22 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | 86188b1fb0 | Merge pull request #626 from tiwariav/task/4474/slider_padding Task/4474 cms header slider padding | 2018-04-30 23:52:23 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | 14548b2f01 | flake8 refacoring | 2018-04-25 17:26:31 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | f66d768ecb | hosting payment page | 2018-04-25 15:55:58 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | 3b3b73a2ce | alignment calculator plugin | 2018-04-25 15:08:28 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | 3bf064a017 | add calculator placeholder to cms_integration | 2018-04-25 14:52:25 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | 564f7a5be8 | merge migrations | 2018-04-20 20:36:28 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | 275ea47e41 | merge master | 2018-04-20 20:30:45 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | 71a37972d3 | Merge remote-tracking branch 'ungleich/master' | 2018-04-20 20:29:09 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | 8f6260b063 | Update _calculator_form.html | 2018-04-20 17:54:23 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | 1e97d0ba38 | Update cms_plugins.py | 2018-04-20 17:51:46 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | a25bcc807f | change header slider to container fluid | 2018-04-20 17:04:02 +05:30 |  | 
				
					
						| 
								
								
									 Arvind Tiwari | da13903ba2 | remove padding | 2018-04-20 16:42:50 +05:30 |  | 
				
					
						| 
								
								
									 PCoder | 4e3211b62f | Make total and subtotal texts bold | 2018-04-18 21:37:12 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | 4c21110c00 | Remove fuzzy and python-format | 2018-04-17 21:47:02 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | a454cd2522 | Update datacenterlight's django.po | 2018-04-17 21:38:53 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | c2513dc7c3 | Show vat_percent and subtotal for vat exclusive case | 2018-04-17 21:38:28 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | e4e7d93275 | Fix flake8 errors | 2018-04-17 20:50:41 +02:00 |  | 
				
					
						| 
								
								
									 M.Ravi | d15a4da840 | Check if child plugin instances exist before looping over them | 2018-04-17 18:03:14 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | 3fca9dbb0d | Fix a bug creating hostingorder | 2018-04-16 05:03:48 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | b103772c0d | Pass vm_pricing if available when creating HostingOrder | 2018-04-16 03:37:19 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | 0b9c67166e | Rename variable name: disk_size -> ssd_size | 2018-04-16 03:26:51 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | c5029d8752 | Update datacenterlight's django.po | 2018-04-16 01:48:39 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | 95daa37670 | Use total_price for amout to be charged, always | 2018-04-16 01:32:38 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | 4148eff03e | Rename variable: amount_to_be_charged -> price | 2018-04-16 01:31:16 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | d0276f22c1 | Reorganize imports | 2018-04-16 01:30:02 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | 1b37eed53d | Include pricing_name in the email sent to admin | 2018-04-16 01:29:07 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | 8e28756bd8 | Check if we have total_price (indicates that we have VAT excluded price);hence,use it as final_price. if not use the previous casei and use it as final_price. If not use the preivous case | 2018-04-16 01:27:42 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | 6d6a8ea597 | Refactor: reuse final_price variable | 2018-04-16 01:24:21 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | 903336a46f | Show 2 upto decimal places in order detail | 2018-04-16 00:59:42 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | ec753eb0d5 | Improve string representation of VMPricing | 2018-04-16 00:50:34 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | 68032ec184 | Update migration file | 2018-04-16 00:49:55 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | 1cb3fa80cf | Improve logger error | 2018-04-16 00:29:43 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | 896984ef1f | Set vm_pricing context from plugins value | 2018-04-16 00:29:23 +02:00 |  | 
				
					
						| 
								
								
									 PCoder | 665fa7479b | Add 0019_auto_20180415_2129.py | 2018-04-15 23:32:14 +02:00 |  |