From bde6c5e835e75f670975187eb243a398a406722d Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Wed, 23 Oct 2024 15:38:25 -0600 Subject: [PATCH] check for org on email --- src/registrar/models/domain_request.py | 6 ++++++ src/registrar/templates/emails/submission_confirmation.txt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py index faa02a3c7..33a9f2dea 100644 --- a/src/registrar/models/domain_request.py +++ b/src/registrar/models/domain_request.py @@ -6,6 +6,7 @@ from django.conf import settings from django.db import models from django_fsm import FSMField, transition # type: ignore from django.utils import timezone +from waffle import flag_is_active from registrar.models.domain import Domain from registrar.models.federal_agency import FederalAgency from registrar.models.utility.generic_helper import CreateOrUpdateOrganizationTypeHelper @@ -13,6 +14,8 @@ from registrar.utility.errors import FSMDomainRequestError, FSMErrorCodes from registrar.utility.constants import BranchChoices from auditlog.models import LogEntry +from registrar.utility.waffle import flag_is_active_for_user + from .utility.time_stamped_model import TimeStampedModel from ..utility.email import send_templated_email, EmailSendingError from itertools import chain @@ -841,10 +844,13 @@ class DomainRequest(TimeStampedModel): try: 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_base_portfolio_permission(self.portfolio) context = { "domain_request": self, # This is the user that we refer to in the email "recipient": recipient, + "is_org_user": is_org_user, } if custom_email_content: diff --git a/src/registrar/templates/emails/submission_confirmation.txt b/src/registrar/templates/emails/submission_confirmation.txt index 2b51127f2..f4acae7e9 100644 --- a/src/registrar/templates/emails/submission_confirmation.txt +++ b/src/registrar/templates/emails/submission_confirmation.txt @@ -30,7 +30,7 @@ THANK YOU .Gov helps the public identify official, trusted information. Thank you for requesting a .gov domain. ---------------------------------------------------------------- -{% if portfolio %} +{% if is_org_user %} {% include 'emails/includes/portfolio_domain_request_summary.txt' %} {% else %} {% include 'emails/includes/domain_request_summary.txt' %}