Merge branch 'develop-multisite' into rehan/EDLY-2100

edly-io · Nov 11, 2020 · 8d335b6 · 8d335b6
2 parents c6c378b + 3b486fd
commit 8d335b6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/ecommerce/static/js/views/subscription_list_view.js b/ecommerce/static/js/views/subscription_list_view.js
@@ -45,7 +45,6 @@ define([
             renderSubscriptionTable: function() {
                 var filterPlaceholder = gettext('Search...'),
                     $emptyLabel = '<label class="sr">' + filterPlaceholder + '</label>';
-                SubscriptionUtils.setCoursePaymentsButtonText();
 
                 if (!$.fn.dataTable.isDataTable('#subscriptionTable')) {
                     this.$el.find('#subscriptionTable').DataTable({

diff --git a/ecommerce/static/templates/subscription_form.html b/ecommerce/static/templates/subscription_form.html
@@ -104,7 +104,7 @@
         <div class="form-group">
             <label class="hd-4" for="display-order"><%= gettext('Subscription Display Order') %></label>
             <div class="input-group">
-                <input id="display-order" type="number" step="1" class="form-control non-editable" name="display_order" min="1" >
+                <input id="display-order" type="number" step="1" class="form-control" name="display_order" min="1" >
             </div>
             <p class="help-block"><%= gettext('Display order for the subscription in which learners will see it in the list of subscriptions. (1 being the highest order)') %></p>
         </div>