Merge pull request #989 from edx/mjfrey/receipt-page-fix

Fix receipt page for free checkouts.

ecommerce/extensions/checkout/tests/test_views.py

 from decimal import Decimal
 
 from django.core.urlresolvers import reverse
-from django.conf import settings
 import httpretty
 from oscar.core.loading import get_model
 from oscar.test import newfactories as factories
@@ -47,7 +46,7 @@ class FreeCheckoutViewTests(TestCase):
         """ Verify redirect to the receipt page. """
         self.prepare_basket(0)
         self.assertEqual(Order.objects.count(), 0)
-        receipt_page = get_lms_url(settings.RECEIPT_PAGE_PATH)
+        receipt_page = get_lms_url('/commerce/checkout/receipt')
 
         response = self.client.get(self.path)
         self.assertEqual(Order.objects.count(), 1)

ecommerce/extensions/checkout/views.py

@@ -4,7 +4,6 @@ from __future__ import unicode_literals
 from decimal import Decimal
 import logging
 
-from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.core.urlresolvers import reverse
 from django.utils.decorators import method_decorator
@@ -16,6 +15,7 @@ from oscar.core.loading import get_class, get_model
 from ecommerce.core.url_utils import get_lms_url
 from ecommerce.extensions.checkout.exceptions import BasketNotFreeError
 from ecommerce.extensions.checkout.mixins import EdxOrderPlacementMixin
+from ecommerce.extensions.checkout.utils import get_receipt_page_url
 
 Applicator = get_class('offer.utils', 'Applicator')
 Basket = get_model('basket', 'Basket')
@@ -46,7 +46,10 @@ class FreeCheckoutView(EdxOrderPlacementMixin, RedirectView):
 
             order = self.place_free_order(basket)
 
-            receipt_path = '{}?orderNum={}'.format(settings.RECEIPT_PAGE_PATH, order.number)
+            receipt_path = get_receipt_page_url(
+                order_number=order.number,
+                site_configuration=order.site.siteconfiguration
+            )
             url = get_lms_url(receipt_path)
         else:
             # If a user's basket is empty redirect the user to the basket summary