diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index 96261a3ff..c11e9631c 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -209,37 +209,17 @@ def submit_request_to_go_live(service_id): '\nConsent to research: {research_consent}' '\nOther live services: {existing_live}' '\n' - '\n---' - '\n' - '{service_id}, ' - '{organisation}, ' - '{service_name}, ' - '{user_name}, ' - '{user_email}, ' - '-, ' - '{date}, ' - '{volume_sms}, ' - '{volume_email}, ' - '{volume_letter}' ).format( service_name=current_service.name, service_dashboard=url_for('main.service_dashboard', service_id=current_service.id, _external=True), organisation_type=str(current_service.organisation_type).title(), agreement=current_service.organisation.as_human_readable(current_user.email_domain), checklist=current_service.go_live_checklist_completed_as_yes_no, - volume_email=print_if_number(current_service.volume_email), volume_email_formatted=format_if_number(current_service.volume_email), - volume_sms=print_if_number(current_service.volume_sms), volume_sms_formatted=format_if_number(current_service.volume_sms), - volume_letter=print_if_number(current_service.volume_letter), volume_letter_formatted=format_if_number(current_service.volume_letter), research_consent='Yes' if current_service.consent_to_research else 'No', existing_live='Yes' if user_api_client.user_has_live_services(current_user) else 'No', - service_id=current_service.id, - organisation=current_service.organisation.name, - user_name=current_user.name, - user_email=current_user.email_address, - date=datetime.now(tz=pytz.timezone('Europe/London')).strftime('%d/%m/%Y'), ), ticket_type=zendesk_client.TYPE_QUESTION, user_email=current_user.email_address, @@ -1069,9 +1049,5 @@ def check_contact_details_type(contact_details): return 'phone_number' -def print_if_number(value): - return value if isinstance(value, int) else '' - - def format_if_number(value): return '{:,.0f}'.format(value) if isinstance(value, int) else '' diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 58a26d1bd..131bba606 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -1385,10 +1385,6 @@ def test_should_redirect_after_request_to_go_live( '{formatted_displayed_volumes}' 'Consent to research: Yes\n' 'Other live services: No\n' - '\n' - '---\n' - '{service_id}, None, service one, Test User, test@user.gov.uk, -, 21/12/2012, ' - '{displayed_volumes}' ).format( service_id=SERVICE_ONE_ID, displayed_volumes=displayed_volumes,