ungleich-public
/
dynamicweb
6
0
Fork 0
Code Issues 1 Pull Requests 2 Projects Releases Wiki Activity
4,940 Commits 13 Branches 148 Tags 315 MiB
Commit Graph

485 Commits

Author SHA1 Message Date
PCoder 3ebf932422 Adjust hosting calculator form validation 
For 512 MB RAM offer
 2018-10-17 09:29:08 +02:00
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
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