Commit graph

193 commits

Author SHA1 Message Date
M.Ravi 8fb4607bdd Fixed issues reported by flake 2017-07-01 15:53:25 +02:00
M.Ravi c8cf166571 Merged code from siarheipuhach/dynamicweb 2017-07-01 15:18:44 +02:00
PCoder b502cb5da8 Fixed logo in payment/order confirmation page not redirecting to index issue 2017-07-01 04:29:11 +05:30
PCoder 4857bc2cd8 Now fetching billing address data from session variable 2017-07-01 03:54:08 +05:30
PCoder bd766e2073 Fixed filling up of users details while going back to payment page from order confirmation page 2017-07-01 03:11:16 +05:30
PCoder 285ce2e710 Added OS configuration to the Order Confirmation page 2017-07-01 02:16:24 +05:30
PCoder dfd910465c Added dcl translations used in new flow 2017-07-01 01:40:17 +05:30
PCoder 160df7685c Refactored dcl text and support email 2017-06-30 12:47:04 +05:30
PCoder 699326dc57 Made to return empty string for the template filter get_value_from_dict instead of None 2017-06-30 12:33:28 +05:30
PCoder 2350247cdb Removed unused code 2017-06-30 12:27:18 +05:30
PCoder 1deeec4c33 Added the locale time code to new flow order detail 2017-06-30 12:18:31 +05:30
PCoder 3eca55a32a Fixed billing address bug. Fixed back button issues in the new flow 2017-06-30 12:08:07 +05:30
PCoder d32d2a8976 Added a form in order confirmation page 2017-06-30 12:06:41 +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
siarheipuhach a9c9f74aed Fixed PEP8 violations 2017-06-29 19:23:25 +03:00
Siarhei Puhach fcc109b8f5 Merge branch 'master' into feature/flake8 2017-06-29 18:56:50 +03:00
Siarhei Puhach edcfd3e9f4 Added Flake8 lib and fixed PEP8 violations 2017-06-29 17:34:40 +03:00
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 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
M.Ravi 3ca7153414 Changed invoice text 2017-06-23 01:34:31 +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 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 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 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 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 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 ed26ac8b59 Updated dcl's django.po to resolve some conflict 2017-06-19 12:44:48 +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
Levi Velázquez 5271591cf3 Merge pull request #324 from pcoder/feature/3296/confirm_emails
Feature/3296/confirm emails
2017-06-15 15:22:00 -05:00
Levi Velázquez 3aa9b573cc Merge pull request #343 from ungleich/fix_translation
Fixed translations of validation messages
2017-06-15 13:38:16 -05:00
M.Ravi 06af225c97 Updated proper translation corrections 2017-06-16 00:00:26 +05:30
M.Ravi 36567071c0 Removed OrderView as we no longer use it 2017-06-15 23:36:58 +05:30
M.Ravi e897bb9c22 Removed unused /order url 2017-06-15 23:32:20 +05:30
M.Ravi 6c588e3531 Deleted the order.html 2017-06-15 23:31:19 +05:30
M.Ravi a56d08e729 Fixed translations of validation messages 2017-06-15 06:29:31 +05:30
M.Ravi 0b034ec2f8 Fixed typo 'Standort' instead of 'Strandort' 2017-06-15 04:29:57 +05:30