diff --git a/atst/routes/requests/requests_form.py b/atst/routes/requests/requests_form.py index 80f76931..2fb4891a 100644 --- a/atst/routes/requests/requests_form.py +++ b/atst/routes/requests/requests_form.py @@ -143,6 +143,7 @@ def view_request_details(request_id=None): request_id=request.id, status=request.status_displayname, pending_review=request.is_pending_ccpo_action, + pending_ccpo_acceptance=request.is_pending_ccpo_acceptance, financial_verification=request.is_pending_financial_verification or request.is_pending_financial_verification_changes, financial_review=financial_review, diff --git a/templates/requests/details.html b/templates/requests/details.html index 07bd49a7..095f5cc6 100644 --- a/templates/requests/details.html +++ b/templates/requests/details.html @@ -9,6 +9,10 @@ {% include 'requests/review_menu.html' %} {% endif %} + {% if pending_ccpo_acceptance %} + {{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_approval_alert.html") }} + {% endif %} + {% if pending_review %} {{ Alert('Your request is being reviewed', message="
You cannot edit your submitted request while it is under review. Your request will be reviewed within 3 business days.
", diff --git a/templates/requests/index.html b/templates/requests/index.html index 2ef2fefa..06c56f00 100644 --- a/templates/requests/index.html +++ b/templates/requests/index.html @@ -45,9 +45,9 @@ {% else %} - {% if pending_ccpo_approval %} + {% if pending_financial_verification %} - {{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_approval_alert.html") }} + {{ Alert('Pending Financial Verification', fragment="fragments/pending_financial_verification.html") }} {% endif %}