Commit Graph

4136 Commits

Author SHA1 Message Date
Chris Hill-Scott
d69e8b50cd Only initialised service model once per request
`_get_current_service` is a function which gets called every time
`current_service` is referenced in a view method or Jinja template.

Because the service model was getting initialised inside this function
it was being reconstructed many times in one request. On the service
settings page, for example, it was getting initialised 43 times, adding
about 200ms to the response time.

This commit moves its initialisation to the point where we’re getting
the data from the API, which only happens once per request.
2018-10-30 14:55:00 +00:00
Chris Hill-Scott
d5d1f7394d Remove old API key and service ID combo
Once all our users have upgraded to the latest clients they won’t need
this. The latest clients only use the combined key and service ID.

Discuss: when can we safely remove it?
2018-10-30 10:01:37 +00:00
Katie Smith
3431996860 Add required argument to function 2018-10-30 07:56:27 +00:00
Chris Hill-Scott
f1a9761ea1 Show letters that fail validation as cancelled
At the moment we show precompiled letters that have failed the
validation as having been sent. This is confusing.

We should communicate it as having been cancelled (rather than failed),
with the implication being that Notify has come along and cancelled the
letter before printing it. I think this is conceptually what makes the
most sense.

From the user’s point of view any letters that show up as cancelled
probably need to be fixed and resent, so it makes sense to group them
with the same name.
2018-10-29 12:13:33 +00:00
Chris Hill-Scott
bbb4b87cac Show count of cancelled letters on dashboard 2018-10-29 11:51:43 +00:00
Chris Hill-Scott
c01d761a3c Show if a letter has been cancelled
At the moment we are manually cancelling letters for people when they
ask us to. Once’s we’ve done this there is no indication that it’s
happened except for the date going red on the list of letters.

This commit adds some error messaging and styling to show when a letter
is cancelled.

Letting people cancel their own letters will be a future enhancement.
2018-10-29 11:51:41 +00:00
Katie Smith
ae79a3ac75 Add platform admin button for edit_folders permission
Added a platform admin button to allow / remove the edit_folders
permission for a service.
2018-10-25 12:09:26 +01:00
Katie Smith
af29ee7ff1 Merge pull request #2407 from alphagov/stop-sending-dvla-org-id
Stop passing dvla_org_id to template preview
2018-10-24 16:28:58 +01:00
Katie Smith
a489e7a26b Stop passing dvla_org_id to template preview
We were passing both dvla_org_id and filename to template-preview
temporarily while we switch to only using filename. Now that
template-preview is set up to use filename, we can stop sending the
dvla_org_id too.
2018-10-23 16:21:18 +01:00
Pete Herlihy
285d91f5bc Updated service count to 410 and 127 orgs 2018-10-23 15:43:59 +01:00
Katie Smith
e100a0f218 Merge pull request #2394 from alphagov/send-letter-filename-to-template-preview
Pass letter logo filename to template preview
2018-10-19 10:58:08 +01:00
Chris Hill-Scott
86898903c5 Merge pull request #2393 from alphagov/rushmoor.gov.uk
Make agreement signed by Rushmoor borough council
2018-10-18 15:12:30 +01:00
Katie Smith
0362265cb6 Pass letter logo filename to template preview
We now pass through `filename` to the Template Preview `/preview.<filetype>'
endpoint in addition to the `dvla_org_id`. Template Preview will be
changed to only use `filename`, and once this has been done, we can change
the code to only pass through `dvla_org_id` instead of passing through
both pieces of information.
2018-10-17 15:17:11 +01:00
Chris Hill-Scott
897a3f6407 Make agreement signed by Rushmoor borough council 2018-10-17 15:05:35 +01:00
fidejoseph
4d9a476d04 Update email_domains.yml
added bi.team
2018-10-17 10:42:38 +01:00
Chris Hill-Scott
584ae89394 Mark agreement signed 2018-10-16 16:52:22 +01:00
Chris Hill-Scott
975aa5fe86 Add Animal & Plant Health Agency 2018-10-16 16:28:04 +01:00
Chris Hill-Scott
e7278c7811 Mark agreement sign by Maidstone council 2018-10-15 15:20:50 +01:00
Leo Hemsted
c898284c3b fix pdf download link trying to request a page count
It doesn't make sense to get a pdf for only one page - the template
preview app just returns a 400 if you try. So we shouldn't try!
2018-10-15 14:32:10 +01:00
Chris Hill-Scott
6154495c1b Merge pull request #2371 from alphagov/fix-email-preview
Allow coloured branding without logo in preview
2018-10-11 15:30:32 +01:00
Chris Hill-Scott
8e582fbdc9 Merge pull request #2375 from alphagov/resend-layout
Make resend email page consistent
2018-10-11 15:29:50 +01:00
Chris Hill-Scott
f41a49dcfb Resolve aliases for Vale of Glamorgan Council domain 2018-10-11 14:12:07 +01:00
Pete Herlihy
b0171498ea Updated for Vale of Glamorgan 2018-10-11 12:21:16 +01:00
Chris Hill-Scott
86b9ca6381 Make resend email page consistent
Its grid and copy weren’t consistent with the original page you see when you’ve first been sent the confirmation email.
2018-10-11 11:59:33 +01:00
Chris Hill-Scott
6b6a19eb2d Merge pull request #2369 from alphagov/align-pending
Format ‘pending’ messages the same as ‘sending’
2018-10-11 11:21:56 +01:00
Chris Hill-Scott
0d0d95a75a Format ‘pending’ messages the same as ‘sending’
For reasons I don’t understand some of our text messages get marked as `pending`. Since we don’t account for this in the front end they don’t get displayed quite right (the vertical position of the text is too high). This commit adds the pending `state` to the `if` statement so the text is properly aligned.
2018-10-11 11:08:32 +01:00
Tom Byers
e92230a0ef Allow coloured branding without logo in preview
Coloured brandings can just be a coloured
background with text. At the moment the /_email
preview page assumes a logo image will be part of
a brand so looks broken.
2018-10-11 10:50:42 +01:00
Chris Hill-Scott
9bc0b6ecd4 Merge pull request #2370 from alphagov/service-count
Up to 393 services and 123 organisations
2018-10-11 10:25:04 +01:00
Chris Hill-Scott
ae7e8d5659 Merge pull request #2368 from alphagov/vca.gov.uk
Add Vehicle Certification Agency to domains list
2018-10-11 10:24:56 +01:00
Leo Hemsted
2bd5ec6ec3 Merge pull request #2351 from alphagov/precompiled_validation_preview
Preview the validation of precompiled letters
2018-10-10 14:58:23 +01:00
Pete Herlihy
9a8b079413 Up to 393 services and 123 organisations 2018-10-10 14:11:59 +01:00
Chris Hill-Scott
095dd617cd Got the answers 2018-10-10 10:33:07 +01:00
Chris Hill-Scott
b580d2e29e Add olev domains 2018-10-10 09:59:53 +01:00
Chris Hill-Scott
672709ae86 Add Vehicle Certification Agency to domains list
Need to find out where they sit…

https://www.gov.uk/government/organisations/vehicle-certification-agency
2018-10-10 09:24:13 +01:00
Pete Herlihy
acec8922c6 Update pricing for 1 October onwards - adding first class rates 2018-10-09 14:37:07 +01:00
Chris Hill-Scott
9ef75a2a4c Mark agreement signed by DCMS 2018-10-09 09:59:57 +01:00
Chris Hill-Scott
5c5680b17d Mark agreement signed by Brighton and Hove 2018-10-05 16:54:22 +01:00
Pea Tyczynska
291b2cf2ba Improve error handling for precompiled validation preview 2018-10-05 16:27:57 +01:00
Pea Tyczynska
e6e363ba3f Add antivirus scan to letter validation preview view 2018-10-05 16:27:57 +01:00
Pea Tyczynska
a61393a68e Test letter validation preview flow 2018-10-05 15:46:44 +01:00
Pea Tyczynska
3cdacaaf0a Introduce validation and error handling for validation preview 2018-10-05 15:46:44 +01:00
Pea Tyczynska
3be129241f Add letter validation preview functionality
- add get/post view
- create a pdf upload form
- add a template where user can upload the file
- check boundaries of the letter by calling template-preview
- display banner messages with boundaries validation result
- display pages of the document, with visible boundaries overlay
if the document did not pass validation, and without overlay
if they do pass validation
2018-10-05 15:46:44 +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
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
bed0ef6912 Add ACAS to list of domains 2018-10-03 10:25:20 +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