Commit Graph

40 Commits

Author SHA1 Message Date
PCoder cf00ff6bd8 Attempt to merge master into task/3747/multiple_cards_support 2018-06-12 08:16:11 +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 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 2a59a3336b Add metadata (vm_id) to Stripe subscription 2017-10-28 20:25:18 +02:00
Arvind Tiwari 6802e2fdbc merged master 2017-10-03 18:54:47 +05:30
M.Ravi 483aa493bb Remove billing_address_id as it is no more used 2017-09-29 08:51:58 +02:00
M.Ravi 5783e42171 Refactor code and add following fixes
- create_vm_task receiving stripe_subscription_id instead of object
    - Fix: use BillingAddress instead of UserBillingAddress in
    HostingOrder, HostingPlan
    - Remove DictDotLookup class
2017-09-29 08:37:25 +02:00
Arvind Tiwari ba366eed77 merge master 2017-09-28 18:37:33 +05:30
PCoder 5a2a134070 Merge upstream master 2017-09-28 01:35:09 +05:30
Arvind Tiwari 96f24881fe vm name fix 2017-09-27 03:36:02 +05:30
Arvind Tiwari f4b6b38522 minor fix 2017-09-27 03:28:06 +05:30
Arvind Tiwari 21660f8d00 font-size reduced, vm cancel and vm create email data fixed 2017-09-27 02:07:52 +05:30
PCoder 114511e924 Fixed some flake8 warnings 2017-09-25 00:34:18 +05:30
PCoder 7278a20135 Added get_or_create_vm_detail function 2017-09-25 00:02:36 +05:30
PCoder 0bc2b22f62 Reformatted datacenterlight/tasks.py 2017-09-23 13:09:14 +05:30
PCoder 0cf8e237b5 Now passing user's language to celery task 2017-09-16 20:55:37 +05:30
PCoder acb739944b Added sending email to user on create vm 2017-09-16 19:30:31 +05:30
PCoder 7256160a7b Merge branch 'master' into task/3772/hosting_billing_monthly_subscription 2017-09-16 14:45:34 +05:30
M.Ravi a06753ca4b Use hostname and send celery errors to DCL_ERROR_EMAILS_TO 2017-09-15 13:09:46 +02:00
M.Ravi 2731ea8635 Fixed getting custom_user when calling create_vm for hosting 2017-09-15 11:32:20 +02:00
PCoder 0561688f84 Add ssh keys on creation of new VM 2017-09-15 12:43:48 +05:30
PCoder 38a8997e29 Refactored code 2017-09-10 15:26:29 +05:30
PCoder 56a8ad2edf Changed VM name format for create vm when user is already logged in 2017-09-10 14:52:06 +05:30
PCoder d96d2907bc Passing pass as parameter to celery task 2017-09-09 20:46:43 +05:30
PCoder 085786907c Removed a comment 2017-09-09 18:20:03 +05:30
PCoder 6d826fdfd2 Added logged in user as a parameter to create VM 2017-09-09 18:19:09 +05:30
PCoder 0256b0bf03 Added credit card details as param for create_vm_task 2017-08-24 11:49:41 +05:30
PCoder a964f2fb5b Merged master into task/3701/enable_monthly_payments 2017-08-24 04:06:48 +05:30
M.Ravi 0846718893 Rearranged imports 2017-08-23 20:16:27 +02:00
M.Ravi 82b73df6e7 Added test case to check whether celery task executes properly on production. 2017-08-23 20:12:50 +02:00
PCoder 506b5a904a Added missing code from the merge 2017-08-21 01:54:55 +05:30
PCoder ddbaf902af Removed __future__ datacenterlight/tasks 2017-08-20 20:23:59 +05:30
PCoder 2b71795431 Added missing oneadmin's ssh key statement 2017-08-19 18:02:55 +05:30
M.Ravi 29b28d551c Fixed flake8 lint warnings 2017-08-06 22:19:27 +02:00
M.Ravi 58bb754814 Introduced MaxRetries and MaxRetriesExceededError handling code 2017-08-06 21:54:12 +02:00
M.Ravi e7864f5d85 Added condition to check if create_vm succeeded 2017-08-06 18:52:28 +02:00
M.Ravi f950c1defb Added datacenterlight/tasks.py 2017-08-06 18:42:27 +02:00