Commit Graph

2664 Commits

Author SHA1 Message Date
Chris Hill-Scott
f3d7eea43e Hide international pricing by default
It’s really big.
2017-07-28 15:16:40 +01:00
Chris Hill-Scott
10f81d5d16 Make pricing table searchable
uses the same pattern as searching templates by name.
2017-07-28 15:16:17 +01:00
Chris Hill-Scott
10b87e433b Add international pricing table 2017-07-28 15:16:07 +01:00
Chris Hill-Scott
a1880bddda Add letter pricing table 2017-07-28 15:15:36 +01:00
Chris Hill-Scott
6d9434d968 Re-order page ready for new stuff 2017-07-28 15:15:02 +01:00
Pete Herlihy
506439431b Added some service level stuff 2017-07-28 11:17:04 +01:00
Chris Hill-Scott
5c9572805e Fix error messages on one off sending
This was causing a 500 in production.

This commit:
- reverts the code the working state it was before 68a1426e58
- figures out a way to make the tests pass without breaking the actual
  app
- confirms that mocking things is hard
2017-07-27 16:34:15 +01:00
Chris Hill-Scott
415e1a401a Don’t set combined API on Notify python client
Because we’re setting the API key and service ID after calling the
`__init__` method of the client it wasn’t doing the thing where it
splits the combined key into the two individual UUIDs. So we still need
to set them directly, individually on the client.
2017-07-26 12:08:10 +01:00
Chris Hill-Scott
ae1a0b4804 Merge pull request #1387 from alphagov/fix-breaking-change-python-client
Fix things that broke when I merged Pyup’s changes
2017-07-26 11:42:01 +01:00
Chris Hill-Scott
9b8397db1c Merge pull request #1383 from alphagov/fix-one-off-errors
Fix error messages in one-off flow
2017-07-26 11:41:55 +01:00
Chris Hill-Scott
a41a61fe45 Merge pull request #1380 from alphagov/continue-not-next
Use ‘Continue’ not ‘Next’ for button text
2017-07-26 11:41:45 +01:00
Chris Hill-Scott
ce114f1342 Use import from its new location
Making this change gets rid of a deprecation warning from our logs.
2017-07-26 11:20:33 +01:00
Chris Hill-Scott
66196420d7 Remove deprecated decorator
Should use the normal Flask error handler. Making this change gets rid
of a deprecation warning from our logs.
2017-07-26 11:19:42 +01:00
Chris Hill-Scott
5596da3ff9 Address deprecation warning around wtf Form
It’s been renamed to avoid a conflict. Not a conflict we have to worry
about. So we can just change our import and get rid of the deprecation
warning.
2017-07-26 11:18:44 +01:00
Chris Hill-Scott
68a1426e58 More Python client weirdness
There’s some weird interaction between the message attribute of the
exception and mocking.

Luckily there is an internal attribute – `_message` which doesn’t go
through all the magic.
2017-07-26 11:13:37 +01:00
Chris Hill-Scott
5ddbe80ea9 Fix calls to API client which now takes fewer args
The Notify API client changed in version 4 to take two arguments, not
three (service ID was removed in favour of the combined API key).

This gets a bit gnarly because the API key has to be at least a certain
length so it can be substringed internally.
2017-07-26 11:10:37 +01:00
Chris Hill-Scott
3d076efeea Merge pull request #1357 from alphagov/pyup-initial-update
Initial Update
2017-07-26 09:43:27 +01:00
Chris Hill-Scott
a58d881647 Make one-off error refer to correct message type
This was hard coded to say ‘You can’t send to this phone number’ even
when you were trying to send an email.
2017-07-26 07:50:01 +01:00
Chris Hill-Scott
2291c4faf4 Make sure errors on one-off flow have red border
When I split up the error messages on the check CSV page into multiple
templates, I also reduced the repetition of wrapping `<div>`s and macro
calls by moving them up outside the conditional blocks (see
8e947f315d).

Unfortunately I didn’t make the same adjustments for the one-off flow,
which meant that errors on these pages lost their styling. This commit
re-adds the styling for these error messages.
2017-07-26 07:46:20 +01:00
Chris Hill-Scott
b4c05ed697 Use ‘Continue’ not ‘Next’ for button text
The service manual recommends to:

> Make sure your ‘Continue’ button is:
>
> - labelled ‘Continue’, not ‘Next’
> - aligned to the left so users don’t miss it

– https://www.gov.uk/service-manual/design/question-pages
2017-07-24 16:52:17 +01:00
Chris Hill-Scott
32ae0a9b36 Merge pull request #1364 from alphagov/letter-job-page-real
Customise the job page to make sense for letters
2017-07-21 13:10:09 +01:00
Chris Hill-Scott
35e39eb45b Merge pull request #1374 from alphagov/split-the-check
Split the ‘check’ template into three separate templates, add error tracking
2017-07-20 14:02:12 +01:00
Chris Hill-Scott
82233340b6 Track errors when uploading spreadsheets
Uses the new javascript event tracking stuff so that we can see what
errors people are getting when they upload spreadsheets.
2017-07-20 12:06:15 +01:00
Chris Hill-Scott
eb264f34b7 Add a little JS module to track events
Google analytics lets you send:
- pageviews
- events

Page views are used by default. But sometimes you wanna count something
which isn’t the user navigating to a new page, or you wanna track
something which isn’t just what page they were looking it. This is where
events are useful.

This commit adds a small JS module that lets us fire off an event when
the presence of an element with the right data attributes are present on
the page.
2017-07-20 12:06:15 +01:00
Chris Hill-Scott
56945565ba Don’t indent column headings if no row errors
The reason to indent the first column heading is so that the number 1
lines up with the numbers of subsequent rows.

This only happens when the subsequent rows are indented because of the
red bars. This is only when there are row errors, not when there are
more general errors.
2017-07-20 12:01:59 +01:00
Chris Hill-Scott
8e947f315d Refactor check error templates to repeat less
There was a lot of repetetive wrapping code being repeated for every
conditional block in these files. Let’s wrap it around the whole
conditional bit once instead.
2017-07-20 12:00:56 +01:00
Chris Hill-Scott
94bc8191ae Remove irrelevant stuff from error check pages
If you have errors in your file then there’s stuff you’re not going to
see on the page. So this doesn’t need to be in the Jinja templates that
are only used when there are errors.

Basically the conditional stuff is moving up to the level above these
templates.
2017-07-20 11:56:37 +01:00
Chris Hill-Scott
5a9f817e52 Remove anything error-related from the OK view
If you’ve uploaded a file and everything is OK, the page that you see
doesn’t need to look at any errors (because there won’t be any).
2017-07-20 11:55:46 +01:00
Chris Hill-Scott
ddeed88210 Refactor check page into 3 separate templates
The check page is a very complex Jinja template. It needs breaking up
to make it easier to understand what’s going on.

I think there are three di
2017-07-20 11:47:04 +01:00
Chris Hill-Scott
68078041dd Show personalisation in individual letters
Adds a new endpoint that works like view template/view preview of
letter, so that this page works the same way it does for emails/text
messages (ie showing the full content of the message, including
personalisation).

We’re not worrying about redaction in letters for now.
2017-07-19 19:01:39 +01:00
Chris Hill-Scott
63e9ef44e7 Don’t show status for individual letters
The status won’t ever change from sending for letters. For now at least.
And even when we do come up with more useful statuses I’m not convinced
it’s useful to expose them to our admin users.

A more useful piece of information to show is when we think the letter
will be delivered.
2017-07-19 19:01:39 +01:00
Chris Hill-Scott
b003162932 Merge pull request #1368 from alphagov/quis-patch-1
Reduce spacing before button on invite page
2017-07-19 09:13:36 +01:00
Chris Hill-Scott
35e7866b96 Merge pull request #1372 from alphagov/correct-descalation-link
Fix broken link in support process
2017-07-19 09:13:31 +01:00
Chris Hill-Scott
95347a89db Merge pull request #1371 from alphagov/fix-form-focus-list-entry
Fix button keyboard focus on whitelist
2017-07-19 09:13:21 +01:00
Chris Hill-Scott
3950c6938d Show confirmation after pressing big green button
There’s no immediate feedback with letter jobs, unlike email or text
messages jobs where you see the numbers starting to tick over straight
away.

We need to reassure the user that the thing they asked us to do (send
letters) is underway. ‘Printing’ feels like the natural first state of
the letter-making process. So this commit adds a banner to tell the
user that printing is the thing that’s happening.
2017-07-18 11:00:54 +01:00
Chris Hill-Scott
ad897cd820 Hide report on letter job 2017-07-18 11:00:53 +01:00
Chris Hill-Scott
7881753193 Replace blue boxes with total + delivery estimate
The sending/failed/delivered thing:
- doesn’t map to the actual states of letters
- doesn’t respond quickly enough to give you feedback that something is
  happening (because "sending" doesn’t even go to "probably delivered"
  for a few days)

This commit replaces these 4 boxes with some more useful information:
- one number – how many letters were in the job in total
- when we estimate that the letters will be delivered
2017-07-18 11:00:08 +01:00
Chris Hill-Scott
202c9aea62 Hide status for individual letters
The status for each letter in a job will be the same for every single
letter (at least until we start dealing with returns).

It’s redundant to show this information over and over again. This commit
removes it.
2017-07-18 10:37:54 +01:00
Chris Hill-Scott
9a81489066 Merge pull request #1362 from alphagov/letter-delivery-estimates
Add function to estimate letter delivery date
2017-07-18 09:44:56 +01:00
Chris Hill-Scott
5b4a15495e Fix remove button keyboard focus on whitelist
Replicates @pcraig3’s work here:
https://github.com/alphagov/digitalmarketplace-frontend-toolkit/pull/333
2017-07-17 09:55:11 +01:00
Chris Hill-Scott
109b41a430 Fix broken link in support process
The idea is if you decide your problem isn’t such an emergency after
all, we direct you to the form where you can report it as such. This
link wasn’t working because it didn’t understand `False` to mean ‘not
severe’. Only ‘no’ means not severe.

The result was that users got sent in a bit of a convoluted loop
where they were asked again if their problem was an emergency or not.

Testing this by making sure that both:
- the URL in the link is what we expected
- when visited it gives the page title we expect

Because even if we had had the first test only, it wouldn’t have caught
this bug.
2017-07-15 07:23:22 +01:00
Chris Hill-Scott
e20483c462 Add print timings to letter timings
It will also be useful to know (especially for the API):
- when a letter was printed
- if it’s been printed or not

This commit:
- adds code to calculate these two pieces of information
- refactors the function to return a `namedtuple` – a tuple of two items
  was manageable, but with four items it was getting hard to know what
  each one meant – this lets us label each piece of information that is
  being returned
2017-07-14 20:09:23 +01:00
Chris Hill-Scott
6ceffd02c4 Reduce spacing before button on invite page
It was too much, the button looked adrift.
2017-07-13 15:55:32 +01:00
Chris Hill-Scott
a6b3ae0965 Merge pull request #1360 from alphagov/ajax-conversation-page
Make conversation and inbox pages update using AJAX
2017-07-13 15:18:33 +01:00
Chris Hill-Scott
a6eb18fbf3 Merge pull request #1366 from alphagov/roadmap-july
Updates for July for the Roadmap
2017-07-13 15:01:52 +01:00
Chris Hill-Scott
49494d2751 Merge pull request #1365 from alphagov/65-67
65-68
2017-07-13 15:01:46 +01:00
Pete Herlihy
44a6221060 Updates for July for the Roadmap 2017-07-13 12:22:03 +01:00
Pete Herlihy
b7a28eff21 Adding HO Right to work check - 68 2017-07-13 11:54:48 +01:00
Chris Hill-Scott
5f6351762a Make inbox page update using AJAX
Fairly self-explanatory. Uses the same pattern of breaking things up
into functions as the jobs page.
2017-07-12 17:10:27 +01:00
Chris Hill-Scott
dc3f26a646 Make conversation page update using AJAX
Fairly self-explanatory. Uses the same pattern of breaking things up
into functions as the jobs page.
2017-07-12 17:09:33 +01:00