Change checkout thank you view to redirect to the homepage if order not found in the session. (#3506)

src/oscar/apps/checkout/views.py

@@ -2,6 +2,7 @@ import logging
 from urllib.parse import quote
 
 from django import http
+from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth import login
 from django.shortcuts import redirect
@@ -659,7 +660,14 @@ class ThankYouView(generic.DetailView):
     template_name = 'oscar/checkout/thank_you.html'
     context_object_name = 'order'
 
-    def get_object(self):
+    def get(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        if self.object is None:
+            return redirect(settings.OSCAR_HOMEPAGE)
+        context = self.get_context_data(object=self.object)
+        return self.render_to_response(context)
+
+    def get_object(self, queryset=None):
         # We allow superusers to force an order thank-you page for testing
         order = None
         if self.request.user.is_superuser:
@@ -674,9 +682,6 @@ class ThankYouView(generic.DetailView):
             if 'checkout_order_id' in self.request.session:
                 order = Order._default_manager.get(
                     pk=self.request.session['checkout_order_id'])
-            else:
-                raise http.Http404(_("No order found"))
-
         return order
 
     def get_context_data(self, *args, **kwargs):

tests/functional/checkout/test_customer_checkout.py

@@ -1,5 +1,3 @@
-from http import client as http_client
-
 from django.urls import reverse
 
 from oscar.core.loading import get_class, get_model
@@ -201,10 +199,11 @@ class TestPlacingAnOrderUsingAnOffer(CheckoutMixin, WebTestCase):
 
 class TestThankYouView(CheckoutMixin, WebTestCase):
 
-    def tests_gets_a_404_when_there_is_no_order(self):
+    def tests_gets_a_302_when_there_is_no_order(self):
         response = self.get(
             reverse('checkout:thank-you'), user=self.user, status="*")
-        self.assertEqual(http_client.NOT_FOUND, response.status_code)
+        self.assertIsRedirect(response)
+        self.assertRedirectsTo(response, 'catalogue:index')
 
     def tests_custumers_can_reach_the_thank_you_page(self):
         self.add_product_to_basket()
@@ -230,7 +229,7 @@ class TestThankYouView(CheckoutMixin, WebTestCase):
         response = self.get(test_url, status='*', user=user)
         self.assertIsOk(response)
 
-    def test_users_cannot_force_an_other_custumer_order(self):
+    def test_users_cannot_force_an_other_customer_order(self):
         self.add_product_to_basket()
         self.enter_shipping_address()
         self.place_order()
@@ -241,8 +240,10 @@ class TestThankYouView(CheckoutMixin, WebTestCase):
         test_url = '%s?order_number=%s' % (
             reverse('checkout:thank-you'), order.number)
         response = self.get(test_url, status='*', user=user)
-        self.assertEqual(response.status_code, http_client.NOT_FOUND)
+        self.assertIsRedirect(response)
+        self.assertRedirectsTo(response, 'catalogue:index')
 
         test_url = '%s?order_id=%s' % (reverse('checkout:thank-you'), order.pk)
         response = self.get(test_url, status='*', user=user)
-        self.assertEqual(response.status_code, http_client.NOT_FOUND)
+        self.assertIsRedirect(response)
+        self.assertRedirectsTo(response, 'catalogue:index')

tests/integration/checkout/test_views.py

@@ -1,24 +1,32 @@
-from django.test import TestCase
-from django.test.utils import override_settings
 from django.urls import reverse
 
 from oscar.test.factories import OrderFactory
+from oscar.test.testcases import WebTestCase
 
 
-class ThankYouViewTestCase(TestCase):
+class ThankYouViewTestCase(WebTestCase):
+    is_anonymous = False
 
-    @override_settings(OSCAR_ALLOW_ANON_CHECKOUT=True)
     def test_analytics_event_triggered_only_on_first_view(self):
-        order = OrderFactory()
-        session = self.client.session
-        # Put the order ID in the session, mimicking a completed order,
-        # so that we can reach the thank you page.
-        session['checkout_order_id'] = order.pk
-        session.save()
+        with self.settings(OSCAR_ALLOW_ANON_CHECKOUT=True):
+            url = reverse('checkout:thank-you')
+            order = OrderFactory()
+            session = self.client.session
+            # Put the order ID in the session, mimicking a completed order,
+            # so that we can reach the thank you page.
+            session['checkout_order_id'] = order.pk
+            session.save()
 
-        r1 = self.client.get(reverse('checkout:thank-you'), follow=True)
-        self.assertTrue(r1.context['send_analytics_event'])
+            r1 = self.client.get(url, follow=True)
+            self.assertTrue(r1.context['send_analytics_event'])
 
-        # Request the view a second time
-        r2 = self.client.get(reverse('checkout:thank-you'), follow=True)
-        self.assertFalse(r2.context['send_analytics_event'])
+            # Request the view a second time
+            r2 = self.client.get(url, follow=True)
+            self.assertFalse(r2.context['send_analytics_event'])
+
+    def test_missing_order_id_in_the_session(self):
+        with self.settings(OSCAR_ALLOW_ANON_CHECKOUT=True):
+            url = reverse('checkout:thank-you')
+            response = self.app.get(url)
+            self.assertIsRedirect(response)
+            self.assertRedirectsTo(response, 'catalogue:index')