diff --git a/common/djangoapps/student/tests/test_credit.py b/common/djangoapps/student/tests/test_credit.py
index b85d711e2d..f8acdfc946 100644
--- a/common/djangoapps/student/tests/test_credit.py
+++ b/common/djangoapps/student/tests/test_credit.py
@@ -108,7 +108,6 @@ class CreditCourseDashboardTest(ModuleStoreTestCase):
response = self._load_dashboard()
self.assertContains(response, "credit-eligibility-msg")
self.assertContains(response, "purchase-credit-btn")
- self.assertContains(response, "purchase credit for this course expires")
def test_purchased_credit(self):
# Simulate that the user has purchased credit, but has not
diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss
index 64f10ca9a2..cafc33646a 100644
--- a/lms/static/sass/multicourse/_dashboard.scss
+++ b/lms/static/sass/multicourse/_dashboard.scss
@@ -557,6 +557,17 @@
@include float(right);
}
+ .pending-credit-btn{
+ @include float(right);
+ }
+
+ .denied-credit-btn{
+ @include float(right);
+ }
+ .credit-request-pending-msg{
+ display: inline-block;
+ }
+
.credit-btn {
@extend %btn-pl-yellow-base;
background-image: none ;
diff --git a/lms/templates/dashboard/_dashboard_credit_info.html b/lms/templates/dashboard/_dashboard_credit_info.html
index 124116886a..2b4f1a459c 100644
--- a/lms/templates/dashboard/_dashboard_credit_info.html
+++ b/lms/templates/dashboard/_dashboard_credit_info.html
@@ -6,6 +6,9 @@
from util.date_utils import get_default_time_display
%>
<%namespace name='static' file='../static_content.html'/>
+% if credit_status["provider_name"]:
+ <% provider_link='{}'.format(credit_status["provider_status_url"],credit_status["provider_name"]) %>
+% endif
% if credit_status["eligible"]:
@@ -17,69 +20,53 @@
)}
% if not credit_status["purchased"] and not credit_status["error"] :
-
- % if credit_status["deadline"] < datetime.datetime.now(pytz.UTC) + datetime.timedelta(days=30):
- ${_("The opportunity to purchase credit for this course expires on {deadline}. You've worked hard - don't miss out!").format(deadline=get_default_time_display(credit_status["deadline"]))}
- % else:
- ${_("Congratulations - you have met the requirements for credit in this course!")}
- % endif
+
+ ${_("You are now eligible for credit. {congrats}").format(
+ congrats="Congratulations",
+ )
+ }
% elif credit_status["request_status"] in [None, "pending"] and not credit_status["error"] :
% if credit_status["request_status"] == "pending":
- ${_("Thanks for your payment! We are currently processing your course credit. You'll see a message here when the transaction is complete. For more information, see {provider_link}.").format(
- provider_link=u'{provider_name}'.format(
- provider_url=credit_status["provider_status_url"],
- provider_name=credit_status["provider_name"],
+ ${_("Thank you. Your credit is processing. Please see {link} for more information.").format(
+ link=provider_link,
)
- )
- }
+ }
+
% elif credit_status["request_status"] is None:
- ${_("Thank you for your payment! To receive your course credit, go to the {provider_link} website. You may have to complete some additional steps depending on the institution").format(
- provider_link=u'{provider_name}'.format(
- provider_url=credit_status["provider_status_url"],
- provider_name=credit_status["provider_name"],
+ ${_("Thank you for your purchase. Please proceed to {link} to finalize your credit.").format(
+ link=provider_link,
)
- )
- }
+ }
+
% endif
-
% elif credit_status["request_status"] == "approved" and not credit_status["error"] :
- ${_("Congratulations - you have received credit for this course! For more information, see {provider_link}.").format(
- provider_link=u'{provider_name}'.format(
- provider_url=credit_status["provider_status_url"],
- provider_name=credit_status["provider_name"],
+ ${_("Your credit has been processed and approved. {congrats}. Please see {link} for more information.").format(
+ congrats="Congratulations",
+ link=provider_link,
)
- )
- }
+ }
${_("Access credit")}
% elif credit_status["request_status"] == "rejected" and not credit_status["error"] :
- ${_("{provider_name} has declined your request for course credit. For more information, contact {provider_link}.").format(
- provider_name=credit_status["provider_name"],
- provider_link=u'{provider_name}'.format(
- provider_url=credit_status["provider_status_url"],
- provider_name=credit_status["provider_name"],
+ ${_("Your credit has been processed but denied. Please contact {link} for more information.").format(
+ link=provider_link,
)
- )
- }
+ }