From 6a49e5bcbdd7e70c60c670c0845a0fc8737d9390 Mon Sep 17 00:00:00 2001
From: Katie Smith <katie.smith@digital.cabinet-office.gov.uk>
Date: Fri, 12 Jun 2020 14:28:18 +0100
Subject: [PATCH] Add international letter rates to pricing page

This also updates a few pages where we listed the minimum and maximum
letter price.
---
 app/templates/views/features/letters.html     |  2 +-
 app/templates/views/pricing/index.html        | 36 ++++++++++---------
 .../views/service-settings/set-letter.html    |  2 +-
 tests/app/main/views/test_service_settings.py |  4 +--
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/app/templates/views/features/letters.html b/app/templates/views/features/letters.html
index 0cbd704c4..7ce9800e7 100644
--- a/app/templates/views/features/letters.html
+++ b/app/templates/views/features/letters.html
@@ -36,7 +36,7 @@
   <p class="govuk-body">Read our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.documentation') }}">documentation</a>.</p>
 
   <h2 class="heading heading-medium">Pricing</h2>
-  <p class="govuk-body">It costs between 35p and 81p (plus VAT) to send a letter. Prices include:</p>
+  <p class="govuk-body">It costs between 35p and £1.16 (plus VAT) to send a letter. Prices include:</p>
   <ul class="list list-bullet">
      <li>paper</li>
      <li>double-sided colour printing</li>
diff --git a/app/templates/views/pricing/index.html b/app/templates/views/pricing/index.html
index 5db0cc6ab..601bf938b 100644
--- a/app/templates/views/pricing/index.html
+++ b/app/templates/views/pricing/index.html
@@ -193,24 +193,33 @@
   <h2 class="heading-medium" id="letters">Letters</h2>
   <p class="govuk-body">The cost of sending a letter depends on the postage you choose and how many sheets of paper you need.</p>
 
+  <p class="govuk-body">Prices include:</p>
+  <ul class="list list-bullet">
+     <li>paper</li>
+     <li>postage</li>
+     <li>double-sided colour printing</li>
+     <li>C5 size envelopes with an address window</li>
+  </ul>
+
   <div>
     {% call mapping_table(
       caption='Letter pricing',
-      field_headings=['Paper', 'Second class', 'First class'],
+      field_headings=['Paper', 'Second class', 'First class', 'International'],
       field_headings_visible=True,
       caption_visible=False
     ) %}
-      {% for sheets, second, first in [
-        ('1 sheet', '35', '61'),
-        ('2 sheets', '40', '66'),
-        ('3 sheets', '45', '71'),
-        ('4 sheets', '50', '76'),
-        ('5 sheets', '55', '81'),
+      {% for sheets, second, first, international in [
+        ('1 sheet', '35p', '61p', '84p'),
+        ('2 sheets', '40p', '66p', '92p'),
+        ('3 sheets', '45p', '71p', '£1'),
+        ('4 sheets', '50p', '76p', '£1.08'),
+        ('5 sheets', '55p', '81p', '£1.16'),
       ] %}
         {% call row() %}
-          {% call row_heading() %} {{ sheets }} (double-sided) {% endcall %}
-          {{ text_field(second + 'p + VAT') }}
-          {{ text_field(first + 'p + VAT') }}
+          {% call row_heading() %} {{ sheets }} {% endcall %}
+          {{ text_field(second + ' + VAT') }}
+          {{ text_field(first + ' + VAT') }}
+          {{ text_field(international + ' + VAT') }}
         {% endcall %}
       {% endfor %}
     {% endcall %}
@@ -218,12 +227,5 @@
   <div class="panel panel-border-wide">
     <p class="govuk-body">These prices were updated on 1 October 2019.</p>
   </div>
-  <p class="govuk-body">Prices include:</p>
-  <ul class="list list-bullet">
-     <li>paper</li>
-     <li>double-sided colour printing</li>
-     <li>C5 size envelopes with an address window</li>
-     <li>first or second class postage</li>
-  </ul>
 
 {% endblock %}
diff --git a/app/templates/views/service-settings/set-letter.html b/app/templates/views/service-settings/set-letter.html
index 704e3c7a6..a89a54e6c 100644
--- a/app/templates/views/service-settings/set-letter.html
+++ b/app/templates/views/service-settings/set-letter.html
@@ -17,7 +17,7 @@
         back_link=url_for('main.service_settings', service_id=current_service.id)
       ) }}
       <p class="govuk-body">
-        It costs between 35p and 81p to send a letter using Notify.
+        It costs between 35p and £1.16 to send a letter using Notify.
       </p>
       <p class="govuk-body">
         See <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for(".pricing", _anchor="letters") }}">pricing</a> for the list
diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py
index d7a1b3da3..b70c4158f 100644
--- a/tests/app/main/views/test_service_settings.py
+++ b/tests/app/main/views/test_service_settings.py
@@ -3674,7 +3674,7 @@ def test_unknown_channel_404s(
 ), [
     (
         'letter',
-        'It costs between 35p and 81p to send a letter using Notify.',
+        'It costs between 35p and £1.16 to send a letter using Notify.',
         'Send letters',
         ['email', 'sms'],
         'False',
@@ -3683,7 +3683,7 @@ def test_unknown_channel_404s(
     ),
     (
         'letter',
-        'It costs between 35p and 81p to send a letter using Notify.',
+        'It costs between 35p and £1.16 to send a letter using Notify.',
         'Send letters',
         ['email', 'sms', 'letter'],
         'True',