Merge pull request #406 from edx/multi-tenancy/update-receipt-page

WAIT-LMS: Using order number for receipt page

ecommerce/extensions/checkout/signals.py

@@ -82,7 +82,7 @@ def send_course_purchase_email(sender, order=None, **kwargs):  # pylint: disable
                         {
                             'course_title': product.title,
                             'receipt_page_url': get_lms_url(
-                                '/commerce/checkout/receipt/?basket_id={}'.format(order.basket.id)
+                                '/commerce/checkout/receipt/?orderNum={}'.format(order.number)
                             ),
                             'credit_hours': product.attr.credit_hours,
                             'credit_provider': provider_data['display_name'],

ecommerce/extensions/checkout/tests/test_signals.py

@@ -57,6 +57,6 @@ class SignalTests(CourseCatalogTestMixin, TestCase):
                 credit_hours=2,
                 credit_provider='Hogwarts',
                 platform_name=settings.PLATFORM_NAME,
-                receipt_url=get_lms_url('/commerce/checkout/receipt/?basket_id={}'.format(order.basket.id))
+                receipt_url=get_lms_url('/commerce/checkout/receipt/?orderNum={}'.format(order.number))
             )
         )

ecommerce/extensions/payment/processors/cybersource.py

@@ -88,7 +88,7 @@ class Cybersource(BasePaymentProcessor):
             u'currency': basket.currency,
             u'consumer_id': basket.owner.username,
             # TODO: Update once LMS receipt page is able to look up orders by order number.
-            u'override_custom_receipt_page': u'{}?basket_id={}'.format(self.receipt_page_url, basket.id),
+            u'override_custom_receipt_page': u'{}?orderNum={}'.format(self.receipt_page_url, basket.order_number),
             u'override_custom_cancel_page': self.cancel_page_url,
         }
 

ecommerce/extensions/payment/tests/test_processors.py

@@ -122,7 +122,8 @@ class CybersourceTests(CybersourceMixin, PaymentProcessorTestCaseMixin, TestCase
             u'amount': unicode(self.basket.total_incl_tax),
             u'currency': self.basket.currency,
             u'consumer_id': self.basket.owner.username,
-            u'override_custom_receipt_page': u'{}?basket_id={}'.format(self.processor.receipt_page_url, self.basket.id),
+            u'override_custom_receipt_page': u'{}?orderNum={}'.format(self.processor.receipt_page_url,
+                                                                      self.basket.order_number),
             u'override_custom_cancel_page': self.processor.cancel_page_url,
             u'merchant_defined_data1': self.course.id,
             u'merchant_defined_data2': self.CERTIFICATE_TYPE,

ecommerce/extensions/payment/tests/test_views.py

@@ -318,7 +318,7 @@ class PaypalPaymentExecutionViewTests(PaypalMixin, PaymentEventsMixin, TestCase)
         response = self.client.get(reverse('paypal_execute'), self.RETURN_DATA)
         self.assertRedirects(
             response,
-            u'{}?basket_id={}'.format(self.processor.receipt_url, self.basket.id),
+            u'{}?orderNum={}'.format(self.processor.receipt_url, self.basket.order_number),
             fetch_redirect_response=False
         )
 

ecommerce/extensions/payment/views.py

@@ -178,7 +178,7 @@ class PaypalPaymentExecutionView(EdxOrderPlacementMixin, View):
 
         paypal_response = request.GET.dict()
         basket = self._get_basket(payment_id)
-        receipt_url = u'{}?basket_id={}'.format(self.payment_processor.receipt_url, basket.id)
+        receipt_url = u'{}?orderNum={}'.format(self.payment_processor.receipt_url, basket.order_number)
 
         try:
             with transaction.atomic():