-
{% translate "The court may reject your waiver request if you do not include the required forms." %}
-
{% if fee_waiver.document_guidance %}{{ fee_waiver.document_guidance }}{% else %}{% translate "Include your fee waiver form or a court order that waives your fees." %}{% endif %}
-
+
+
{% translate "The court may reject your waiver request if you do not include the required forms." %}
+
{% if fee_waiver.document_guidance %}{{ fee_waiver.document_guidance }}{% else %}{% translate "Include your fee waiver form or a court order that waives your fees." %}{% endif %}
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+ id="upload-waiver-document"
+ class="btn btn-primary"
+ disabled>{% translate "Upload document" %}
+
-
{% translate "Fee waiver document added." %}
- {% endif %}
+
+
{% translate "Fee waiver document added. Check it below." %}
{% endif %}
+
+ {% for check in document_checks %}
+ {% include "efile/components/document_check.html" with document=check.document fingerprint=check.fingerprint removable=check.removable %}
+ {% endfor %}
+
{% translate "The court requires an account even for a free filing. If the confirmed total is $0, you will not be charged. No fee waiver is needed." %}
@@ -173,6 +180,7 @@
{% translate "Confirmed fees" %}
{% endblock workflow_content %}
{% block extra_js %}
+
{% endblock extra_js %}
diff --git a/efile_app/efile/templates/efile/preview_documents.html b/efile_app/efile/templates/efile/preview_documents.html
index e53e38e4..d4a6f5d3 100644
--- a/efile_app/efile/templates/efile/preview_documents.html
+++ b/efile_app/efile/templates/efile/preview_documents.html
@@ -26,7 +26,7 @@
{% translate "Check your documents" %}
{% endfor %}
{% translate "Change files" %}
+ href="{% url 'upload_documents' jurisdiction %}{% if return_to %}?return_to={{ return_to }}{% endif %}">{% translate "Change files" %}
diff --git a/efile_app/efile/templates/efile/upload_documents.html b/efile_app/efile/templates/efile/upload_documents.html
index 742a2bde..30bcca7f 100644
--- a/efile_app/efile/templates/efile/upload_documents.html
+++ b/efile_app/efile/templates/efile/upload_documents.html
@@ -208,10 +208,19 @@
{% translate "Your documents" %}
never showed "What are you trying to do?", so it is not where Back
goes. See efile.workflow.get_visible_workflow.
{% endcomment %}
-
{% translate "Back" %}
+ {% if return_to and has_lead_document %}
+ {% comment %}
+ Came here to change files from a later screen: Back is the
+ preview it came from, not the start of the filing.
+ {% endcomment %}
+
{% translate "Back" %}
+ {% else %}
+
{% translate "Back" %}
+ {% endif %}
{% translate "Preview your PDFs" %}
diff --git a/efile_app/efile/tests/test_checklist_document_checks.py b/efile_app/efile/tests/test_checklist_document_checks.py
new file mode 100644
index 00000000..80f349f7
--- /dev/null
+++ b/efile_app/efile/tests/test_checklist_document_checks.py
@@ -0,0 +1,92 @@
+"""Files added on the checklist are checked there, not after a detour from Review."""
+
+from unittest.mock import patch
+
+import pytest
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.urls import reverse
+
+from efile.models import FilingDocument
+from efile.services.document_previews import preview_fingerprint
+from efile.tests import test_filing_plan_actions as plan_actions
+from efile.tests.pdf_helpers import pdf_bytes
+
+CHECKLIST_URL = plan_actions.CHECKLIST_URL
+user = plan_actions.user
+draft = plan_actions.draft
+signed_in = plan_actions.signed_in
+
+pytestmark = pytest.mark.django_db
+
+CHECKS_URL = reverse("document_checks", kwargs={"jurisdiction": "illinois"})
+
+
+def new_file(draft, **fields):
+ """A file as the upload leaves it: prepared, but its copy not yet confirmed."""
+ return FilingDocument.objects.create(
+ draft=draft,
+ role=FilingDocument.Role.SUPPORTING,
+ sort_order=1,
+ name="fee-waiver.pdf",
+ preparation="unchanged",
+ **fields,
+ )
+
+
+def confirm(client, draft, document):
+ document.refresh_from_db()
+ return client.post(
+ f"{CHECKS_URL}?draft={draft.pk}",
+ {"action": "confirm", "document_id": document.pk, "preview_fingerprint": preview_fingerprint([document])},
+ )
+
+
+def test_uploading_for_an_item_lands_on_its_check(client, signed_in):
+ def upload(draft, files, jurisdiction, **kwargs):
+ new_file(draft)
+
+ with patch("efile.views.document_checklist.upload_files", side_effect=upload):
+ response = client.post(
+ CHECKLIST_URL,
+ {"action": "attach_item", "item_id": "fee_waiver", "document": SimpleUploadedFile("w.pdf", pdf_bytes())},
+ )
+ assert response.status_code == 302
+ assert response.url.endswith("#document-checks")
+ added = signed_in.documents.get(role=FilingDocument.Role.SUPPORTING)
+ page = client.get(CHECKLIST_URL)
+ content = page.content.decode()
+ assert f'data-document-id="{added.pk}"' in content
+ assert "This copy looks right" in content
+ assert 'aria-describedby="checks-pending"' in content
+ # The confirmed lead is listed as added; the new copy is only in its check.
+ assert [doc.pk for doc in page.context["checked_documents"]] == [
+ signed_in.documents.get(role=FilingDocument.Role.LEAD).pk
+ ]
+
+
+def test_continue_waits_for_new_files_to_be_checked(client, signed_in):
+ added = new_file(signed_in, filing_type_code="78690", document_type_code="public")
+ blocked = client.post(CHECKLIST_URL, {"documents_complete": "yes"})
+ assert blocked.url.partition("#")[0].partition("?")[0] == CHECKLIST_URL
+ assert blocked.url.endswith("#document-checks")
+ assert confirm(client, signed_in, added).status_code == 200
+ page = client.get(CHECKLIST_URL).content.decode()
+ assert "checks-pending" not in page
+ moved_on = client.post(CHECKLIST_URL, {"documents_complete": "yes"})
+ assert "organize-documents" in moved_on.url
+
+
+def test_a_file_added_on_the_way_back_from_review_needs_no_second_preview(client, signed_in):
+ added = new_file(signed_in, filing_type_code="78690", document_type_code="public")
+ assert confirm(client, signed_in, added).status_code == 200
+ signed_in.selected_payment_account_id = "account"
+ signed_in.save()
+ response = client.post(
+ f"{CHECKLIST_URL}?return_to=review",
+ {"documents_complete": "yes", "return_to": "review", "status_petition": "have"},
+ )
+ assert response.url.partition("?")[0] == reverse("case_review", kwargs={"jurisdiction": "illinois"})
+ with patch("efile.views.review.get_case_questions", return_value=[]):
+ review = client.get(response.url)
+ # Review used to bounce here to the preview step and back.
+ assert review.status_code == 200
diff --git a/efile_app/efile/tests/test_detours.py b/efile_app/efile/tests/test_detours.py
new file mode 100644
index 00000000..31915cc0
--- /dev/null
+++ b/efile_app/efile/tests/test_detours.py
@@ -0,0 +1,155 @@
+"""A filer sent to an earlier step from Review or the handoff list comes back.
+
+See the "Detours" section of efile.workflow: only a step's completion decides
+where to go next, and an intermediate action keeps the marker on its screen.
+"""
+
+import json
+from unittest.mock import patch
+
+import pytest
+from django.urls import reverse
+
+from efile.models import FilingDocument, FilingParty
+from efile.tests.test_review_submit_flow import submission_draft as _submission_draft
+from efile.workflow import (
+ WorkflowStepKey,
+ clean_return_to,
+ continue_step,
+ continue_url,
+ documents_need_organizing,
+ with_return_to,
+)
+
+draft = _submission_draft
+
+pytestmark = pytest.mark.django_db
+
+J = {"jurisdiction": "illinois"}
+
+
+def path(url):
+ return url.partition("?")[0]
+
+
+def step(name, draft, return_to=""):
+ url = reverse(name, kwargs=J) + f"?draft={draft.pk}"
+ return f"{url}&return_to={return_to}" if return_to else url
+
+
+def test_only_known_origins_are_markers():
+ assert clean_return_to("review") == "review"
+ assert clean_return_to("handoff") == "handoff"
+ for value in ("payment", "document_checklist", "https://example.com", "", None, '">