Fixed bug where a user with an organisation that wanted the GOVUK only branding ended up with both

If a user was to have an organisation selected in the email settings within the platform admin section, they would be sending emails that contained both the organisation's branding and GOV.UK's.

Fix adds a check to ensure that the branding dictionary does not contain organisation details if the the service branding settings is set to 'gov'

app/delivery/send_to_providers.py

@@ -15,9 +15,16 @@ from app.dao.provider_details_dao import (
 )
 from app.celery.research_mode_tasks import send_sms_response, send_email_response
 from app.dao.templates_dao import dao_get_template_by_id
-from app.models import SMS_TYPE, KEY_TYPE_TEST, BRANDING_ORG, EMAIL_TYPE, NOTIFICATION_TECHNICAL_FAILURE, \
-    NOTIFICATION_SENT, NOTIFICATION_SENDING
-
+from app.models import (
+    SMS_TYPE,
+    KEY_TYPE_TEST,
+    BRANDING_ORG,
+    BRANDING_GOVUK,
+    EMAIL_TYPE,
+    NOTIFICATION_TECHNICAL_FAILURE,
+    NOTIFICATION_SENT,
+    NOTIFICATION_SENDING
+)
 from app.celery.statistics_tasks import create_initial_notification_statistic_tasks
 
 
@@ -168,7 +175,7 @@ def get_logo_url(base_url, logo_file):
 
 def get_html_email_options(service):
     govuk_banner = service.branding != BRANDING_ORG
-    if service.organisation:
+    if service.organisation and service.branding != BRANDING_GOVUK:
         logo_url = get_logo_url(
             current_app.config['ADMIN_BASE_URL'],
             service.organisation.logo