Commit graph

204 commits

Author SHA1 Message Date
M.Ravi e17792badb Merge branch 'master' of https://github.com/ungleich/dynamicweb 2017-07-02 23:38:07 +02:00
M.Ravi 8b9359ede5 Reverted back to the default behavior of bootstrap-validator 2017-07-02 23:37:31 +02:00
Andrii Marynets a91de372e0 Merge branch 'master' into feature/add_google_analytics 2017-07-02 23:01:42 +03:00
M.Ravi f67343ab5c Added missing validation code 2017-07-02 21:26:10 +02:00
Mondi Geetha 3a865bd010 Increased minimum length of the name to 3 2017-07-02 23:33:33 +05:30
Mondi Geetha 5b6a069137 Added DE translations for error messages 2017-07-02 23:16:19 +05:30
Mondi Geetha fd856d7613 Reverted back email templates as they are part of another PR 2017-07-02 20:55:08 +05:30
Andrii Marynets 303d99d70d Merge branch 'master' into feature/add_google_analytics
# Conflicts:
#	datacenterlight/templates/datacenterlight/order_detail.html
2017-07-02 17:56:07 +03:00
Mondi Geetha f48ea4714e changed error message color 2017-07-02 18:34:17 +05:30
Mondi Geetha 0a2b2c815d Aligned Logo, Text, Signature to left 2017-07-02 02:14:18 +05:30
Mondi Geetha 0c969946f7 Added code for proper return when name/email are not good 2017-07-01 18:02:10 +05:30
Mondi Geetha e4cfcbf618 Added some classes and divs for error msg alignment alongside the input field 2017-07-01 18:01:08 +05:30
Mondi Geetha afcec7eb03 Removed unwanted code and add bootstrap-validator cdn js 2017-07-01 17:59:34 +05:30
Mondi Geetha 36877d613d Added styles for proper positioning of error msgs 2017-07-01 17:58:42 +05:30
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
Andrii Marynets 2ad984504c Add GOOGLE_ANALYTICS_PROPERTY_IDS for dynamic set ID 2017-06-30 01:23:35 +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
Andrii Marynets 007fc794c3 Add google analytics to data center light 2017-06-27 23:47:30 +03:00
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