diff --git a/app/main/forms.py b/app/main/forms.py index 8a4f09e2c..3be1c5122 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -1719,16 +1719,6 @@ class ServiceDeliveryStatusCallbackForm(CallbackForm): ) -class InternationalSMSForm(StripWhitespaceForm): - enabled = RadioField( - 'Send text messages to international phone numbers', - choices=[ - ('on', 'On'), - ('off', 'Off'), - ], - ) - - class SMSPrefixForm(StripWhitespaceForm): enabled = RadioField( '', diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index 043fc68c2..a8fe4dd87 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -35,7 +35,6 @@ from app.main.forms import ( ConfirmPasswordForm, EstimateUsageForm, FreeSMSAllowance, - InternationalSMSForm, LinkOrganisationsForm, PreviewBranding, RenameServiceForm, @@ -648,13 +647,14 @@ def service_set_sms_prefix(service_id): @main.route("/services//service-settings/set-international-sms", methods=['GET', 'POST']) @user_has_permissions('manage_service') def service_set_international_sms(service_id): - form = InternationalSMSForm( - enabled='on' if current_service.has_permission('international_sms') else 'off' + form = ServiceOnOffSettingForm( + 'Send text messages to international phone numbers', + enabled=current_service.has_permission('international_sms'), ) if form.validate_on_submit(): current_service.force_permission( 'international_sms', - on=(form.enabled.data == 'on'), + on=form.enabled.data, ) return redirect( url_for(".service_settings", service_id=service_id) diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index d7a1b3da3..8c1556793 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -3788,8 +3788,8 @@ def test_broadcast_service_cant_post_to_set_other_channels_endpoint( @pytest.mark.parametrize('permissions, expected_checked', [ - (['international_sms'], 'on'), - ([''], 'off'), + (['international_sms'], 'True'), + ([''], 'False'), ]) def test_show_international_sms_as_radio_button( client_request, @@ -3812,8 +3812,8 @@ def test_show_international_sms_as_radio_button( @pytest.mark.parametrize('post_value, international_sms_permission_expected_in_api_call', [ - ('on', True), - ('off', False), + ('True', True), + ('False', False), ]) def test_switch_service_enable_international_sms( client_request,