mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-23 15:57:23 -04:00
Merge pull request #3989 from alphagov/update-pricing-pages
Add a billing details page
This commit is contained in:
Leo Hemsted
@@ -225,6 +225,10 @@
|
||||
{
|
||||
"href": url_for("main.how_to_pay"),
|
||||
"text": "How to pay"
|
||||
},
|
||||
{
|
||||
"href": url_for("main.billing_details"),
|
||||
"text": "Billing details"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
{% macro api_key(key, name, thing="API key") %}
|
||||
{% if name|lower == thing|lower %}
|
||||
<h2 class="api-key__name">
|
||||
{{ name }}
|
||||
</h2>
|
||||
{% endif %}
|
||||
<div data-module="api-key" data-key="{{ key }}" data-thing="{{ thing }}" data-name="{{ name }}">
|
||||
<span class="api-key__key">
|
||||
{% if name|lower != thing|lower %}<span class="govuk-visually-hidden">{{ thing }}: </span>{% endif %}{{ key }}
|
||||
</span>
|
||||
<span class="api-key__notice" aria-live="assertive"></span>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
13
app/templates/components/copy-to-clipboard.html
Normal file
13
app/templates/components/copy-to-clipboard.html
Normal file
@@ -0,0 +1,13 @@
|
||||
{% macro copy_to_clipboard(value, name, thing) %}
|
||||
{% if name|lower == thing|lower %}
|
||||
<h2 class="copy-to-clipboard__name">
|
||||
{{ name }}
|
||||
</h2>
|
||||
{% endif %}
|
||||
<div data-module="copy-to-clipboard" data-value="{{ value }}" data-thing="{{ thing }}" data-name="{{ name }}">
|
||||
<span class="copy-to-clipboard__value">
|
||||
{% if name|lower != thing|lower %}<span class="govuk-visually-hidden">{{ thing }}: </span>{% endif %}{{ value }}
|
||||
</span>
|
||||
<span class="copy-to-clipboard__notice" aria-live="assertive"></span>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
@@ -1,6 +1,6 @@
|
||||
{% extends "withnav_template.html" %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
{% from "components/api-key.html" import api_key %}
|
||||
{% from "components/copy-to-clipboard.html" import copy_to_clipboard %}
|
||||
|
||||
{% block service_page_title %}
|
||||
New API key
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
<div class="bottom-gutter-2">
|
||||
|
||||
{{ api_key(
|
||||
{{ copy_to_clipboard(
|
||||
'{}-{}-{}'.format(key_name, service_id, secret),
|
||||
name='API key',
|
||||
thing='API key'
|
||||
|
||||
26
app/templates/views/pricing/billing-details-signed-out.html
Normal file
26
app/templates/views/pricing/billing-details-signed-out.html
Normal file
@@ -0,0 +1,26 @@
|
||||
{% extends "content_template.html" %}
|
||||
{% from "components/page-header.html" import page_header %}
|
||||
|
||||
{% block per_page_title %}
|
||||
Billing details
|
||||
{% endblock %}
|
||||
|
||||
{% block content_column_content %}
|
||||
|
||||
{{ page_header('Billing details') }}
|
||||
|
||||
<p class="govuk-body">
|
||||
<a class="govuk-link" href="{{ url_for('.sign_in', next=url_for('.billing_details')) }}">Sign in</a> to see our:
|
||||
</p>
|
||||
|
||||
<ul class="govuk-list govuk-list--bullet">
|
||||
<li>supplier details</li>
|
||||
<li>bank details</li>
|
||||
<li>invoice address</li>
|
||||
</ul>
|
||||
|
||||
<p class="govuk-body">
|
||||
You can use this information to add the Cabinet Office as a supplier. Your organisation may need to do this before you can raise a purchase order.
|
||||
</p>
|
||||
|
||||
{% endblock %}
|
||||
138
app/templates/views/pricing/billing-details.html
Normal file
138
app/templates/views/pricing/billing-details.html
Normal file
@@ -0,0 +1,138 @@
|
||||
{% extends "content_template.html" %}
|
||||
{% from "components/page-header.html" import page_header %}
|
||||
|
||||
{% from "components/copy-to-clipboard.html" import copy_to_clipboard %}
|
||||
|
||||
{% block per_page_title %}
|
||||
Billing details
|
||||
{% endblock %}
|
||||
|
||||
{% block content_column_content %}
|
||||
|
||||
{{ page_header('Billing details') }}
|
||||
|
||||
<p class="govuk-body">
|
||||
You can use the information on this page to add the Cabinet Office as a supplier. Your organisation may need to do this before you can raise a purchase order (PO).
|
||||
</p>
|
||||
|
||||
<p class="govuk-body">
|
||||
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.support') }}">Contact us</a> if you need any other details.
|
||||
</p>
|
||||
|
||||
<h2 class="heading-medium govuk-!-margin-top-7">
|
||||
Supplier details
|
||||
</h2>
|
||||
|
||||
<p class="govuk-body">
|
||||
Cabinet Office
|
||||
</p>
|
||||
|
||||
<p class="govuk-body">
|
||||
The White Chapel Building <br>
|
||||
10 Whitechapel High Street <br>
|
||||
London <br>
|
||||
E1 8QS
|
||||
</p>
|
||||
|
||||
<h3 class="heading-small">
|
||||
Email addresses
|
||||
</h3>
|
||||
|
||||
<ul class="govuk-list govuk-list--bullet">
|
||||
{% for email in billing_details['notify_billing_email_addresses'] %}
|
||||
<li>
|
||||
{{ email }}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<h3 class="heading-small">
|
||||
<abbr title="Value Added Tax">VAT</abbr> number
|
||||
</h3>
|
||||
|
||||
<div class="govuk-!-margin-bottom-4">
|
||||
{{ copy_to_clipboard(
|
||||
'GB 88 88 010 80',
|
||||
thing='<abbr title="Value Added Tax">VAT</abbr> number',
|
||||
) }}
|
||||
</div>
|
||||
|
||||
<h2 class="heading-medium govuk-!-margin-top-7">
|
||||
Bank details
|
||||
</h2>
|
||||
|
||||
<p class="govuk-body">
|
||||
National Westminster Bank PLC (part of RBS group) <br>
|
||||
Government Banking Services Branch <br>
|
||||
2nd Floor <br>
|
||||
280 Bishopsgate <br>
|
||||
London <br>
|
||||
EC2M 4RB
|
||||
</p>
|
||||
|
||||
<h3 class="heading-small">
|
||||
Account name
|
||||
</h3>
|
||||
|
||||
<p class="govuk-body">
|
||||
Cabinet Office
|
||||
</p>
|
||||
|
||||
<h3 class="heading-small">
|
||||
Account number
|
||||
</h3>
|
||||
|
||||
<div class="govuk-!-margin-bottom-4">
|
||||
{{ copy_to_clipboard(
|
||||
billing_details['account_number'],
|
||||
thing='account number',
|
||||
) }}
|
||||
</div>
|
||||
|
||||
<h3 class="heading-small">
|
||||
Sort code
|
||||
</h3>
|
||||
|
||||
<div class="govuk-!-margin-bottom-4">
|
||||
{{ copy_to_clipboard(
|
||||
billing_details['sort_code'],
|
||||
thing='sort code',
|
||||
) }}
|
||||
</div>
|
||||
|
||||
|
||||
<h3 class="heading-small">
|
||||
<abbr title="International Bank Account Number">IBAN</abbr>
|
||||
</h3>
|
||||
<div class="govuk-!-margin-bottom-4">
|
||||
{{ copy_to_clipboard(
|
||||
billing_details['IBAN'],
|
||||
thing='IBAN',
|
||||
) }}
|
||||
</div>
|
||||
|
||||
<h3 class="heading-small">
|
||||
Swift code
|
||||
</h3>
|
||||
|
||||
<div class="govuk-!-margin-bottom-4">
|
||||
{{ copy_to_clipboard(
|
||||
billing_details['swift'],
|
||||
thing='Swift code',
|
||||
) }}
|
||||
</div>
|
||||
|
||||
<h2 class="heading-medium govuk-!-margin-top-7">
|
||||
Invoice address
|
||||
</h2>
|
||||
|
||||
<p class="govuk-body">
|
||||
SSCL – Accounts Receivable <br>
|
||||
PO Box 221 <br>
|
||||
Thornton-Cleveleys <br>
|
||||
Blackpool <br>
|
||||
Lancashire <br>
|
||||
FY1 9JN
|
||||
</p>
|
||||
|
||||
{% endblock %}
|
||||
@@ -14,7 +14,11 @@
|
||||
</h2>
|
||||
|
||||
<p class="govuk-body">
|
||||
We’ll send your organisation an invoice each quarter if you:
|
||||
GOV.UK Notify is run by the Government Digital Service (GDS), part of the Cabinet Office.
|
||||
</p>
|
||||
|
||||
<p class="govuk-body">
|
||||
The Cabinet Office will send your organisation an invoice each quarter if you:
|
||||
</p>
|
||||
|
||||
<ul class="list list-bullet">
|
||||
@@ -23,35 +27,39 @@
|
||||
</ul>
|
||||
|
||||
<p class="govuk-body">
|
||||
If your organisation has more than one service, you'll see a breakdown of each service on your invoice.
|
||||
If your organisation has more than one Notify service, you’ll see a breakdown of each service on your invoice.
|
||||
</p>
|
||||
|
||||
<p class="govuk-body">
|
||||
If the value of an invoice is less than £250 (before <abbr title="Value Added Tax">VAT</abbr>), we’ll add it to the total for the next quarter to save time and effort.
|
||||
If the value of an invoice is less than £250 (before <abbr title="Value Added Tax">VAT</abbr>), it will be added to the total for the next quarter to save time and effort.
|
||||
</p>
|
||||
|
||||
<p class="govuk-body">
|
||||
You can pay by BACS, debit card, or credit card.
|
||||
</p>
|
||||
|
||||
<p class="govuk-body">
|
||||
Please start your payment reference with the invoice number.
|
||||
</p>
|
||||
|
||||
<h2 class="heading-medium" id="purchase-orders">
|
||||
Purchase orders
|
||||
</h2>
|
||||
|
||||
<p class="govuk-body">
|
||||
If your organisation’s estimated spend is more than £500 per quarter (before <abbr title="Value Added Tax">VAT</abbr>), you need to send us a purchase order (PO).
|
||||
If your organisation’s total estimated spend is more than £500 per quarter (before <abbr title="Value Added Tax">VAT</abbr>), you need to raise a purchase order (PO).
|
||||
</p>
|
||||
|
||||
<p class="govuk-body">
|
||||
Your organisation should raise a single <abbr title="purchase order">PO</abbr> for the estimated cost of all its services. You can update the PO anytime if your usage increases.
|
||||
Your organisation should raise a single <abbr title="purchase order">PO</abbr> for the estimated cost of all its services. You can update the <abbr title="purchase order">PO</abbr> any time if your usage increases.
|
||||
</p>
|
||||
|
||||
<p class="govuk-body">
|
||||
You may need to set up the Cabinet Office as a supplier before you can raise a <abbr title="purchase order">PO</abbr>.
|
||||
Your organisation may need to <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.billing_details') }}">add the Cabinet Office as a supplier</a> before you can raise a <abbr title="purchase order">PO</abbr>.
|
||||
</p>
|
||||
|
||||
<p class="govuk-body">
|
||||
<a class="govuk-link govuk-link--no-visited-state" href="{{ support_link }}">Contact us</a> if you need help raising a purchase order.
|
||||
<a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('main.support') }}">Contact us</a> if you need help raising a purchase order.
|
||||
</p>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{% extends "withnav_template.html" %}
|
||||
{% from "components/api-key.html" import api_key %}
|
||||
{% from "components/copy-to-clipboard.html" import copy_to_clipboard %}
|
||||
{% from "components/page-header.html" import page_header %}
|
||||
{% from "components/table.html" import row_group, row, text_field, edit_field, field, boolean_field, list_table with context %}
|
||||
{% from "components/button/macro.njk" import govukButton %}
|
||||
@@ -46,7 +46,7 @@
|
||||
<div class="govuk-grid-row">
|
||||
<div class="govuk-grid-column-full">
|
||||
{% if current_service.count_email_reply_to_addresses > 1 %}
|
||||
{{ api_key(item.id, name=item.email_address, thing="ID") }}
|
||||
{{ copy_to_clipboard(item.id, name=item.email_address, thing="ID") }}
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{% extends "withnav_template.html" %}
|
||||
{% from "components/api-key.html" import api_key %}
|
||||
{% from "components/copy-to-clipboard.html" import copy_to_clipboard %}
|
||||
{% from "components/page-header.html" import page_header %}
|
||||
{% from "components/table.html" import row_group, row, text_field, edit_field, field, boolean_field, list_table with context %}
|
||||
{% from "components/button/macro.njk" import govukButton %}
|
||||
@@ -59,7 +59,7 @@
|
||||
</div>
|
||||
{% if letter_contact_details|length > 1 %}
|
||||
{% set first_line_of_contact_block = item.contact_block|normalise_lines|first %}
|
||||
{{ api_key(item.id, name=first_line_of_contact_block, thing="ID") }}
|
||||
{{ copy_to_clipboard(item.id, name=first_line_of_contact_block, thing="ID") }}
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{% extends "withnav_template.html" %}
|
||||
{% from "components/api-key.html" import api_key %}
|
||||
{% from "components/copy-to-clipboard.html" import copy_to_clipboard %}
|
||||
{% from "components/page-header.html" import page_header %}
|
||||
{% from "components/table.html" import row_group, row, text_field, edit_field, field, boolean_field, list_table with context%}
|
||||
{% from "components/button/macro.njk" import govukButton %}
|
||||
@@ -46,7 +46,7 @@
|
||||
</div>
|
||||
</div>
|
||||
{% if current_service.count_sms_senders > 1 %}
|
||||
{{ api_key(item.id, name=item.sms_sender, thing="ID") }}
|
||||
{{ copy_to_clipboard(item.id, name=item.sms_sender, thing="ID") }}
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{% from "components/banner.html" import banner_wrapper %}
|
||||
{% from "components/folder-path.html" import folder_path, page_title_folder_path %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
{% from "components/api-key.html" import api_key %}
|
||||
{% from "components/copy-to-clipboard.html" import copy_to_clipboard %}
|
||||
{% from "components/button/macro.njk" import govukButton %}
|
||||
|
||||
{% block service_page_title %}
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
{% if template.template_type != 'broadcast' %}
|
||||
<div class="bottom-gutter-1-2">
|
||||
{{ api_key(template.id, name="Template ID", thing='template ID') }}
|
||||
{{ copy_to_clipboard(template.id, name="Template ID", thing='template ID') }}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user