diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py index f80ab08d0..73b71bf2d 100644 --- a/src/registrar/models/domain_request.py +++ b/src/registrar/models/domain_request.py @@ -1005,11 +1005,13 @@ class DomainRequest(TimeStampedModel): if not context: has_organization_feature_flag = flag_is_active_for_user(recipient, "organization_feature") is_org_user = has_organization_feature_flag and recipient.has_view_portfolio_permission(self.portfolio) + requires_feb_questions = self.requires_feb_questions() context = { "domain_request": self, # This is the user that we refer to in the email "recipient": recipient, "is_org_user": is_org_user, + "requires_feb_questions": requires_feb_questions, } if custom_email_content: diff --git a/src/registrar/templates/emails/includes/domain_request_summary.txt b/src/registrar/templates/emails/includes/domain_request_summary.txt index c58aef5e1..300edd49f 100644 --- a/src/registrar/templates/emails/includes/domain_request_summary.txt +++ b/src/registrar/templates/emails/includes/domain_request_summary.txt @@ -35,12 +35,38 @@ Current websites: {% for site in domain_request.current_websites.all %} {% endfor %}{% endif %} .gov domain: {{ domain_request.requested_domain.name }} +{% if requires_feb_questions %} + Meets Naming Requirements + {% if domain_request.feb_naming_requirements %} + {{ domain_request.feb_naming_requirements }} + {% else %} + No + {{ domain_request.feb_naming_requirements_details }} + {% endif %} +{% endif %} {% 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 }} +{% if requires_feb_questions %} + {{ domain_request.feb_purpose_choice }} + {{ domain_request.purpose }} + Target time frame: + {% if domain_request.has_target_time_frame %} + {{ domain_request.time_frame_details }} + {% else %} + No + {% endif %} + Interagency initiative: + {% if domain_request.is_interagency_initiative %} + {{ domain_request.interagency_initiative_details }} + {% else %} + No + {% endif %} +{% else %} + {{ domain_request.purpose }} +{% endif %} Your contact information: {% spaceless %}{% include "emails/includes/contact.txt" with contact=recipient %}{% endspaceless %} @@ -49,7 +75,17 @@ Other employees from your organization:{% for other in domain_request.other_cont {% 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 }} +{% endfor %} +{% if requires_feb_questions %} + EOP Stakeholder: + {% if domain_request.working_with_eop %} + {{ domain_request.eop_contact.first_name }} {{ domain_request.eop_contact.last_name }} + {{ domain_request.eop_contact.email }} + {% else %} + No + {% endif %} +{% endif %} +{% if domain_request.anything_else %} + Anything else? + {{ domain_request.anything_else }} {% endif %} \ No newline at end of file