diff --git a/app/__init__.py b/app/__init__.py index f51b12b49..0f3645d6c 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -377,7 +377,7 @@ def format_notification_status_as_field_status(status): def format_notification_status_as_url(status): - url = partial(url_for, "main.delivery_and_failure") + url = partial(url_for, "main.using_notify") return { 'technical-failure': url(_anchor='technical-failure'), 'temporary-failure': url(_anchor='not-accepting-messages'), diff --git a/app/assets/images/message-sending-flow.svg b/app/assets/images/message-sending-flow.svg new file mode 100644 index 000000000..e064ca2cb --- /dev/null +++ b/app/assets/images/message-sending-flow.svg @@ -0,0 +1,1665 @@ + + + + diff --git a/app/main/views/api_keys.py b/app/main/views/api_keys.py index d12cf3629..ba6a83a18 100644 --- a/app/main/views/api_keys.py +++ b/app/main/views/api_keys.py @@ -77,7 +77,7 @@ def create_api_key(service_id): disabled_options = [KEY_TYPE_NORMAL] option_hints = {KEY_TYPE_NORMAL: Markup( 'This option is not available because your service is in ' - 'trial mode'.format(url_for(".trial_mode")) + 'trial mode'.format(url_for(".using_notify")) )} else: disabled_options, option_hints = [], {} diff --git a/app/main/views/index.py b/app/main/views/index.py index 596527769..165e7d519 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -28,7 +28,7 @@ def cookies(): @main.route('/trial-mode') def trial_mode(): - return render_template('views/trial-mode.html') + return redirect(url_for('.using_notify') + '#trial-mode', 301) @main.route('/pricing') @@ -46,7 +46,7 @@ def pricing(): @main.route('/delivery-and-failure') def delivery_and_failure(): - return render_template('views/delivery-and-failure.html') + return redirect(url_for('.using_notify') + '#messagedeliveryandfailure', 301) @main.route('/design-patterns-content-guidance') @@ -125,3 +125,8 @@ def roadmap(): @main.route('/features') def features(): return render_template('views/features.html') + + +@main.route('/using_notify') +def using_notify(): + return render_template('views/using-notify.html') diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 3c252ce94..e1b0d7ee5 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -95,12 +95,11 @@
- In trial mode you can only + In trial mode you can only send to yourself and members of your team
diff --git a/app/templates/partials/check/too-many-messages.html b/app/templates/partials/check/too-many-messages.html index fd16b0534..b75dbb65f 100644 --- a/app/templates/partials/check/too-many-messages.html +++ b/app/templates/partials/check/too-many-messages.html @@ -8,7 +8,7 @@You can only send {{ current_service.message_limit }} messages per day {%- if current_service.restricted %} - in trial mode + in trial mode {%- endif -%} .
diff --git a/app/templates/views/check/column-errors.html b/app/templates/views/check/column-errors.html index 491eade0f..7e718b50d 100644 --- a/app/templates/views/check/column-errors.html +++ b/app/templates/views/check/column-errors.html @@ -90,7 +90,7 @@ {{ 'this letter' if count_of_recipients == 1 else 'these letters' }}- In trial mode you + In trial mode you can only preview how your letters will look
diff --git a/app/templates/views/delivery-and-failure.html b/app/templates/views/delivery-and-failure.html deleted file mode 100644 index 47f71c6dd..000000000 --- a/app/templates/views/delivery-and-failure.html +++ /dev/null @@ -1,72 +0,0 @@ -{% extends "withoutnav_template.html" %} - -{% block per_page_title %} -Delivery and failure -{% endblock %} - -{% block maincolumn_content %} - -Our delivery states are:
- -All messages start in the ‘Sending’ state.
- -This means that we have accepted the message. It’s waiting in a queue to be sent to our email or text message delivery partners.
- -This means the message is in the person’s email inbox or on their phone.
- -We can’t tell you if they’ve read it – to do so would require invasive and unreliable tracking techniques.
- -You’re still billed for text messages to non-existant phone numbers.
- -You need to remove these email addresses or phone numbers from your database.
- - - -This can happen for a number of reasons, eg the user’s inbox was full.
- -You can choose to retry these messages later or not.
- -This means the user’s phone was full or hasn’t been switched on in the last 72 hours.
- -You’re still billed for these messages.
- -You can choose to retry these messages later or not.
- -This means there is a problem with the connection between Notify and our email or text message delivery partners.
- -Messages still being retried are marked as ’Sending’. We mark messages as ‘Technical failure’ once we’ve given up.
- -You won’t be billed for these messages.
- -You need to retry these messages yourself later.
- -- All new accounts on Notify start off in trial mode. -
-- This means: -
-- When you’re ready we can - {% if current_service %} - remove these restrictions. - {% else %} - remove these restrictions. - {% endif %} - -
- -+ All new accounts on Notify start off in trial mode. +
++ This means: +
++ When you’re ready we can + {% if current_service %} + remove these restrictions. + {% else %} + remove these restrictions. + {% endif %} + +
+ +If a message fails because the inbox or phone ‘isn’t accepting messages right now’ then it’s up to you to decide if you want to send the message again or not.
+ +Notify attempts to send messages for up to 72 hours before it returns that status.
+ +If your user has provided you with multiple contact channels, you should send messages to the channel they’ve chosen as their preference. However there are some scenarios where you might want to send messages to more than one channel:
+ +If you’re using the Notify API these scenarios could be automated.
+ +Replies to emails that you’ve sent will go directly to the reply-to address that you have set up for your service.
+ +If you’re set up to receive text messages then your users can reply to messages you’ve sent, or can start an interaction by sending you a text message.
+ +Receiving inbound text messages can allow your service users to:
+ +You’ve then got the option to automate the processing of the messages you receive, or to view them in Notify.
+ +If you automate the processing of text messages you receive, then you should have a manual process in place to deal with messages that can’t be automatically processed.
+ +If you’d like your service to receive text messages, then let us know.
+ +Our delivery states are:
+ +All messages start in the ‘Sending’ state.
+ +This means that we have accepted the message. It’s waiting in a queue to be sent to our email or text message delivery partners.
+ +This means the message is in the person’s email inbox or on their phone.
+ +We can’t tell you if they’ve read it – to do so would require invasive and unreliable tracking techniques.
+ +You’re still billed for text messages to non-existant phone numbers.
+ +You need to remove these email addresses or phone numbers from your database.
+ + + +This can happen for a number of reasons, eg the user’s inbox was full.
+ +You can choose to retry these messages later or not.
+ +This means the user’s phone was full or hasn’t been switched on in the last 72 hours.
+ +You’re still billed for these messages.
+ +You can choose to retry these messages later or not.
+ +This means there is a problem with the connection between Notify and our email or text message delivery partners.
+ +Messages still being retried are marked as ’Sending’. We mark messages as ‘Technical failure’ once we’ve given up.
+ +You won’t be billed for these messages.
+ +You need to retry these messages yourself later.
+ +