feat: update condition of programPurchasedWithoutSubscription

openedx · Jun 13, 2023 · 5d08292 · 5d08292
1 parent c7559f5
commit 5d08292
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/lms/static/js/learner_dashboard/views/program_details_view.js b/lms/static/js/learner_dashboard/views/program_details_view.js
@@ -200,6 +200,7 @@ class ProgramDetailsView extends Backbone.View {
         ));
         const programPurchasedWithoutSubscription = (
             this.subscriptionModel.get('subscriptionState') !== 'active'
+            && this.subscriptionModel.get('subscriptionState') !== 'inactive'
             && !isSomeCoursePurchasable
             && this.remainingCourseCollection.length === 0
         );

diff --git a/lms/templates/learner_dashboard/program_details_tab_view.underscore b/lms/templates/learner_dashboard/program_details_tab_view.underscore
@@ -48,7 +48,11 @@
                         </div>
                     </div>
                 <% } %>
-                <% if (isSubscriptionEligible) { %>
+                <% if (isSubscriptionEligible && (
+                        completedCount !== totalCount
+                        || subscriptionState === 'active'
+                    )
+                ) { %>
                 <div class="d-flex flex-column align-items-start flex-xl-row  align-items-xl-center upgrade-subscription">
                     <a
                         href="<%- subscriptionUrl %>"

diff --git a/lms/templates/learner_dashboard/program_details_view.underscore b/lms/templates/learner_dashboard/program_details_view.underscore
@@ -23,7 +23,11 @@
                     </div>
                 </div>
             <% } %>
-            <% if (isSubscriptionEligible) { %>
+            <% if (isSubscriptionEligible && (
+                    completedCount !== totalCount
+                    || subscriptionState === 'active'
+                )
+            ) { %>
             <div class="d-flex flex-column align-items-start flex-xl-row  align-items-xl-center upgrade-subscription">
                 <a
                     href="<%- subscriptionUrl %>"