Commit graph

1618 commits

Author SHA1 Message Date
PCoder
d32d2a8976 Added a form in order confirmation page 2017-06-30 12:06:41 +05:30
PCoder
d161a285b8 Added get_card_details function to stripe_utils 2017-06-30 11:08:00 +05:30
PCoder
4c3d8627b1 Added code to fetch cc data and put in context 2017-06-30 11:06:58 +05:30
PCoder
d0376f35f8 Now getting info in Order Confirmation from session and context 2017-06-30 11:05:34 +05:30
PCoder
cb6aeae1ae Refactored the logic to OrderConfirmationView from the PaymentOrderView 2017-06-29 13:08:24 +05:30
PCoder
a2153777e4 We do not have order created when in Order Confirmation page. So removed the id parameter in url 2017-06-29 13:06:05 +05:30
PCoder
3313dab485 Added get_value_from_dict filter to obtain values from a dict in templates 2017-06-29 13:05:06 +05:30
PCoder
a3c3a5cd2e Changed the way we get info in dcl order_detail template 2017-06-29 13:04:13 +05:30
M.Ravi
ed9e5c591c Merge branch 'pcoder-new_flow' 2017-06-23 04:54:15 +05:30
M.Ravi
796fbbe1f8 Removed status from the order page 2017-06-23 04:38:10 +05:30
M.Ravi
aca831adac Resolved conflicts while merging pcoder-new_flow 2017-06-23 04:35:33 +05:30
Pcoder
8408e3e7ac Merge pull request #350 from pcoder/task/3379/text_style_activation
Task/3379/text style activation and moep's and sanghee's de translations added
2017-06-22 23:13:58 +02:00
M.Ravi
654d73e51d Add some de translations and invoice now called 'Confirm Order' 2017-06-23 02:33:59 +05:30
M.Ravi
82e8c377af Added membership django.po 2017-06-23 02:14:54 +05:30
M.Ravi
165dfa49ab Fixed __proxy__ to string conversion issue 2017-06-23 01:42:37 +05:30
M.Ravi
3ca7153414 Changed invoice text 2017-06-23 01:34:31 +05:30
M.Ravi
82ebafa5f5 Merge branch 'moeps_translation_fixes' into task/3379/text_style_activation 2017-06-23 01:16:07 +05:30
M.Ravi
9aba565ec0 Added + corrected de translations 2017-06-23 01:15:48 +05:30
M.Ravi
5b8a26eeb3 Fixed a blunder mistake. Was using name instead of email 2017-06-23 00:31:08 +05:30
M.Ravi
e5929b8f76 Removed call to refresh_from_db as it was wrongly used 2017-06-23 00:15:47 +05:30
M.Ravi
d4e7eb9511 Added CustomUser model reload code 2017-06-22 23:48:14 +05:30
M.Ravi
5caa79f199 Added CustomUser.DoesNotExist error exception 2017-06-22 13:40:39 +05:30
M.Ravi
31c389e72c Added order_detail.html for dcl 2017-06-22 13:23:13 +05:30
M.Ravi
b4c3172a4d Added send_email flag to send/not send email on user registration. Added get_random_password method to CustomUser 2017-06-22 13:22:14 +05:30
M.Ravi
c4c110b506 Added OrderConfirmationView to dcl 2017-06-22 13:21:07 +05:30
M.Ravi
e848c318d0 Addd order confirmation url 2017-06-22 13:18:54 +05:30
M.Ravi
041352ac6d Cleaned up some commented code 2017-06-22 00:28:44 +05:30
M.Ravi
da0d8bf937 Added one.vm.rename xml-rpc call to rename a created vm 2017-06-22 00:17:53 +05:30
M.Ravi
387c45b969 We need the logo in the payment page even when user is not logged in 2017-06-21 23:38:35 +05:30
M.Ravi
bbfc7e8515 Not persisting stripe details to db 2017-06-21 23:37:36 +05:30
M.Ravi
66f82572f1 Added payment url 2017-06-21 13:15:37 +05:30
M.Ravi
52524a97a6 Added PaymentOrderView 2017-06-21 13:14:58 +05:30
M.Ravi
385df4e069 Added vm_name parameter to create_vm 2017-06-21 13:13:10 +05:30
M.Ravi
2959159863 Added cache_control decorator to control cache while returning back to the index page 2017-06-21 01:40:55 +05:30
M.Ravi
c50b2455c2 Separated email subject for translation 2017-06-20 23:45:25 +05:30
M.Ravi
b27342b493 Added dcl_text instead the hardcoded text 2017-06-20 23:44:10 +05:30
M.Ravi
543a52baf9 Fixed some more translations 2017-06-20 01:00:48 +05:30
M.Ravi
b971751e2b Updated click here text in de 2017-06-20 00:22:12 +05:30
M.Ravi
ec761d9e5f Corrected with sanghee translations on github 2017-06-20 00:12:50 +05:30
M.Ravi
8dca67e638 Increased top margin for email confirmation and validation forms 2017-06-19 23:53:25 +05:30
M.Ravi
062416a280 Updated/corrected de translations for hosting 2017-06-19 23:39:19 +05:30
M.Ravi
3cf7f8bd57 Updated css to center align text in registration success message 2017-06-19 12:55:14 +05:30
M.Ravi
ed26ac8b59 Updated dcl's django.po to resolve some conflict 2017-06-19 12:44:48 +05:30
M.Ravi
0a6275bcef Merge branch 'master' into task/3379/text_style_activation 2017-06-19 12:37:09 +05:30
M.Ravi
47632c6bd1 Updated the django.po for datacenterlight 2017-06-19 12:34:58 +05:30
M.Ravi
a7e9946a4f Refactored user activation html email template to use proper translation and parameters 2017-06-19 12:34:01 +05:30
M.Ravi
bf941539d7 Refactored user_activation.txt email template 2017-06-19 12:32:08 +05:30
M.Ravi
17dd810945 Now we get dcl_text and dcl support email from settings 2017-06-19 12:30:37 +05:30
M.Ravi
5e9330102e Added dcl email parameters to base.py 2017-06-19 12:29:22 +05:30
Pcoder
0cbd3aa666 Merge pull request #349 from pcoder/bug/3416/error_vm_id_change
Fixed redirecting user to list vm page, if he requests for details of a vm whose id does not belong to him.
2017-06-18 17:12:52 +02:00