Commit Graph

489 Commits

Author SHA1 Message Date
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
Arvind Tiwari 52dafc99d3 ungleich gmbh -> ungleich glarus ag, settings page fix 2018-03-27 00:54:44 +05:30
PCoder a7a0ec8864 Add no_cache decorators instead of cache_control 2018-03-09 19:49:40 +01:00
PCoder d933f71fe9 Merge branch 'master' into task/3452/back_button_mgmt 2018-03-03 11:37:41 +01:00
PCoder dd9b0d8fd9 Refactor dcl's ssh key name prefix to DCL_SSH_KEY_NAME_PREFIX 2018-01-08 19:50:42 +01:00
PCoder 0706ac5909 Shorten generated ssh key and add seconds to the name 2018-01-08 19:35:39 +01:00
PCoder 1395c04a00 Add cache_control to CreateVirtualMachinesView and VirtualMachineView 2017-12-27 09:10:41 +01:00
PCoder 639e4cf414 Add get method and cache_control to OrdersHostingListView 2017-12-27 09:09:54 +01:00
PCoder 14ff876fbf Add cache_control to PaymentVMView and OrdersHostingDetailView 2017-12-27 09:06:46 +01:00
PCoder ab06eeff67 Add cache_control to SSHKEyCreateView and SettingsView post methods 2017-12-27 09:04:58 +01:00
PCoder 98e06686f9 Add get method and cache_control to SignupValidatedView 2017-12-27 09:03:17 +01:00
PCoder bec541c06a Add get method to hosting.SignupView and cache_control 2017-12-27 08:33:53 +01:00
PCoder 87cdb08f3c Change success_url in hosting.SignupView from ssh_keys to dashboard 2017-12-27 08:32:55 +01:00
PCoder d796272c10 Add cache_control headers to get and post methods 2017-12-25 15:54:23 +01:00
PCoder f357c83fc4 Remove cache_control headers from Classes 2017-12-25 15:53:24 +01:00
PCoder b4f03b9553 Add cache_control decorator to all hosting views 2017-12-25 15:10:34 +01:00
PCoder dd54b3052e Reorganize imports 2017-12-25 15:07:12 +01:00
PCoder 3a558c86a6 Merge branch 'master' into task/3601/reduce_min_ram_to_1G 2017-12-22 23:27:32 +01:00
PCoder 979a62f120 Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete 2017-12-21 02:04:17 +01:00
PCoder 4dff4e07cb Change minimum required RAM from 2GB to 1GB 2017-12-21 01:25:52 +01:00
PCoder 2628312bb9 Fix a bug and update delete vm email subject 2017-12-20 22:26:36 +01:00
PCoder f61abf44c8 Remove unused import 2017-12-20 21:28:07 +01:00
PCoder 96de92d312 Reorganize code 2017-12-20 20:59:46 +01:00
PCoder 7d683e1257 Move Stripe subscription cancelation before deleting vm 2017-12-17 20:20:42 +01:00
PCoder a04aa8542d Add some logger debug messages 2017-12-12 22:55:30 +01:00
PCoder 1306dbe46a Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete 2017-12-12 20:23:25 +01:00
M.Ravi 88afdc1dd1 Removed unwanted logger debug msg 2017-12-12 16:49:50 +01:00
M.Ravi 24d85d5086 Check has_perm only for invoices 2017-12-12 15:43:25 +01:00
M.Ravi 091b277f7d Correct call to has_perm 2017-12-12 12:42:40 +01:00
M.Ravi 57311eda73 Improve debug logs 2017-12-12 12:14:39 +01:00
PCoder 79b4b449d1 Add some logger messages 2017-12-12 09:53:19 +01:00
PCoder beefeb62cb Raise 404 for HostingOrder not belonging to user 2017-12-12 09:38:08 +01:00
PCoder 5e2c40f1a5 Fix flake8 warnings 2017-11-27 08:03:59 +01:00
PCoder 2102a89cdc Test if PEP8 warnings can be detected in travis build 2017-11-27 07:56:28 +01:00
PCoder a2a35a9475 Fix error accessing stripecustomer for user when it doesn't exist 2017-10-30 08:26:35 +01:00
PCoder 16b6ecb38c Clear session variables on payment error 2017-10-29 23:48:33 +01:00
PCoder 63eb7fc0e2 Rename contains to get_user_card_details 2017-10-29 21:31:11 +01:00
PCoder bea3477d84 Handle errors related to payment by redirecting to payment page 2017-10-29 14:45:14 +01:00
PCoder cac00d4b9e Implement select default card functionality 2017-10-28 22:19:53 +02:00
PCoder d2ae94327a Associate card only if it has not already been done 2017-10-28 18:29:19 +02:00
PCoder 4be105a0a9 Set default card for newly added card in hosting flow 2017-10-28 16:48:03 +02:00
PCoder b6d1e8df6b Set preferred for the card that's used for a subscription 2017-10-28 15:45:05 +02:00
PCoder 6212c9df50 Manage token and card_id properly in hosting flow 2017-10-28 15:30:42 +02:00
PCoder 38168e8f8f Allow use of previous cards in hosting flow 2017-10-27 00:45:26 +02:00
M.Ravi 4dd407da67 Use card_id as session variable instead of token and customer 2017-10-26 17:57:11 +02:00
M.Ravi 692f82cba4 Code rearrange 2017-10-26 15:15:27 +02:00
M.Ravi ef9dc446db Use hasattr to check if a user already has a stripecustomer object 2017-10-26 15:00:54 +02:00
M.Ravi 8d2c120b43 Associate newly added card with customer from hosting 2017-10-26 12:29:16 +02:00
PCoder 8351b1bf8b Use refactored get_all_cards_list function 2017-10-21 23:14:55 +02:00
PCoder 14c7d6ac0e Refactor getting all cards to UserCardDetail.get_all_cards_list() 2017-10-21 21:27:21 +02:00
PCoder 8df72620d6 Add 'billing address updated' message in that case 2017-10-21 20:58:54 +02:00
PCoder 75e90dbacd Refactor and add messages 2017-10-21 20:37:50 +02:00
PCoder be8181ec42 Add _messages template to hosting/settings.html 2017-10-21 17:02:24 +02:00
PCoder 70b6bbdf2f Save card id as a parameter and use it to delete a source 2017-10-21 13:27:35 +02:00
PCoder c664b44f2c Add functionality to delete user card 2017-10-21 00:02:35 +02:00
M.Ravi c939106a35 Prepare to handle delete card 2017-10-16 16:29:09 +02:00
M.Ravi bff37d6246 Add card id param to card details 2017-10-16 16:20:03 +02:00
M.Ravi 619f37829e Now showing cards from UserCardDetails 2017-10-15 23:57:15 +02:00
M.Ravi 3f9c1a68d1 Remove unused code 2017-10-15 23:38:18 +02:00
M.Ravi 74a1f82c30 Refactor handling post for settings card input form 2017-10-15 23:37:01 +02:00
M.Ravi 6420a9869b Add functionality to save UserCardDetail 2017-10-15 19:55:37 +02:00
M.Ravi e6f92d9ae4 Manual merge 2017-10-15 16:14:33 +02:00
Arvind Tiwari 1c50eb45e9 Merge pull request #509 from tiwariav/task/3828/invoice_period
task/3828 invoice period
2017-10-15 01:27:02 +05:30
Arvind Tiwari 7b71ba1749 merged master 2017-10-15 00:10:02 +05:30
Arvind Tiwari 4dbf08f995 Merge branch 'master' into task/3828/invoice_period 2017-10-06 02:39:07 +05:30
Arvind Tiwari ba8eaa2937 new card details option added 2017-10-06 01:59:18 +05:30
Arvind Tiwari 6536991209 list all cards, card_input template 2017-10-06 01:17:35 +05:30
M.Ravi f0be6d6d7f Merge remote-tracking branch 'mainRepo/master' into task/3774/update_stripe_subscription_on_vm_delete 2017-10-04 19:32:02 +02:00
Arvind Tiwari 242f4edf8c Merge pull request #513 from tiwariav/bugfix/stripe_customer_id
bugfix/stripe_customer_id
2017-10-04 00:05:27 +05:30
Arvind Tiwari 1990c4758e merged master 2017-10-03 23:49:26 +05:30
Arvind Tiwari eb7b1a4ea0 Merge remote-tracking branch 'ungleich/master' 2017-10-03 21:46:23 +05:30
Arvind Tiwari c410e2cbc5 stripe_customer_id retrieved from request.user relation 2017-10-03 21:35:08 +05:30
Arvind Tiwari 315ce92a78 post request attributes changed 2017-10-03 21:24:35 +05:30
Arvind Tiwari 0263964705 stripe_id used instead of id 2017-10-03 21:04:25 +05:30
Arvind Tiwari 6802e2fdbc merged master 2017-10-03 18:54:47 +05:30
Arvind Tiwari 734a41a371 merged master 2017-10-03 18:42:00 +05:30
Arvind Tiwari e4837b063c alignment fix 2017-10-03 18:18:18 +05:30
M.Ravi 777aab7115 Add cancel subscription code on VM cancel 2017-10-03 13:07:41 +02:00
M.Ravi 60b233f082 Fix flake8 warnings 2017-10-03 00:26:50 +02:00
M.Ravi 44b5d9bb3a hosting order: Add price to vm context 2017-10-02 23:17:37 +02:00
M.Ravi 68cbfdd393 Update translation and fix loginmixin required for dashboard view 2017-10-01 23:06:51 +02:00
M.Ravi 06b1ce9e72 Update error message 2017-10-01 20:32:51 +02:00
M.Ravi 167eaf2a0c Add forbidden_view method adds the message and redirects to the same path 2017-10-01 20:17:03 +02:00
Arvind Tiwari bd91883369 end_date added 2017-09-30 17:55:49 +05:30
M.Ravi 6ef8a03de7 Respond with JSON 2017-09-30 01:02:59 +02:00
M.Ravi 1dfe1d7cf8 Redirect to my virtual machines page if any error 2017-09-29 21:53:02 +02:00
M.Ravi 4b8d68fc8e Reuse price parameter 2017-09-29 09:35:45 +02:00
M.Ravi 5c99dd4da7 hosting/views: remove billing_address_id in call to create_vm_task 2017-09-29 09:07:38 +02:00
M.Ravi ac37349aef Refactor code and pass subscription_id instead of obj 2017-09-29 08:50:03 +02:00
Arvind Tiwari ba366eed77 merge master 2017-09-28 18:37:33 +05:30
PCoder 06ef940b01 Merge upstream 2017-09-28 03:33:43 +05:30
PCoder 4e080c9afc Invoice: Get VM name from id and configuration 2017-09-28 02:36:49 +05:30
PCoder 5a2a134070 Merge upstream master 2017-09-28 01:35:09 +05:30
Arvind Tiwari 7a07785a94 vm cancel email subject changed 2017-09-28 01:11:39 +05:30
Arvind Tiwari 937cd2cd82 minor fix 2017-09-27 03:41:18 +05:30
Arvind Tiwari 45df525a37 vm cancel name fix 2017-09-27 03:38:39 +05:30
Arvind Tiwari f4b6b38522 minor fix 2017-09-27 03:28:06 +05:30
Arvind Tiwari 5747468c21 outline removed 2017-09-27 03:09:43 +05:30
Arvind Tiwari d888b260ee welcome user mail 2017-09-27 02:45:24 +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 e33e9cd1ae Merge branch 'master' into tiwariav-task/3756/landing_billing_page 2017-09-26 12:20:56 +05:30
PCoder c17604e5c1 Merge master into task/3730/refactor_price_parameter 2017-09-26 12:16:50 +05:30
PCoder a9e8d8bb34 Merge branch 'master' into task/3764/show_cancelled_vms_my_orders 2017-09-26 12:09:09 +05:30
Arvind Tiwari 050f750322 merged master 2017-09-26 03:06:12 +05:30
PCoder 3b55e331ed Merge branch 'master' into task/3764/show_cancelled_vms_my_orders 2017-09-26 01:58:42 +05:30
PCoder 81bc5d5555 Merge branch 'master' into task/3781/resend_activation_mail 2017-09-26 01:18:02 +05:30
PCoder 78abc0c740 Merge branch 'master' into bug/3806/cannot_create_vms_after_password_reset 2017-09-25 23:55:20 +05:30
PCoder bb8c1a72fd Add missing import get_language 2017-09-25 23:52:47 +05:30
M.Ravi a73bcaef05 Store hash 2017-09-25 09:35:18 +02:00
PCoder 7fcece40c1 Using VMDetail model to show order details 2017-09-25 01:49:00 +05:30
PCoder f2213305f6 Reformatted hosting views.py 2017-09-25 00:46:39 +05:30
PCoder f2f2fc22df Update VMDetail's terminated_at on delete of a vm 2017-09-25 00:30:28 +05:30
PCoder f4899ffc18 Added missing get_language import 2017-09-25 00:01:48 +05:30
PCoder afc368e9dd Added ResendActivationEmailView 2017-09-24 15:52:17 +05:30
M.Ravi 0974376e9f Reformatted code 2017-09-24 09:34:30 +02:00
PCoder 39a2455817 Merged upstream master into task/3730/refactor_price_parameter 2017-09-24 04:20:41 +05:30
PCoder 9491bb81a2 Added missing import after merge 2017-09-24 02:03:48 +05:30
PCoder 656e7563fd Merged upstream master into tiwariav-task/3756/landing_billing_page 2017-09-24 01:31:57 +05:30
PCoder 300997699a Redirecting new user to my virtual machines page and not forcing ssh key for creating a vm 2017-09-24 01:08:15 +05:30
Arvind Tiwari 7456baac16 merged master 2017-09-23 23:05:10 +05:30
Arvind Tiwari 363017d85f Merge pull request #488 from tiwariav/task/3777/hosting_calculator
Task/3777 hosting create vm calculator
2017-09-23 22:50:25 +05:30
PCoder 83b52d95ae Merge branch 'master' into task/3730/refactor_price_parameter 2017-09-23 21:18:54 +05:30
Arvind Tiwari be0c50aa2f error msgs translation 2017-09-23 19:01:22 +05:30
PCoder 99e5cf5587 Using refactored get_vm_price and get_vm_plan_name functions 2017-09-23 03:18:05 +05:30
Arvind Tiwari 6004a7ede4 new welcome email 2017-09-23 01:03:43 +05:30
Arvind Tiwari 1c0f0da96e conditional texts 2017-09-21 19:32:22 +05:30
Arvind Tiwari a16dbb50d8 design fixes 2017-09-21 19:17:10 +05:30
Arvind Tiwari db3955ab94 error 500 fixed 2017-09-21 17:45:12 +05:30
Arvind Tiwari a792911dea hosting view fix 2017-09-21 17:22:02 +05:30
Arvind Tiwari 5d8fb71215 removed redirects form get_context() to get() 2017-09-21 16:38:54 +05:30
Arvind Tiwari 2c4390767d minor fixes 2017-09-21 15:14:15 +05:30
Arvind Tiwari 6c381dd3fb invoice page redesigned 2017-09-21 15:03:00 +05:30
Arvind Tiwari 1eff51099c exception handling fix 2017-09-21 02:26:42 +05:30
Arvind Tiwari 65618bb2aa merged master 2017-09-20 23:24:20 +05:30
Arvind Tiwari f4766c7d7c merged master 2017-09-20 23:19:32 +05:30
Arvind Tiwari 3ef07758ef translation and text fix 2017-09-19 01:08:27 +05:30
Arvind Tiwari 78423c83e3 removed error details from error msg 2017-09-19 00:59:51 +05:30
Arvind Tiwari 61bf158238 fix 2017-09-19 00:25:38 +05:30
Arvind Tiwari 8db7ead9e2 checking VM termination error 2017-09-19 00:24:06 +05:30
Arvind Tiwari 226f744bae success modal added 2017-09-18 21:52:59 +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 f2ee0ea657 Converting ugettext_lazy proxy to string 2017-09-16 17:54:05 +05:30
PCoder c9fd741c89 Added encode method for ugettext_lazy strings 2017-09-16 17:22:37 +05:30
PCoder 40f13784ac Reverted back to ugettext_lazy in hosting/views 2017-09-16 16:50:14 +05:30
M.Ravi 8c2fd03082 Now responding json HttpResponse for modal on vm create in hosting.
Important: Using ugettext instead of ugettext_lazy in hosting/views.py
2017-09-15 17:34:23 +02:00
Arvind Tiwari 556ed75262 translations 2017-09-15 20:14:32 +05:30
Arvind Tiwari 87327d028a hosting form view modified 2017-09-15 20:03:52 +05:30
Arvind Tiwari d49e90bd20 catching WrongIdError 2017-09-15 18:15:06 +05:30
Arvind Tiwari bbb1919404 error msg fix 2017-09-15 17:38:52 +05:30
Arvind Tiwari 77f2454e3c remove error msg on successful termination 2017-09-15 17:20:42 +05:30
Arvind Tiwari fdb5039c02 minor adjustments 2017-09-15 16:57:17 +05:30
Arvind Tiwari 6136a48961 edge cases handled 2017-09-15 16:46:56 +05:30
Arvind Tiwari 852c1228ba minor fix 2017-09-15 14:48:11 +05:30
PCoder 805f1129e8 Merged upstream master into task/3772/hosting_billing_monthly_subscription 2017-09-15 03:34:50 +05:30
Arvind Tiwari a935871722 code reformating 2017-09-15 00:57:59 +05:30
Arvind Tiwari 8402fd4fd3 merge master 2017-09-15 00:19:01 +05:30
Arvind Tiwari a1a90ed5d0 while loop code formating 2017-09-15 00:14:09 +05:30
Arvind Tiwari 8393afe141 translations and test methods removed 2017-09-14 02:59:08 +05:30
Arvind Tiwari e045caebbe redirect on success 2017-09-14 02:52:37 +05:30
Arvind Tiwari a808f3bf7e error fix on termination 2017-09-14 02:48:56 +05:30
Arvind Tiwari abc290de61 added error msg 2017-09-14 02:43:01 +05:30
Arvind Tiwari 07a464231d animation added to vm termination 2017-09-14 02:24:10 +05:30
M.Ravi 86ed0e5319 Removed code related removing keys from known_hosts 2017-09-13 14:32:33 +02:00
PCoder 94a5987985 Removed an unwanted print 2017-09-13 06:35:07 +05:30
PCoder 612e11736e Corrected obtaining values from vm_data dict 2017-09-13 05:37:26 +05:30
PCoder f94ed011e5 Remove keys from known_hosts on delete of a vm 2017-09-13 05:30:05 +05:30
PCoder 1836d315cd Added query param to distinguish confirm order from invoice 2017-09-10 12:22:32 +05:30
PCoder b1589e9c68 Reorganized imports hosting/views.py 2017-09-09 21:41:20 +05:30
PCoder c1a8689199 Merged upstream master into task/3772/hosting_billing_monthly_subscription 2017-09-09 21:40:37 +05:30
PCoder d96d2907bc Passing pass as parameter to celery task 2017-09-09 20:46:43 +05:30
PCoder 1a43f4f810 Merged upstream master into task/3731/cdist_ssh_key_handler 2017-09-09 20:30:50 +05:30
M.Ravi e135bc9e8c hosting: Overriden get_object method in OrderHostingDetail and cleared
session on completion of creation of VM
2017-09-09 13:27:17 +02:00
M.Ravi c8baf3d4c1 Implemented post method for hosting OrderDetailView 2017-09-09 12:06:29 +02:00
PCoder f9abdfe1bc Merged upstream master into task/3731/cdist_ssh_key_handler 2017-09-09 13:44:46 +05:30
PCoder 1d5f92f7e1 Getting VM name for serializer data, hence fixing the problem of public- appearing in VM cancellation email 2017-09-09 12:12:56 +05:30
PCoder e9b5e052ac Merged upstream master into task/3484/email_refactoring 2017-09-09 11:38:57 +05:30
Arvind Tiwari d5c0fef965 Merge pull request #483 from tiwariav/task/3775/hosting_default_page
Task/3775 hosting/dashboard as default page
2017-09-08 02:03:08 +05:30
Arvind Tiwari e26b6ac416 default page for hosting changed from /hosting/my-virtual-machines -> /hosting/dashboard 2017-09-07 22:24:03 +05:30
M.Ravi 0fc0b0630c hosting: Updated OrdersHostingDetailView for stripe charging in this view 2017-09-06 23:52:02 +02:00
PCoder 2a9b208719 hosting: Moving the stripe charge to order confirmation page (still incomplete) 2017-09-06 13:25:18 +05:30
PCoder f84b95e385 Added some translations 2017-09-04 22:27:59 +05:30
M.Ravi 43e4c021a7 Removed order id from cancel vm email templates 2017-09-03 17:13:49 +02:00
M.Ravi a32c8ea467 Corrected VM cancellation email templates 2017-09-03 13:20:30 +02:00
PCoder f041a4047d Started with VM cancellation template 2017-09-03 02:33:05 +05:30
M.Ravi 8f2655bda2 Getting vm name properly in hosting views 2017-09-02 21:35:57 +02:00
M.Ravi 50431542f8 Corrected getting VM name in template 2017-09-02 20:42:58 +02:00
PCoder b5120040d3 Fixed an error and from address in new vm email template 2017-09-02 22:47:31 +05:30
PCoder e38df305c4 New VM email template updated 2017-09-02 22:08:25 +05:30
PCoder 7d12eff9be Added translations and reformatted code 2017-09-02 16:50:09 +05:30
M.Ravi 5a46cea307 Added functionality to add keys on creating a new vm 2017-08-31 18:20:02 +02:00
Arvind Tiwari a07922e4d4 style and translations fix 2017-08-31 15:54:01 +05:30
PCoder 46642d816a Merged master into task/3731/cdist_ssh_key_handler 2017-08-31 01:09:12 +05:30
Arvind Tiwari 43ceea948e merged master 2017-08-30 19:38:19 +05:30
M.Ravi 51b1ee2013 Added call to manage_public_key task when generating dcl generated keys
and reorganized imports
2017-08-30 12:02:53 +02:00
M.Ravi 92e47b6f90 Added manage_public_key when deleting a key (However, this does not seem to work in cdist) 2017-08-30 09:42:56 +02:00