diff --git a/lms/djangoapps/verify_student/views.py b/lms/djangoapps/verify_student/views.py index 09e750b1e4..ea89f8828c 100644 --- a/lms/djangoapps/verify_student/views.py +++ b/lms/djangoapps/verify_student/views.py @@ -273,7 +273,7 @@ class PayAndVerifyView(View): # separate out the payment flow and use the product SKU to figure out what # the user is trying to purchase. # - # Nonethless, for the time being we continue to make the really ugly assumption + # Nonetheless, for the time being we continue to make the really ugly assumption # that at some point there was a paid course mode we can query for the price. relevant_course_mode = self._get_paid_mode(course_key) @@ -509,9 +509,12 @@ class PayAndVerifyView(View): # Retrieve all the modes at once to reduce the number of database queries all_modes, unexpired_modes = CourseMode.all_and_unexpired_modes_for_courses([course_key]) - # Retrieve the first unexpired, paid mode, if there is one + # Retrieve the first mode that matches the following criteria: + # * Unexpired + # * Price > 0 + # * Not credit for mode in unexpired_modes[course_key]: - if mode.min_price > 0: + if mode.min_price > 0 and not CourseMode.is_credit_mode(mode): return mode # Otherwise, find the first expired mode diff --git a/lms/static/js/commerce/views/receipt_view.js b/lms/static/js/commerce/views/receipt_view.js index 665aec401d..4a9b0a30c3 100644 --- a/lms/static/js/commerce/views/receipt_view.js +++ b/lms/static/js/commerce/views/receipt_view.js @@ -64,6 +64,7 @@ var edx = edx || {}; providerDiv = this.$el.find("#receipt-provider"); context.course_key = this.courseKey; context.username = this.username; + context.platformName = this.$el.data('platform-name'); providerDiv.html(_.template(templateHtml, context)).removeClass('hidden'); }, @@ -301,7 +302,7 @@ function completeOrder (event) { ); $.ajax({ - url: '/api/credit/v1/provider/' + providerId + '/request/', + url: '/api/credit/v1/providers/' + providerId + '/request/', type: 'POST', headers: { 'X-CSRFToken': $.cookie('csrftoken') diff --git a/lms/static/sass/views/_verification.scss b/lms/static/sass/views/_verification.scss index da59fac628..979c5cf956 100644 --- a/lms/static/sass/views/_verification.scss +++ b/lms/static/sass/views/_verification.scss @@ -246,42 +246,33 @@ } .report-receipt-provider { @extend %ui-window; - border-top: 3px solid $credit-color-base; + padding: ($baseline*0.75) $baseline; .provider-wrapper { width: 70%; @include float(left); - padding-left: $baseline; .provider-info { - padding: $baseline $baseline $baseline 0; + margin-bottom: $baseline; font-weight: 600; } - .provider-more-info { - } - .provider-instructions { - } } .provider-buttons-logos { - width: 30%; @include float(right); @include text-align(center); - .provider-logo { - padding: $baseline; - } - .provider-logo image { - width: 100px; + .provider-logo img { + width: 100px; } .complete-order { @include text-align(center); - padding: $baseline; - } - .complete-order button { - @extend %btn-pl-primary-base; - white-space: nowrap; + + button { + @extend %btn-pl-primary-base; + white-space: nowrap; + } } } } diff --git a/lms/templates/commerce/provider.underscore b/lms/templates/commerce/provider.underscore index ce4df2e362..a79108f6b4 100644 --- a/lms/templates/commerce/provider.underscore +++ b/lms/templates/commerce/provider.underscore @@ -1,9 +1,9 @@