From 1f93b37d5c5d41ada82a65b92a4378df5cd54889 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Wed, 21 Aug 2019 16:55:42 +0100 Subject: [PATCH 1/6] Update explanation of inbound SMS --- .../views/service-settings/set-inbound-sms.html | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/templates/views/service-settings/set-inbound-sms.html b/app/templates/views/service-settings/set-inbound-sms.html index f9d597290..0c8c730b7 100644 --- a/app/templates/views/service-settings/set-inbound-sms.html +++ b/app/templates/views/service-settings/set-inbound-sms.html @@ -33,9 +33,18 @@ Contact us if you want to be able to receive text messages from your users.

- We’ll create a special phone number for them to contact. You'll be able to see - the messages on your dashboard, or get them using the API. + We’ll create a unique phone number for your service that users can reply to.

+

+ Text messages you send will come from this phone number instead of your sender name (’CURRENT NAME’. +

+

+ You can still send text messages from a sender name if you need to, but users will not be able to reply to those messages. +

+

+ You can see and reply to the messages you receive when you sign in to Notify, or get them using the API. +

+

It does not cost you anything to receive text messages. Users will pay their standard text message rate.

{% endif %} From 2ed988274f22f550477d6ef2df4204b560cbdd1a Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 22 Aug 2019 09:34:47 +0100 Subject: [PATCH 2/6] Add sender name placeholder --- app/templates/views/service-settings/set-inbound-sms.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/service-settings/set-inbound-sms.html b/app/templates/views/service-settings/set-inbound-sms.html index 0c8c730b7..98bfa6ace 100644 --- a/app/templates/views/service-settings/set-inbound-sms.html +++ b/app/templates/views/service-settings/set-inbound-sms.html @@ -36,7 +36,7 @@ We’ll create a unique phone number for your service that users can reply to.

- Text messages you send will come from this phone number instead of your sender name (’CURRENT NAME’. + Text messages you send will come from this phone number instead of your sender name (currently {SENDER NAME}).

You can still send text messages from a sender name if you need to, but users will not be able to reply to those messages. From 2967d7c54e9648bd7feda193854bc514ebda0b29 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 22 Aug 2019 10:50:04 +0100 Subject: [PATCH 3/6] Add code for current sender field --- app/templates/views/service-settings/set-inbound-sms.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/service-settings/set-inbound-sms.html b/app/templates/views/service-settings/set-inbound-sms.html index 98bfa6ace..1baf42493 100644 --- a/app/templates/views/service-settings/set-inbound-sms.html +++ b/app/templates/views/service-settings/set-inbound-sms.html @@ -36,7 +36,7 @@ We’ll create a unique phone number for your service that users can reply to.

- Text messages you send will come from this phone number instead of your sender name (currently {SENDER NAME}). + Text messages you send will come from this phone number instead of your sender name (currently {{ current_service.default_sms_sender }}).

You can still send text messages from a sender name if you need to, but users will not be able to reply to those messages. From 3f73106b31edfca0142cab192a235d44e2b34ff0 Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 22 Aug 2019 10:52:26 +0100 Subject: [PATCH 4/6] Change 'users' to 'they' to reduce repetition --- app/templates/views/service-settings/set-inbound-sms.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/service-settings/set-inbound-sms.html b/app/templates/views/service-settings/set-inbound-sms.html index 1baf42493..7fc81796c 100644 --- a/app/templates/views/service-settings/set-inbound-sms.html +++ b/app/templates/views/service-settings/set-inbound-sms.html @@ -33,7 +33,7 @@ Contact us if you want to be able to receive text messages from your users.

- We’ll create a unique phone number for your service that users can reply to. + We’ll create a unique phone number for your service that they can reply to.

Text messages you send will come from this phone number instead of your sender name (currently {{ current_service.default_sms_sender }}). From 165054866cb624ced8f814e5cc6006b95223f4dc Mon Sep 17 00:00:00 2001 From: karlchillmaid Date: Thu, 22 Aug 2019 13:55:29 +0100 Subject: [PATCH 5/6] Add sender name option to 'if' content --- app/templates/views/service-settings/set-inbound-sms.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/templates/views/service-settings/set-inbound-sms.html b/app/templates/views/service-settings/set-inbound-sms.html index 7fc81796c..72a2cb743 100644 --- a/app/templates/views/service-settings/set-inbound-sms.html +++ b/app/templates/views/service-settings/set-inbound-sms.html @@ -19,6 +19,9 @@

Your service can receive text messages sent to {{ current_service.inbound_number }}.

+

+ You can still send text messages from a sender name if you need to, but users will not be able to reply to those messages. +

Contact us if you want to switch this feature off.

From 922a7fc9dc6c38c8a27a3ee477979c0bcf5f1472 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Fri, 23 Aug 2019 13:52:41 +0100 Subject: [PATCH 6/6] Fix tests --- tests/app/main/views/test_service_settings.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 8732ec167..6e821bfa7 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -4100,6 +4100,7 @@ def test_invitation_pages( client_request, service_one, mock_get_inbound_number_for_service, + single_sms_sender, endpoint, permissions, expected_p, @@ -4138,6 +4139,7 @@ def test_set_inbound_sms_when_inbound_number_is_not_set( service_one, single_reply_to_email_address, single_letter_contact_block, + single_sms_sender, mocker, mock_get_all_letter_branding, ): @@ -4152,11 +4154,15 @@ def test_set_inbound_sms_when_inbound_number_is_not_set( @pytest.mark.parametrize('user, expected_paragraphs', [ (active_user_with_permissions, [ 'Your service can receive text messages sent to 07700900123.', + 'You can still send text messages from a sender name if you ' + 'need to, but users will not be able to reply to those messages.', 'Contact us if you want to switch this feature off.', 'You can set up callbacks for received text messages on the API integration page.', ]), (active_user_no_api_key_permission, [ 'Your service can receive text messages sent to 07700900123.', + 'You can still send text messages from a sender name if you ' + 'need to, but users will not be able to reply to those messages.', 'Contact us if you want to switch this feature off.', ]), ])