diff --git a/atst/routes/requests/financial_verification.py b/atst/routes/requests/financial_verification.py index eeb4dd52..d43d75b6 100644 --- a/atst/routes/requests/financial_verification.py +++ b/atst/routes/requests/financial_verification.py @@ -71,9 +71,7 @@ def update_financial_verification(request_id): ) else: return redirect( - url_for( - "requests.requests_index", modal="pendingFinancialVerification" - ) + url_for("requests.requests_index", modal="pendingCCPOApproval") ) else: diff --git a/atst/routes/requests/requests_form.py b/atst/routes/requests/requests_form.py index d8e79d46..431b4828 100644 --- a/atst/routes/requests/requests_form.py +++ b/atst/routes/requests/requests_form.py @@ -121,7 +121,7 @@ def requests_submit(request_id=None): if request.status == RequestStatus.PENDING_FINANCIAL_VERIFICATION: modal = "pendingFinancialVerification" else: - modal = "pendingCCPOApproval" + modal = "pendingCCPOAcceptance" return redirect(url_for("requests.requests_index", modal=modal)) diff --git a/templates/fragments/pending_ccpo_acceptance_alert.html b/templates/fragments/pending_ccpo_acceptance_alert.html index 2e2343f5..44ec3a58 100644 --- a/templates/fragments/pending_ccpo_acceptance_alert.html +++ b/templates/fragments/pending_ccpo_acceptance_alert.html @@ -1,11 +1,11 @@ {% from "components/icon.html" import Icon %}

- We will review and respond to your request in 3 business days. You’ll be notified via email or phone. + The CCPO will review and respond to your request in 3 business days. You’ll be notified via email or phone. Please note if your request is for over $1M of JEDI cloud resources it will require a manual review by the CCPO.

- While your request is being reviewed, your next step is to create a Task Order associated with JEDI Cloud. Please contact a Contracting Officer (KO), Contracting Officer Representative (COR), or a Financial Manager to help with this step. + While your request is being reviewed, your next step is to create a Task Order (TO) associated with the JEDI Cloud. Please contact a Contracting Officer (KO), Contracting Officer Representative (COR), or a Financial Manager to help with this step.

diff --git a/templates/fragments/pending_ccpo_approval_modal.html b/templates/fragments/pending_ccpo_approval_modal.html index a605012e..958194d3 100644 --- a/templates/fragments/pending_ccpo_approval_modal.html +++ b/templates/fragments/pending_ccpo_approval_modal.html @@ -1,40 +1,8 @@ -{% from "components/icon.html" import Icon %} - -

- Request submitted. Approval pending. -

-

- We will review and respond to your request in 3 business days. You’ll be notified via email or phone. + The CCPO will review and respond to your Financial Verification submission in 3 business days. You will be notified via email or phone.

-

- Your request is being reviewed because: -

-

- -

- Next Steps -

- While your request is being reviewed, your next step is to create a Task Order associated with JEDI Cloud. Please contact a Contracting Officer (KO), Contracting Officer Representative (COR), or a Financial Manager to help with this step. + Once the financial verification is approved you will be invited to create your JEDI Workspace and set-up your projects. Click here for more details.

- -

- Once the Task Order has been created, you will be asked to provide details about the task order in the Financial Verification step. -

- -
- - {{ Icon('help') }} - Learn more about the JEDI Cloud Task Order and the Financial Verification process. - -
diff --git a/templates/requests/details.html b/templates/requests/details.html index 59411fe1..a1199ffd 100644 --- a/templates/requests/details.html +++ b/templates/requests/details.html @@ -8,17 +8,10 @@ {% if request.is_pending_ccpo_acceptance %} {{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_acceptance_alert.html") }} {% elif request.is_pending_ccpo_approval %} - - {% call Alert('Pending CCPO Approval') %} -

The CCPO will review and respond to your Financial Verification submission in 3 business days. You will be notified via email or phone.

-

Once the financial verification is approved you will be invited to create your JEDI Workspace and set-up your projects. Click here for more details.

- {% endcall %} - + {{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_approval_modal.html") }} {% elif requires_fv_action %} - {% include 'requests/review_menu.html' %} {{ Alert('Pending Financial Verification', fragment="fragments/pending_financial_verification.html") }} - {% endif %}
diff --git a/tests/routes/test_request_submit.py b/tests/routes/test_request_submit.py index 74799915..f5f9c1d8 100644 --- a/tests/routes/test_request_submit.py +++ b/tests/routes/test_request_submit.py @@ -21,7 +21,7 @@ def test_submit_reviewed_request(monkeypatch, client, user_session): follow_redirects=False, ) assert "/requests" in response.headers["Location"] - assert "modal=pendingCCPOApproval" in response.headers["Location"] + assert "modal=pendingCCPOAcceptance" in response.headers["Location"] def test_submit_autoapproved_reviewed_request(monkeypatch, client, user_session):