darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-06 06:31:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3564 from alphagov/int-letters-content

Browse Source 
Add international letter rates to pricing page
This commit is contained in:
Rebecca Law
2020-09-07 08:13:43 +01:00
committed by GitHub
parent 3bebb1fbfd f775e18361
commit 0f64d4d136
4 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/templates/views/features/letters.html
View File

@@ -35,8 +35,12 @@
<p class="govuk-body">You can create reusable letter templates in Notify, or upload and send your own letters with the Notify API.</p>
<p class="govuk-body">Read our <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('.documentation') }}">documentation</a>.</p>
<h3 class="heading heading-small" id="international-letters">International letters</h3>
<p class="govuk-body">Notify checks for international addresses and will automatically charge you the correct postage.</p>
<p class="govuk-body">Letters to Europe are delivered 3 to 5 days after they’re dispatched. Letters sent anywhere else in the world take 5 to 7 days to arrive.</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>

38
app/templates/views/pricing/index.html
View File

@@ -193,37 +193,39 @@
<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 %}
</div>
<div class="panel panel-border-wide">
<p class="govuk-body">These prices were updated on 1 October 2019.</p>
<p class="govuk-body">These prices were updated on 7 September 2020.</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 %}

2
app/templates/views/service-settings/set-letter.html
View File

@@ -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

4
tests/app/main/views/test_service_settings.py
View File

@@ -3675,7 +3675,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',
@@ -3684,7 +3684,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',