From 41cfbcfb557fc21a64f0e5d2363f1b5570ada04e Mon Sep 17 00:00:00 2001 From: Ivan Ivic Date: Mon, 24 Apr 2017 12:17:23 +0000 Subject: [PATCH] Enable all products to be displayed on receipt page LEARNER-605 --- lms/djangoapps/commerce/tests/mocks.py | 7 ++++++- .../student_account/test/test_views.py | 18 ------------------ lms/djangoapps/student_account/views.py | 10 ---------- 3 files changed, 6 insertions(+), 29 deletions(-) diff --git a/lms/djangoapps/commerce/tests/mocks.py b/lms/djangoapps/commerce/tests/mocks.py index 8435fc040b..199c2e405f 100644 --- a/lms/djangoapps/commerce/tests/mocks.py +++ b/lms/djangoapps/commerce/tests/mocks.py @@ -180,7 +180,12 @@ class mock_get_orders(mock_ecommerce_api_endpoint): )]) ), ] - ) + ), + factories.OrderFactory( + lines=[ + factories.OrderLineFactory(product=factories.ProductFactory(product_class='Coupon')) + ] + ), ] } method = httpretty.GET diff --git a/lms/djangoapps/student_account/test/test_views.py b/lms/djangoapps/student_account/test/test_views.py index 7dc4049a55..6f9e3c5344 100644 --- a/lms/djangoapps/student_account/test/test_views.py +++ b/lms/djangoapps/student_account/test/test_views.py @@ -697,24 +697,6 @@ class AccountSettingsViewTest(ThirdPartyAuthTestMixin, TestCase, ProgramsApiConf self.assertEqual(len(order_detail), 1) - def test_order_history_with_coupon(self): - """ - Verify that get_order_details returns empty receipt_url for coupon product. - """ - response = { - 'results': [ - factories.OrderFactory( - lines=[ - factories.OrderLineFactory(product=factories.ProductFactory(product_class='Coupon')) - ] - ) - ] - } - with mock_get_orders(response=response): - order_detail = get_user_orders(self.user) - - self.assertEqual(order_detail[0]['receipt_url'], '') - @override_settings(SITE_NAME=settings.MICROSITE_LOGISTRATION_HOSTNAME) class MicrositeLogistrationTests(TestCase): diff --git a/lms/djangoapps/student_account/views.py b/lms/djangoapps/student_account/views.py index 806f898068..a24f482755 100644 --- a/lms/djangoapps/student_account/views.py +++ b/lms/djangoapps/student_account/views.py @@ -351,16 +351,6 @@ def get_user_orders(user): 'receipt_url': EcommerceService().get_receipt_page_url(order['number']), 'lines': order['lines'], } - - # If the order lines contain a product that is not a Seat - # we do not want to display the Order Details button. It - # will break the receipt page if used. - for order_line in order['lines']: - product = order_line.get('product') - - if product and product.get('product_class') != 'Seat': - order_data['receipt_url'] = '' - break user_orders.append(order_data) return user_orders