Update email content, update manage button content

This commit is contained in:
zandercymatics 2024-10-23 14:29:26 -06:00
parent 150a59cdfc
commit 5cb3298afd
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
5 changed files with 68 additions and 3 deletions

View file

@ -6,5 +6,9 @@
{% block content %}
{% include "includes/request_status_manage.html" %}
{% if not portfolio %}
{% include "includes/request_status_manage.html" %}
{% else %}
{% include "includes/portfolio_status_manage.html" %}
{% endif %}
{% endblock %}

View file

@ -0,0 +1,41 @@
SUMMARY OF YOUR DOMAIN REQUEST
Requesting entity:
{% if domain_request.portfolio and domain_request.organization_name == domain_request.portfolio.organization_name %}
{{domain_request.portfolio.organization_name}}
{{domain_request.portfolio.city}}, {{domain_request.portfolio.state_territory}}
{% elif domain_request.sub_organization %}
{{domain_request.sub_organization}}
{% comment %} We don't have city or state_territory for suborganizations yet, so no data should display {% endcomment %}
{% elif domain_request.requested_suborganization and domain_request.suborganization_city and domain_request.suborganization_state_territory %}
{{domain_request.requested_suborganization}}
{{domain_request.suborganization_city}}, {{domain_request.suborganization_state_territory}}
{% endif %}
Alternative domains:
{% for site in domain_request.alternative_domains.all %}{% spaceless %}{{ site.website }}{% endspaceless %}
{% endfor %}{% endif %}
Current websites: {% for site in domain_request.current_websites.all %}
{% spaceless %}{{ site.website }}{% endspaceless %}
{% endfor %}{% endif %}
.gov domain:
{{ domain_request.requested_domain.name }}
{% if domain_request.alternative_domains.all %}
Alternative domains:
{% for site in domain_request.alternative_domains.all %}{% spaceless %}{{ site.website }}{% endspaceless %}
{% endfor %}{% endif %}
Purpose of your domain:
{{ domain_request.purpose }}
Additional details:
{{ domain_request.additional_details }}
Your contact information:
{% spaceless %}{% include "emails/includes/contact.txt" with contact=recipient %}{% endspaceless %}
Other employees from your organization:{% for other in domain_request.other_contacts.all %}
{% spaceless %}{% include "emails/includes/contact.txt" with contact=other %}{% endspaceless %}
{% empty %}
{{ domain_request.no_other_contacts_rationale }}
{% endfor %}{% if domain_request.anything_else %}
Anything else?
{{ domain_request.anything_else }}
{% endif %}

View file

@ -30,8 +30,11 @@ THANK YOU
.Gov helps the public identify official, trusted information. Thank you for requesting a .gov domain.
----------------------------------------------------------------
{% include 'emails/includes/domain_request_summary.txt' %}
{% if portfolio %}
{% include 'emails/includes/portfolio_domain_request_summary.txt' %}
{% else %}
{% include 'emails/includes/domain_request_summary.txt' %}
{% endif %}
----------------------------------------------------------------
The .gov team

View file

@ -0,0 +1,7 @@
{% extends "includes/request_status_manage.html" %}
{% load custom_filters %}
{% load static url_helpers %}
{% block request_summary %}
{% include "includes/portfolio_request_review_steps.html" with is_editable=False domain_request=DomainRequest %}
{% endblock request_summary %}

View file

@ -857,6 +857,16 @@ class DomainRequestStatus(DomainRequestPermissionView):
return True
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
# Create a temp wizard object to grab the step list
wizard = PortfolioDomainRequestWizard()
wizard.request = self.request
context["Step"] = PortfolioDomainRequestStep.__members__
context["steps"] = request_step_list(wizard, PortfolioDomainRequestStep)
context["form_titles"] = wizard.titles
return context
class DomainRequestWithdrawConfirmation(DomainRequestPermissionWithdrawView):
"""This page will ask user to confirm if they want to withdraw