Commit Graph

7170 Commits

Author SHA1 Message Date
Chris Hill-Scott
4259fb02ba Add handler for old feedback form
Cool URIs don’t change 😎

https://www.w3.org/Provider/Style/URI

We still have links to `/feedback` in our emails. These will live in people’s inboxes forever.
2017-06-07 12:25:33 +01:00
Chris Hill-Scott
313f669690 Roll up messages in inbox
The inbox should work a bit like the one on your phone. You shouldn’t
see all the messages, but the latest one from each of your ‘contacts’
only.
2017-06-06 15:15:36 +01:00
Chris Hill-Scott
a49e1b4f75 Merge pull request #1305 from alphagov/fix-key-inbound
Fix timestamp of latest inbound text on dashboard
2017-06-06 12:47:31 +01:00
Chris Hill-Scott
67137f5570 Fix timestamp of latest inbound text on dashboard
Key was misnamed.
2017-06-06 12:44:59 +01:00
Chris Hill-Scott
9d0d74cce4 Merge pull request #1304 from alphagov/53-54
53-54
2017-06-06 12:23:58 +01:00
Pete Herlihy
bc494a1821 53-54 2017-06-06 12:01:15 +01:00
Chris Hill-Scott
772b5da85c Merge pull request #1303 from alphagov/data-gov-uk
Add DATA.GOV.UK logo as email branding option
2017-06-06 11:21:44 +01:00
Chris Hill-Scott
6a716ef162 Add DATA.GOV.UK logo as email branding option 2017-06-06 11:02:11 +01:00
Chris Hill-Scott
e929a6b245 Merge pull request #1289 from alphagov/inbound-dashboard
Show inbound messages on dashboard
2017-06-05 16:46:03 +01:00
Chris Hill-Scott
85105fd6cd Only show inbound stuff if service has permission
Only services that have inbound SMS turned on should be able to see the
dashboard and ‘Received messages’ page.

There’s probably a cleaner way (decorator) of doing this permissions
stuff, but I think it can wait until we ship this.
2017-06-05 15:52:30 +01:00
Chris Hill-Scott
95e613c3f9 Clarify that big numbers mean ‘sent’
Since we now have inbound and outbound messages we should be clear about
which the counts refer to.
2017-06-05 15:51:30 +01:00
Chris Hill-Scott
e373296bd9 Show inbound messages on the dashboard
This commit adds two things:

a section on the dashboard to show how many inbound messages the
service has received in the last 7 days, and how recently an inbound
message has been received
---

Doesn’t show the contents of any messages, just like how the rest of the
dashboard is an aggregation, never individual messages.

a page to show all the inbound messages the service has received in
the last 7 days
---

This shows the first line of the message. Eventually this will link
through to a ‘conversation’ page, where a service can see all the
messages it’s received from a given phone number.
2017-06-05 15:42:36 +01:00
Chris Hill-Scott
56354a0177 Merge pull request #1302 from alphagov/cqc
Add Care Quality Commission to email whitelist
2017-06-05 14:07:10 +01:00
Rebecca Law
e06f2a0d54 Merge pull request #1300 from alphagov/inbound-sms-permission
Service setting for inbound sms
2017-06-05 13:54:42 +01:00
Chris Hill-Scott
3d45454330 Add Care Quality Commission to email whitelist
CQC is an executive non-departmental public body, sponsored by the
Department of Health.

They have asked to be allowed to register for Notify using the
`cqc.org.uk` and `digital.cqc.org.uk` domains. We know that this really
is there domain because it’s linked to from here:

https://www.gov.uk/government/organisations/care-quality-commission
2017-06-05 13:51:53 +01:00
Rebecca Law
9d7510a52f Revert if statement refactor, if set_inbound_sms is False it still resolves to True, because it is not a boolean but a string. 2017-06-05 13:46:02 +01:00
Rebecca Law
da77737c16 Refactor if statement 2017-06-05 12:13:40 +01:00
Rebecca Law
f40e81bc3a Added a test to turn off the inbound permission. 2017-06-05 12:01:39 +01:00
Chris Hill-Scott
6e6f3ad794 Merge pull request #1301 from alphagov/fix-weird-meta-on-activity-page
Don’t link to one-off reports from activity
2017-06-05 11:15:21 +01:00
Chris Hill-Scott
e4bf0c3e7d Don’t link to one-off reports from activity
There’s no need to see the ‘Report’ page for a one-off message – pretty
much all the info about the notification is there on the page. And
‘Sent from _Report_’ looks weird.

We should display it more like an API call instead.
2017-06-02 17:03:41 +01:00
Rebecca Law
1960a252ea Fix merge conflict and typo in html 2017-06-02 16:37:45 +01:00
Rebecca Law
fe24501075 Add a platform admin button to service-settings page to turn the inbound_sms messaging on and off.
If clicked you will be prompted to enter a sms sender number, when setting the permission on or off.
Team members will always be able to see the number, but will only be able to change it if the inbound_sms permission is off.
2017-06-02 16:33:31 +01:00
Chris Hill-Scott
4a251203df Merge pull request #1286 from alphagov/no-sender-fallback
Remove fallback for empty SMS sender
2017-06-02 12:16:52 +01:00
Chris Hill-Scott
fc9e8a6ee1 Merge pull request #1299 from alphagov/52-53
52-53 for Immigration Asylum Chamber Tribunal
2017-06-02 12:16:45 +01:00
Pete Herlihy
b73a306718 52-53 for Immigration Asylum Chamber Tribunal 2017-06-02 11:26:22 +01:00
minglis
e478d2f820 Merge pull request #1298 from alphagov/revert-dashboard-changes
Revert "Merge pull request #1288 from alphagov/add-new-rate-logic"
2017-06-02 10:50:58 +01:00
Martyn Inglis
0dbd3fa10d Revert "Merge pull request #1288 from alphagov/add-new-rate-logic"
This reverts commit adbff63d1f, reversing
changes made to 80f0b4b2a2.
2017-06-02 10:41:42 +01:00
minglis
adbff63d1f Merge pull request #1288 from alphagov/add-new-rate-logic
Wire in the new API method that calculates the total cost and total billable units
2017-06-02 09:52:19 +01:00
Martyn Inglis
790aa250e4 Merge branch 'add-new-rate-logic' of github.com:alphagov/notifications-admin into add-new-rate-logic 2017-06-01 17:05:07 +01:00
Martyn Inglis
e236cc4cbe Fixed typo and moved the sms free limit into the config. 2017-06-01 17:04:41 +01:00
minglis
8f70dcf549 Fix typo 2017-06-01 16:55:49 +01:00
minglis
74e79e175b Fix typo 2017-06-01 16:53:36 +01:00
Chris Hill-Scott
80f0b4b2a2 Merge pull request #1297 from alphagov/search-outbound
Add search box to filter notifications by recipient
2017-06-01 16:09:20 +01:00
Chris Hill-Scott
20f1d73f76 Merge pull request #1293 from alphagov/one-off
Make ‘send a one-off message’ a thing
2017-06-01 14:46:07 +01:00
Chris Hill-Scott
f12e0fde39 Ensure the tour sidebar gets shown
I accidentally broke it by removing a parameter. This commit reinstates
that parameter and adds some tests to make sure it doesn’t happen again.
2017-06-01 14:27:55 +01:00
Chris Hill-Scott
6425dcbc94 Rename the feature to ‘send to one recipient’
‘One-off’ is a bit wooly. Feels like our name for the thing. ‘Send to
one recipient’ matches ‘Upload recipients’.

This also means making the `<h1>` on job page ‘Report’ for one-off
messages. It doesn’t make sense to call the feature ‘send to one
recipient’ when we’re not using the language of one-off any more.
2017-06-01 14:27:25 +01:00
Chris Hill-Scott
43f6d21e1d Replace test with one-off
It’s a confusing proposition to have two features which are almost
identical. Even differentiating between them in the template menu would
be tricky.

I think the better thing to do is rename the whole feature to ‘send
one-off message’.

Then if someone wants to use there own phone number or email address,
give them a quick shortcut to doing that, once they’re in the flow.
In the background this reuses the ‘send yourself a test’ code, but
the user is never aware that they’re going through a different route
to send an individual message. So the proposition stays nice and clean.
2017-06-01 14:26:49 +01:00
Chris Hill-Scott
82549c817a Ensure correct page titles on send test flows
We have some fairly complicated nested if statements in our Jinja that
decide what the page titles should be. It’s only going to get more
complicated with the send individual message routes.

So this commit:
- moves the logic from Jinja to Python
- adds tests to check things are working as expected
- sets the page titles to the right thing for each flow
2017-06-01 14:26:14 +01:00
Chris Hill-Scott
27c1463213 Validate recipients in send a one-off message
It would be annoying to get all the way to the end of the flow and get
told that the phone number or email address you entered isn’t valid.

So this commit reuses the existing WTForms objects that we have to do
some extra validation on the first step in the send one-off message
flow. It also accounts for international phone numbers, if the service
is allowed to send them.

It doesn’t reject other people’s phone numbers if your service is
restricted, because I think it’s better to let users play with the
feature – it’s good for learning.
2017-06-01 14:25:41 +01:00
Chris Hill-Scott
7310e8b435 Make send one-off route ask for phone number/email
This commit adds an extra, initial, step to the ‘send one-off message’
flow to ask for a phone number or email address. This is the first pass
at making a feature which caseworkers or similar could use Notify to
send individual messages while they’re working a case.
2017-06-01 14:25:04 +01:00
Chris Hill-Scott
311732ff9d Add test for international phone no. 2017-05-31 11:53:10 +01:00
Chris Hill-Scott
b9bf18b936 Add a form to filter notifications by recipient
Because manually editing the URL isn’t a great user interface, this
commit adds a search field to do this on the user’s behalf.

For this pass at the story it doesn’t do any validation – the user will
just get no results if they search by something which isn’t a phone
number or email address.

If the user navigates to a different ‘bucket’ of notifications (eg
delivered, failed) then the search term is reset, because they’ve
changed the filter which is at a level above the search term.
2017-05-30 15:11:34 +01:00
Chris Hill-Scott
f41830e5d3 Add query string parameter to search by recipient
> Service teams that use the admin interface often need to know the
> outcome of a message... at the moment they have to page through all
> the results in the activity stream. They should be able to find
> notifications by email address or phone number.

– https://www.pivotaltracker.com/n/projects/1443052

This commit adds an additional query string parameter (`to`) to the URL,
which users can use to filter down the list of notifications.

It:
- takes the status into account
- doesn’t update the counts based on the search term (in reality each
  service will only send a handful of notifications to one person in any
  7 day period)

In other words the funnel that filters down the notifications looks
like:

> all notifications for service → only failed → only to this phone
> number
2017-05-30 15:06:56 +01:00
Chris Hill-Scott
eabd9fcbf1 Add a third route through populating a template
This commit adds a route which is identical to send yourself a test, but
with its own endpoint. This will let us add a slightly different
‘send a one-off message’ flow. This commit just adds the route though,
and makes sure that the tests pass for both routes.
2017-05-30 10:33:48 +01:00
Chris Hill-Scott
d516f19a33 Merge pull request #1292 from alphagov/tidy-tests
Combine related tests into one
2017-05-30 10:30:46 +01:00
Rebecca Law
1ff47446ad Merge pull request #1296 from alphagov/whitelist-domain
Add cjsm.net to whitelist
2017-05-26 11:05:05 +01:00
Rebecca Law
a1d004fa45 Add cjsm.net to whitelist 2017-05-26 10:40:48 +01:00
Chris Hill-Scott
c27f349285 Merge pull request #1295 from alphagov/51-52
51-52 for HMCTS Registration
2017-05-25 15:39:26 +01:00
Chris Hill-Scott
af0057e89d Merge pull request #1290 from alphagov/add-tail-sms
Add tail to SMS messages
2017-05-25 15:39:19 +01:00
Pete Herlihy
8cb16b28cb 51-52 for HMCTS Registration 2017-05-25 15:35:14 +01:00