Chris Moffitt avatar Chris Moffitt committed 4126d17

Fix redirect so that the authenticated customers option works. Closes #1435

Comments (0)

Files changed (1)

satchmo/apps/payment/views/contact.py

         Returns the initial data to use for forms on this view.
         """
         init_data = {}
-        if not self.request.user.is_authenticated() and \
-                config_value('SHOP', 'AUTHENTICATION_REQUIRED'):
-            url = urlresolvers.reverse('satchmo_checkout_auth_required')
-            thisurl = urlresolvers.reverse('satchmo_checkout-step1')
-            return http.HttpResponseRedirect(url + "?next=" + thisurl)
-
         if self.request.user.is_authenticated():
             if self.request.user.email:
                 init_data['email'] = self.request.user.email
     def get(self, request, *args, **kwargs):
         contact = self.get_contact()
         init_data = self.get_initial()
+        
+        if not self.request.user.is_authenticated() and \
+                config_value('SHOP', 'AUTHENTICATION_REQUIRED'):
+            url = urlresolvers.reverse('satchmo_checkout_auth_required')
+            thisurl = urlresolvers.reverse('satchmo_checkout-step1')
+            return http.HttpResponseRedirect(url + "?next=" + thisurl)
 
         if contact:
             # If a person has their contact info,
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.