Commit Graph

6211 Commits

Author SHA1 Message Date
Chris Hill-Scott
52cc41b8a8 Bump utils to 30.5.2 2018-10-05 13:32:11 +01:00
Katie Smith
23e00a2e98 Merge pull request #2349 from alphagov/display-postage-on-usage-page
Display postage on usage page
2018-10-04 14:37:18 +01:00
Chris Hill-Scott
02665dbf66 Merge pull request #2350 from alphagov/hackney.gov.uk
Mark agreement signed by Hackney Council
2018-10-04 12:02:52 +01:00
Chris Hill-Scott
8b07e9f1c7 Mark agreement signed by Hackney Council 2018-10-04 11:57:54 +01:00
Katie Smith
0d842d3700 Pluralize notification type correctly on usage page
This change makes sure that we display '1 letter' instead of '1 letters',
and '1 text message' instead of '1 text messages' on the usage page.
2018-10-03 15:15:19 +01:00
Katie Smith
4188c0297d Display letter postage on the usage page
The monthly letter cost was already broken down by price on the usage
page, but this change adds postage details to the usage page too.
2018-10-03 13:20:44 +01:00
Katie Smith
b1f2b1bc0f Update billing mocks and get_sum_billing_units function
Updated the 'get_sum_billing_units' function to no longer multiply the
billing units by the rate multiplier. The billing_units that come from
notifications-api already consist of the billable_units * rate_multiplier.
The rate_multiplier is also not returned from the api response anymore.

Also updated the billing mocks since these were not mocking the right fields in
the JSON responses from the API billing endpoints, and added the new
'postage' field which will get returned from the monthly-usage endpoint
in notifications-api.
2018-10-03 12:05:49 +01:00
Chris Hill-Scott
99d7da87c7 Merge pull request #2348 from alphagov/acas.org.uk
Add ACAS to list of domains
2018-10-03 10:39:42 +01:00
Chris Hill-Scott
bed0ef6912 Add ACAS to list of domains 2018-10-03 10:25:20 +01:00
Rebecca Law
93e7f92135 Merge pull request #2344 from alphagov/fix-set-inbound-number
Fix page with missing import and added unit test.
2018-10-02 13:56:00 +01:00
Rebecca Law
2ac5926529 Fix page with missing import and added unit test. 2018-10-02 13:44:55 +01:00
Chris Hill-Scott
1e766fd5e1 Merge pull request #2343 from alphagov/email-branding-page-title
Fix missing page title on email branding page
2018-10-01 16:14:17 +01:00
Chris Hill-Scott
17ba832123 Merge pull request #2342 from alphagov/preview-all-letter-pages
Show all pages of a letter on the preview page
2018-10-01 16:14:07 +01:00
Chris Hill-Scott
fde444a37a Fix missing page title on email branding page
It’s not a service-specific page so trying to set the service-specific page title does nothing.
2018-10-01 16:08:14 +01:00
Chris Hill-Scott
0f84ed40e9 Show all pages of a letter on the preview page
We’ve had a support ticket saying:
> Hi, where a letter goes over to two sides, is there a way in the
> 'Preview' screen (or anywhere else) that I can see page two? I can
> see page one OK, but can't work out how to see what's generated on the
> second page.

Whether you’re about to send 1000s of letters – or just want to preview
how one will look – it’s probably useful to be able to see more than
just the first page.
2018-10-01 16:03:06 +01:00
Chris Hill-Scott
88d9ac7290 Merge pull request #2341 from alphagov/medway.gov.uk
Mark agreement signed by Medway Council
2018-10-01 15:21:09 +01:00
Chris Hill-Scott
08b665b2bd Mark agreement signed by Medway Council 2018-10-01 15:10:42 +01:00
Leo Hemsted
5179bdbdef Merge pull request #2338 from alphagov/expected-letter-rate
1st class expected letter delivery
2018-10-01 14:20:36 +01:00
Chris Hill-Scott
351a3dc4f3 Merge pull request #2314 from alphagov/validate-rtgl
Don’t trigger HTML5 validation on any form
2018-10-01 14:18:16 +01:00
Chris Hill-Scott
c698aa3d21 Merge pull request #2337 from alphagov/pyup-update-pytest-xdist-1.23.1-to-1.23.2
Update pytest-xdist to 1.23.2
2018-10-01 11:28:49 +01:00
Chris Hill-Scott
abac89ca2f Merge pull request #2329 from alphagov/remove-table-options
Remove redundant variable definition
2018-10-01 11:28:42 +01:00
Leo Hemsted
432f1286fe update notifications page to take into account first class! 2018-10-01 11:07:35 +01:00
Leo Hemsted
efab189ae8 update jobs to take into account first class 2018-10-01 11:07:33 +01:00
Leo Hemsted
32f39475d2 remove dupe of get_letter_timings
it was moved from admin to utils a while ago
2018-09-28 15:02:32 +01:00
pyup-bot
8371b7269f Update pytest-xdist from 1.23.1 to 1.23.2 2018-09-28 11:50:19 +01:00
Chris Hill-Scott
ca75c9370a Merge pull request #2335 from alphagov/pyup-update-coveralls-1.5.0-to-1.5.1
Update coveralls to 1.5.1
2018-09-28 09:45:17 +01:00
Chris Hill-Scott
2e2d282f51 Merge pull request #2333 from alphagov/remove-pytest-deprecations
Stop calling `fake_uuid` fixture directly
2018-09-28 09:45:01 +01:00
Chris Hill-Scott
43dd3c9518 Merge pull request #2336 from alphagov/royalgreenwich.gov.uk
Add domain for Greenwich council
2018-09-28 09:44:49 +01:00
Chris Hill-Scott
d34fed7612 Add domain for Greenwich council
Not sure why they weren’t in here…
2018-09-28 09:29:01 +01:00
pyup-bot
98162741aa Update coveralls from 1.5.0 to 1.5.1 2018-09-28 06:34:16 +01:00
Rebecca Law
0591d3e667 Merge pull request #2334 from alphagov/fix-download-bug
Fix download csv to use the service data retention if it exists.
2018-09-27 16:07:17 +01:00
Rebecca Law
7b9df8de29 Fix download csv to use the service data retention if it exists. 2018-09-27 14:51:36 +01:00
Tom Byers
5c143b6ec3 Merge pull request #2331 from alphagov/bump-utils
Bump utils to 30.3.1
2018-09-27 14:39:43 +01:00
Chris Hill-Scott
21cec873d0 Stop calling fake_uuid fixture directly
Pytest is deprecating the direct calling of fixtures. One fixture that
we call directly quite a lot is `fake_uuid`. Since it just returns the
value of `sample_uuid()` we can either call that instead (where we need
a fixed value) or generate a new UUID each time (where a fixed value is
not needed).
2018-09-27 14:14:10 +01:00
Chris Hill-Scott
6de0374492 Merge pull request #2327 from alphagov/add-mou-to-checklist
Add line about the data sharing and financial agreement to the checklist
2018-09-26 16:33:13 +01:00
Chris Hill-Scott
0ff6d43396 Merge pull request #2330 from alphagov/pyup-update-pytest-xdist-1.23.0-to-1.23.1
Update pytest-xdist to 1.23.1
2018-09-26 16:17:07 +01:00
Chris Hill-Scott
edfd7531c9 Merge pull request #2332 from alphagov/dwp.gov.uk
Mark agreement signed by DWP
2018-09-26 16:16:58 +01:00
Chris Hill-Scott
c251c1326e Remove ‘Download the’ call to action
Users come to this page from various places, including the new 'Sign
the…' link on the request to go live page.

Of these users:
- some won't have signed it
- some will have signed it
- some will see that it's complete and wonder why, as they haven’t
  actually done anything

So it’s more appropriate for the title of this page to be descriptive,
rather than an action.
2018-09-26 16:14:50 +01:00
Chris Hill-Scott
2fe1a60bbf Mark agreement signed by DWP 2018-09-26 11:54:02 +01:00
Chris Hill-Scott
3fa877bdd3 Make wording around agreement more straightforward
We think that the next page explains the nuance around service vs
organisation sufficiently well.
2018-09-26 10:37:30 +01:00
pyup-bot
0bd15aa50d Update pytest-xdist from 1.23.0 to 1.23.1 2018-09-25 20:50:16 +01:00
Chris Hill-Scott
901b924e35 Remove redundant variable definition
This unused variable is a hangover from when the permissions
were displayed horizontally in a table.
2018-09-25 17:00:54 +01:00
Tom Byers
943a400c72 Bump utils to 30.3.1
Brings in stripping of the line separator
character from emails.

https://github.com/alphagov/notifications-utils/pull/531
2018-09-25 16:30:29 +01:00
Pea (Malgorzata Tyczynska)
6d32d8b756 Merge pull request #2324 from alphagov/state_postage
Display postage on letter notification page
2018-09-25 13:36:34 +01:00
Chris Hill-Scott
faee3b61dd Merge pull request #2328 from alphagov/pyup-update-notifications-python-client-5.1.0-to-5.2.0
Update notifications-python-client to 5.2.0
2018-09-25 12:51:10 +01:00
Chris Hill-Scott
9e91e55d88 Freeze requirements 2018-09-25 12:21:13 +01:00
pyup-bot
162b33e041 Update notifications-python-client from 5.1.0 to 5.2.0 2018-09-25 12:13:16 +01:00
Pea Tyczynska
d982385042 Change wording following content review 2018-09-25 11:05:32 +01:00
Chris Hill-Scott
5dd45da08c Add line about MOU to checklist
2/3 of our incomplete requests to go live are incomplete because the
Data Sharing and Financial Agreement isn’t signed.

We reckon we can be pushier about this by saying it’s ‘incomplete’ where
we know the agreement is signed.

Where the agreement is signed we should confirm this, rather than make
the line disappear. This is so it makes more sense to someone who sees
it as ‘incomplete’, signs it, then comes back to the page.

If we don’t know whether or not the agreement is signed we should wait
until someone has got in touch with us by requesting to go live to
figure it out. So that’s why we’re not showing that line at all.
2018-09-25 10:33:50 +01:00
Chris Hill-Scott
c2ef522986 Make task list read better for screen readers
This duplicates how the task list pattern is coded in the GOV.UK
Prototype kit[1]. It adds ARIA attributes and the use of a
semantically-meaningful element (`<strong>`) to give more information to
screen reader users.

1. https://govuk-prototype-kit.herokuapp.com/docs/templates/task-list
2018-09-25 10:31:40 +01:00