From bd22aa7189b45da5e5e46e3eabda4d5e823f8047 Mon Sep 17 00:00:00 2001 From: Henry Hadlow Date: Mon, 9 May 2016 16:18:13 +0100 Subject: [PATCH 1/6] Add Delivery and failure Help page --- app/main/views/index.py | 5 ++ app/templates/admin_template.html | 3 +- app/templates/views/delivery-and-failure.html | 73 +++++++++++++++++++ 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 app/templates/views/delivery-and-failure.html diff --git a/app/main/views/index.py b/app/main/views/index.py index 0aad99e2a..d3b9fae03 100644 --- a/app/main/views/index.py +++ b/app/main/views/index.py @@ -41,6 +41,11 @@ def terms(): return render_template('views/terms-of-use.html') +@main.route('/delivery-and-failure') +def delivery_and_failure(): + return render_template('views/delivery-and-failure.html') + + @main.route('/documentation') def documentation(): curr_dir = os.path.dirname(os.path.realpath(__file__)) diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 0c84a250e..2e68eb492 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -85,9 +85,10 @@

Help

diff --git a/app/templates/views/delivery-and-failure.html b/app/templates/views/delivery-and-failure.html new file mode 100644 index 000000000..7b3cc3f94 --- /dev/null +++ b/app/templates/views/delivery-and-failure.html @@ -0,0 +1,73 @@ +{% extends "withoutnav_template.html" %} + +{% block page_title %} +Delivery and failure – GOV.UK Notify +{% endblock %} + +{% block maincolumn_content %} + +
+
+ +

+ Message delivery and failure +

+ +

Delivery and failure

+ +

Our delivery states are:

+ + + +

Our delivery states are the same for both email and text message.

+ +

Sending

+ +

All new messages start with the state ‘Sending’.

+ +

If we can’t deliver a message straight away, we’ll keep trying for up to 24 hours.

+ +

Delivered

+ +

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.

+ +

Permanent failure

+ +

This means the email address or mobile number doesn’t exist or is blacklisted – also known as a ‘hard bounce’.

+ +

You’re still billed for these text messages.

+ +

You need to remove this email address or mobile number from your database.

+ +

Temporary failure

+ +

This means the email address or mobile number was full, or the mobile phone was switched off – also known as a ‘soft bounce’.

+ +

We’ll retry emails for up to 15 minutes and text message for up to 24 hours. Messages still being retried are marked as ’Sending’. We mark messages as ‘Temporary failure’ once we’ve given up.

+ +

You’re still billed for these messages.

+ +

You can choose to retry this message later or not.

+ +

Technical failure

+ +

This means there is a problem with the connection between Notify and our email or text message delivery partners.

+ +

We’ll try to send these messages for up to 24 hours. Messages still being retried are marked as ’Sending’. We mark messages as ‘Temporary failure’ once we’ve given up.

+ +

You won’t be billed for these messages.

+ +

You need to retry this message yourself later.

+ +
+
+ +{% endblock %} From 66415b1cbe1b9e5589eb9653950b692b8a0adf8e Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Fri, 20 May 2016 14:52:55 +0100 Subject: [PATCH 2/6] Updated the states for failure names --- app/templates/views/delivery-and-failure.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/templates/views/delivery-and-failure.html b/app/templates/views/delivery-and-failure.html index 7b3cc3f94..234d54ea6 100644 --- a/app/templates/views/delivery-and-failure.html +++ b/app/templates/views/delivery-and-failure.html @@ -20,8 +20,8 @@ Delivery and failure – GOV.UK Notify @@ -31,7 +31,7 @@ Delivery and failure – GOV.UK Notify

All new messages start with the state ‘Sending’.

-

If we can’t deliver a message straight away, we’ll keep trying for up to 24 hours.

+

If we can’t deliver a message straight away, we’ll keep trying for up to 72 hours.

Delivered

@@ -39,7 +39,7 @@ Delivery and failure – GOV.UK Notify

We can’t tell you if they’ve read it – to do so would require invasive and unreliable tracking techniques.

-

Permanent failure

+

Failured parmanently

This means the email address or mobile number doesn’t exist or is blacklisted – also known as a ‘hard bounce’.

@@ -47,11 +47,11 @@ Delivery and failure – GOV.UK Notify

You need to remove this email address or mobile number from your database.

-

Temporary failure

+

Failed temporarily

This means the email address or mobile number was full, or the mobile phone was switched off – also known as a ‘soft bounce’.

-

We’ll retry emails for up to 15 minutes and text message for up to 24 hours. Messages still being retried are marked as ’Sending’. We mark messages as ‘Temporary failure’ once we’ve given up.

+

We’ll retry emails for up to 15 minutes and text message for up to 72 hours. Messages still being retried are marked as ’Sending’. We mark messages as ‘Failed temporarily’ once we’ve given up.

You’re still billed for these messages.

@@ -61,7 +61,7 @@ Delivery and failure – GOV.UK Notify

This means there is a problem with the connection between Notify and our email or text message delivery partners.

-

We’ll try to send these messages for up to 24 hours. Messages still being retried are marked as ’Sending’. We mark messages as ‘Temporary failure’ once we’ve given up.

+

We’ll try to send these messages for up to 72 hours. Messages still being retried are marked as ’Sending’. We mark messages as ‘Temporary failure’ once we’ve given up.

You won’t be billed for these messages.

From 9c78b2c6dbd4dee955f450ab960937754180582f Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Mon, 23 May 2016 09:36:57 +0100 Subject: [PATCH 3/6] Add classes for headings and lists --- app/templates/views/delivery-and-failure.html | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/app/templates/views/delivery-and-failure.html b/app/templates/views/delivery-and-failure.html index 234d54ea6..b5350363d 100644 --- a/app/templates/views/delivery-and-failure.html +++ b/app/templates/views/delivery-and-failure.html @@ -9,15 +9,11 @@ Delivery and failure – GOV.UK Notify
-

- Message delivery and failure -

- -

Delivery and failure

+

Delivery and failure

Our delivery states are:

-
    +
    • Sending
    • Delivered
    • Failed permanently
      • @@ -27,19 +23,19 @@ Delivery and failure – GOV.UK Notify

      Our delivery states are the same for both email and text message.

      -

      Sending

      +

      Sending

      All new messages start with the state ‘Sending’.

      If we can’t deliver a message straight away, we’ll keep trying for up to 72 hours.

      -

      Delivered

      +

      Delivered

      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.

      -

      Failured parmanently

      +

      Failured parmanently

      This means the email address or mobile number doesn’t exist or is blacklisted – also known as a ‘hard bounce’.

      @@ -47,7 +43,7 @@ Delivery and failure – GOV.UK Notify

      You need to remove this email address or mobile number from your database.

      -

      Failed temporarily

      +

      Failed temporarily

      This means the email address or mobile number was full, or the mobile phone was switched off – also known as a ‘soft bounce’.

      @@ -57,7 +53,7 @@ Delivery and failure – GOV.UK Notify

      You can choose to retry this message later or not.

      -

      Technical failure

      +

      Technical failure

      This means there is a problem with the connection between Notify and our email or text message delivery partners.

      From bca31a7e023034a57eb93a49c27ada0e8940682f Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Mon, 23 May 2016 09:37:26 +0100 Subject: [PATCH 4/6] Fix typo --- app/templates/views/delivery-and-failure.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/delivery-and-failure.html b/app/templates/views/delivery-and-failure.html index b5350363d..b46d8a326 100644 --- a/app/templates/views/delivery-and-failure.html +++ b/app/templates/views/delivery-and-failure.html @@ -35,7 +35,7 @@ Delivery and failure – GOV.UK Notify

      We can’t tell you if they’ve read it – to do so would require invasive and unreliable tracking techniques.

      -

      Failured parmanently

      +

      Failured permanently

      This means the email address or mobile number doesn’t exist or is blacklisted – also known as a ‘hard bounce’.

      From 048166b6a432c8dd0a02e5d08fcd399d32c20f00 Mon Sep 17 00:00:00 2001 From: Rebecca Law Date: Mon, 23 May 2016 10:18:07 +0100 Subject: [PATCH 5/6] Update failure label to the words used on the activity page. We are not retrying message for 72 hours, so I removed that. The changes should be reviewed by someone. --- app/templates/views/delivery-and-failure.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/templates/views/delivery-and-failure.html b/app/templates/views/delivery-and-failure.html index b46d8a326..df8a98db7 100644 --- a/app/templates/views/delivery-and-failure.html +++ b/app/templates/views/delivery-and-failure.html @@ -16,8 +16,8 @@ Delivery and failure – GOV.UK Notify @@ -27,7 +27,7 @@ Delivery and failure – GOV.UK Notify

      All new messages start with the state ‘Sending’.

      -

      If we can’t deliver a message straight away, we’ll keep trying for up to 72 hours.

      +

      This means that we have accepted the message, the message is waiting in a queue to be sent to the client provider.

      Delivered

      @@ -35,7 +35,7 @@ Delivery and failure – GOV.UK Notify

      We can’t tell you if they’ve read it – to do so would require invasive and unreliable tracking techniques.

      -

      Failured permanently

      +

      Permanently failed

      This means the email address or mobile number doesn’t exist or is blacklisted – also known as a ‘hard bounce’.

      @@ -43,11 +43,11 @@ Delivery and failure – GOV.UK Notify

      You need to remove this email address or mobile number from your database.

      -

      Failed temporarily

      +

      Temporarily failed

      This means the email address or mobile number was full, or the mobile phone was switched off – also known as a ‘soft bounce’.

      -

      We’ll retry emails for up to 15 minutes and text message for up to 72 hours. Messages still being retried are marked as ’Sending’. We mark messages as ‘Failed temporarily’ once we’ve given up.

      +

      We mark messages as ‘Temporarily failed’.

      You’re still billed for these messages.

      @@ -57,7 +57,7 @@ Delivery and failure – GOV.UK Notify

      This means there is a problem with the connection between Notify and our email or text message delivery partners.

      -

      We’ll try to send these messages for up to 72 hours. Messages still being retried are marked as ’Sending’. We mark messages as ‘Temporary failure’ once we’ve given up.

      +

      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.

      From c22abad84e5ca8bcd9b0d0e9b71200ee250cfcb7 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Tue, 24 May 2016 15:59:16 +0100 Subject: [PATCH 6/6] Updated wording around 'client providers' --- app/templates/views/delivery-and-failure.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/views/delivery-and-failure.html b/app/templates/views/delivery-and-failure.html index df8a98db7..eb409e73f 100644 --- a/app/templates/views/delivery-and-failure.html +++ b/app/templates/views/delivery-and-failure.html @@ -27,7 +27,7 @@ Delivery and failure – GOV.UK Notify

      All new messages start with the state ‘Sending’.

      -

      This means that we have accepted the message, the message is waiting in a queue to be sent to the client provider.

      +

      This means that we have accepted the message, the message is waiting in a queue to be sent to our email or text message delivery partners.

      Delivered