Commit Graph

139 Commits

Author SHA1 Message Date
Arvind Tiwari b65bc3f1f5 merge master 2017-09-28 18:23:48 +05:30
PCoder 39cb930326 Compute vm price on post of dcl index and set in session 2017-09-28 04:22:15 +05:30
PCoder fccd75f1fc Add missing imports 2017-09-28 03:46:05 +05:30
PCoder 06ef940b01 Merge upstream 2017-09-28 03:33:43 +05:30
Arvind Tiwari 88706b0088 merged master 2017-09-28 03:06:47 +05:30
Arvind Tiwari 2a99d053dc text fixes 2017-09-26 03:42:10 +05:30
Arvind Tiwari 3c32abbf8e dcl form added 2017-09-26 03:18:19 +05:30
Arvind Tiwari 63ea7dac37 datacenterlight invoice redesigned 2017-09-26 01:04:38 +05:30
PCoder 537e350c8c Redirecting users on creation of accounts to my virtual machines page 2017-09-24 00:22:18 +05:30
PCoder 8781905fc6 Removed DataCenterLight PricingView 2017-09-23 21:24:42 +05:30
PCoder 93d36306fb Removed total and price fields used in dcl flow 2017-09-23 13:21:01 +05:30
PCoder b17af3bb09 Merge branch 'task/3736/refactor_compute_vm_price' into task/3730/refactor_price_parameter 2017-09-23 12:48:31 +05:30
PCoder 8de4a75107 Removed some occurrences of price 2017-09-23 12:48:21 +05:30
PCoder 99e5cf5587 Using refactored get_vm_price and get_vm_plan_name functions 2017-09-23 03:18:05 +05:30
M.Ravi c362dccd0f Handling payment error response by json 2017-09-22 21:30:42 +02:00
M.Ravi a48188a190 datacenterlight: Added create vm modal and responding with json 2017-09-22 21:20:00 +02:00
M.Ravi ab66d25abe Removed some commented code 2017-09-22 13:54:20 +02:00
M.Ravi 0e5a27862a Added base_url and fixed new account emails 2017-09-22 13:46:22 +02:00
M.Ravi 4c0c1ffb27 Do a user login after creation 2017-09-22 12:46:33 +02:00
M.Ravi 31f7c4a51a Simplified code 2017-09-22 12:38:05 +02:00
M.Ravi 994ffaf117 Send account details in email 2017-09-22 12:01:09 +02:00
M.Ravi f67b69d490 Formatted code and added condition to create user only if an email does not exist 2017-09-22 11:45:21 +02:00
M.Ravi e5ad57d3f1 Resolved some issues 2017-09-21 14:29:49 +02:00
PCoder e2cb70a697 first attempt at refatoring the user creating to order confirmaton page 2017-09-21 06:41:09 +05:30
Arvind Tiwari 6237469ab2 mobile order fixed 2017-09-13 01:55:58 +05:30
Arvind Tiwari 4d2903ca86 billing address save and get 2017-09-12 00:54:02 +05:30
Arvind Tiwari 7a4573f7ad user logged in after signup on payment page 2017-09-09 02:10:25 +05:30
Arvind Tiwari f2a04c20f2 form submit fix 2017-09-09 00:05:13 +05:30
Arvind Tiwari de1895d2a0 billing address form fixed 2017-09-08 23:46:29 +05:30
Arvind Tiwari aaf3bc18d8 landing_payment all sections arranged 2017-09-06 00:12:13 +05:30
Arvind Tiwari 046b716091 Merge branch 'master' into task/3756/landing_billing_page 2017-09-04 23:58:22 +05:30
Arvind Tiwari 979844e55b hosting payment and datacenterlight payment files supported 2017-09-02 02:02:05 +05:30
Arvind Tiwari cc5eaa4047 new template for datacenterlight/payment 2017-09-01 23:06:57 +05:30
Arvind Tiwari 5550867870 navbar link hash fixed, footer links fixed 2017-09-01 01:27:44 +05:30
Arvind Tiwari 3ed2399337 merge master 2017-09-01 00:39:01 +05:30
Arvind Tiwari e94f9a5d2b dropdown style fix 2017-08-31 23:42:18 +05:30
M.Ravi 5ffb2a2bb7 Improved the contact us email message subject & reformatted code 2017-08-30 10:04:19 +02:00
PCoder 1da04a05d1 Created send_plain_email_task celery task and calling it on contact send 2017-08-27 16:42:14 +05:30
PCoder 28bcef082c Merged tiwariav/task/3657/contact_section into task/3740/contact_send_message 2017-08-27 16:41:39 +05:30
PCoder 16f000c723 dcl views.py: passing cc details to create_vm_task + reformatted code 2017-08-24 11:54:12 +05:30
PCoder a964f2fb5b Merged master into task/3701/enable_monthly_payments 2017-08-24 04:06:48 +05:30
PCoder 6484684ac5 Removed unncessary check for error for make_charge 2017-08-24 02:29:24 +05:30
PCoder 83df42b5df Fixed checking active status of subscription + redirection to payment page on error 2017-08-22 00:07:58 +05:30
PCoder 506b5a904a Added missing code from the merge 2017-08-21 01:54:55 +05:30
PCoder 339a6283cd Removed unused imports 2017-08-19 03:32:30 +05:30
PCoder 6b7ae88f74 Merged master into task/3622/decouple_opennebula_dcl_flow 2017-08-19 03:24:22 +05:30
Pcoder a80b0668a2 Merge pull request #432 from siarheipuhach/feature/task3637
task/3637/Added stripe failed payment error handler
2017-08-17 20:50:18 +02:00
PCoder 73721f16d2 Added ONEADMIN_USER_SSH_PUBLIC_KEY parameter to load oneadmin user's ssh key by default when creating VM via DCL flow 2017-08-15 02:29:01 +05:30
Siarhei Puhach 72ddfd96ab Payment error was unified 2017-08-07 17:23:58 +03:00
Siarhei Puhach a71ccbc566 Added error hash in url, added payment error handler to hosting/views 2017-08-07 17:02:47 +03:00