Commit Graph

1365 Commits

Author SHA1 Message Date
Leo Hemsted
03397f416e move status mapping logic to the api client
also added tests 👼
2017-09-20 16:02:15 +01:00
chrisw
4312789b60 Add a non-GOV.UK banner option for email branding
Added extra radio button for 'org_banner' option
Updated service setting template to display appropriate text when option is selected
Updated tests to also accomodate new radio option
2017-09-19 13:34:31 +01:00
Chris Hill-Scott
170f3a1da0 Merge pull request #1485 from alphagov/rename-template-permission-label
Rename manage templates permission
2017-09-18 10:39:06 +01:00
Chris Hill-Scott
d7370c1816 Rename manage templates permission
‘Add and edit’ is the language we use next to the checkbox.

Also helps disambiguate it from the ‘manage service’ permission.
2017-09-15 11:36:00 +01:00
Chris Hill-Scott
c26d308a32 Show row errors before trial mode errors
It’s useful to be able to play with the CSV upload thing and find out
how it works before you’re interrupted by the error telling you that
you’ve got as far as you can in trial mode.
2017-09-14 12:21:40 +01:00
Pete Herlihy
2d9ad0f90a Merge pull request #1476 from alphagov/wmfs.net
Adding wmmfs.net to allowed domains
2017-09-08 10:17:08 +01:00
Pete Herlihy
e9625cf54e Added West Midlands Fire Service 2017-09-07 16:46:32 +01:00
Rebecca Law
7827d3d9cd Becca you need to test it 2017-09-05 16:35:33 +01:00
Pete Herlihy
f7ff745872 New Using Notify static page
Adds the new Using Notify view

Adds route to Using Notify page.

Add redirects for old pages

Removes the delivery and failure page as it's now in the Using Notify one

Removes the trial mode page due to Using Notify page
2017-08-31 11:10:02 +01:00
Chris Hill-Scott
188ce5e5a7 Let users register with int’national phone numbers
Right now Notify restricts you to registering with a UK mobile number.
This is because when we built the user registration stuff we couldn’t
send to international mobiles.

However we can send to international mobile numbers, and it’s totally
reasonable to expect employees of the UK government to be working
abroad, and have a foreign mobile phone – we’ve heard from one such
user.

So this commit:
- changes all places where users enter their own phone number to use
  the validation function which allows international phone numbers
- renames the `mobile_number` validation to `uk_mobile_number` to make
  it explicit, and force it to break the tests if there’s somewhere it’s
  being used that I haven’t thought of
2017-08-29 14:52:24 +01:00
Chris Hill-Scott
aa50864d1b Merge pull request #1449 from alphagov/fix-trial-mode-error-print-test-letter
Don’t show trial mode error if making test letter
2017-08-25 14:50:11 +01:00
Chris Hill-Scott
edf54d8fe0 Don’t show trial mode error if making test letter
We don’t want users in trial mode sending real letters. So we’ve
introduced an error message. This error message is also showing up when
users in trial mode and making a test letter (and having the knock on
effect of hiding the download button).

They should be able to make a test letter in trial mode, because it
doesn’t cost anything.
2017-08-25 14:20:15 +01:00
Rebecca Law
62ccd822ff Merge pull request #1444 from alphagov/remove-unused-endpoint
Removed service_api_client.get_monthly_notification_stats
2017-08-24 16:34:57 +01:00
Chris Hill-Scott
ea95493b42 Merge pull request #1445 from alphagov/inbound-sms-number-shown-bug
Put the inbound number on the invite page
2017-08-24 14:03:50 +01:00
Chris Hill-Scott
da70310f8e Merge pull request #1407 from alphagov/no-letters-trial-mode
Don’t let users in trial mode send letters
2017-08-24 13:58:43 +01:00
Chris Hill-Scott
7e097e887e Make sure empty inbox also show the correct number
…since it’s divorced from the SMS sender now.
2017-08-24 13:57:12 +01:00
Chris Hill-Scott
66e4129c54 Make tests more comprehensive 2017-08-24 10:13:14 +01:00
Chris Hill-Scott
453ee44dfb Put the inbound number on the invite page
Inbound number and SMS sender are divorced from each other now. This
page was assuming that they were the same thing.
2017-08-24 10:02:02 +01:00
Chris Hill-Scott
ed9b4362e7 fix whitespace 2017-08-24 09:57:43 +01:00
Rebecca Law
16f3aafa10 Removed service_api_client.get_monthly_notification_stats because it is not being used anymore. 2017-08-23 17:07:42 +01:00
Leo Hemsted
f97f249bc0 Merge pull request #1414 from alphagov/logs-cleanup
don't capture logs directly from stdout
2017-08-22 14:44:59 +01:00
Leo Hemsted
f68cdb20b5 Merge pull request #1439 from alphagov/dvla-endpoint
Add platform–admin-only page to preview DVLA code
2017-08-22 14:44:48 +01:00
Chris Hill-Scott
1e745bb736 Merge pull request #1424 from alphagov/row-error-cleanup
Tidy up some things around row-level errors in CSV files
2017-08-22 12:31:05 +01:00
Chris Hill-Scott
dd5d6e4d59 Merge pull request #1435 from alphagov/manage-templates-permission
Separate ‘manage service’ and ‘manage templates’ permissions
2017-08-22 12:30:57 +01:00
Chris Hill-Scott
eee9c2bb99 Merge pull request #1425 from alphagov/split-settings
Split settings page into multiple sections
2017-08-22 12:22:50 +01:00
Chris Hill-Scott
5ffd7c4448 Add platform–admin-only page to preview DVLA code
Debugging the DVLA markup stuff is quite slow, because it’s split
between the API and utils, and things that work in tests don’t always
work with real template content.

This commit adds us a private endpoint that will let us see what DVLA
markup will be generated for any template, enabling a quicker feedback
loop.
2017-08-22 12:03:05 +01:00
Rebecca Law
0f6fcb8d0b formatting 2017-08-21 14:04:40 +01:00
Rebecca Law
8cf29a7d04 Merge branch 'master' into inbound_number_admin 2017-08-21 13:50:49 +01:00
Rebecca Law
6b04373bcf Remove unused template.
Revert formatting changes
2017-08-21 13:47:24 +01:00
Chris Hill-Scott
d591b9aeb9 Add a fourth, ‘manage templates’ permission
We’ve seen from research (a long time ago) that the ‘manage service’
permission is too broad, and gives too much control to someone who only
needs the ability to edit templates. In other words, editing content
should be its own, separate permission, rather than being rolled up
into manage service.

Since this is already disaggregated on the API side, making this change
just means changing the mapping on the admin side and adding an extra
checkbox on the invite/edit page. Which is what this commit does.

So for now, an existing user who has the manage service permission gets
both manage service and manage templates (ie no change to what they can
do). Newly invited users will get to choose if they have both, either,
or neither.
2017-08-17 17:47:30 +01:00
Chris Hill-Scott
aac654cd38 Test that the right permissions in page
This commit makes sure that the right permission choices are shown in
these pages:
- manage team page
- invite a user page
- edit permissions page

This is in order to make changing these pages easier (see subsequent
commits).
2017-08-17 17:45:52 +01:00
Chris Hill-Scott
726e91bebb Make existing tests use ``client_request fixture
This commit makes the existing tests around user permissions less
verbose by using the new `client_request` fixture.

This fixture takes care of:
- setting up a service
- asserting that the response is `200`

It also tests that the page titles, some of which didn’t match with the
`<h1>`s, so this commit also fixes that mismatch.
2017-08-17 17:42:40 +01:00
Imdad Ahad
232912ab3b Call the correct endpoint to retrieve yearly billing usage 2017-08-17 16:02:30 +01:00
Imdad Ahad
fa99af6598 Merge pull request #1432 from alphagov/imdad-feat-make-usage-use-new-endpoints
Update the usage page to use new billing endpoints
2017-08-17 15:37:26 +01:00
Imdad Ahad
32242c4501 Update the usage page to use new billing endpoints
* Create new billing_api_client for separation and remove
older methods in the service_api_client
2017-08-16 16:31:47 +01:00
Venus Bailey
cbe2df3946 Revert "Job stats table" 2017-08-16 15:25:26 +01:00
Rebecca Law
9d8462e430 Fix codestyle.
Revert commit for package-lock.json
2017-08-16 10:00:53 +01:00
Rebecca Law
8aab08d4d2 View to show all inbound sms numbers for the platform admin user. 2017-08-15 17:04:57 +01:00
venusbb
6a483c14f5 change get-jobs to point to new statistics tables 2017-08-15 15:53:26 +01:00
Rebecca Law
27a9180d2a Merge branch 'master' into inbound_number_admin 2017-08-15 15:08:58 +01:00
Rebecca Law
c6a8ef43ec When setting the permisssion to allow inbound numbers the client will call an api endpoint that will set the next avaiable inbound number for the service.
As before the service manager will not be able to change the Text message sender once they have the inbound sms permission.
If the inbound sms permission is turned off the Text message sender setting is once more configurable by the service manager.
The inbound number remains bound to the service, but has "inactive", so that the number can not be used again.
2017-08-15 15:02:20 +01:00
Rebecca Law
0387b72c00 Get the inbound sms working.
Created a new test file for the inbound sms service settings changes, felt like the other file was too massive
2017-08-15 13:34:29 +01:00
Chris Hill-Scott
e520790025 Rename letters on/off option to send letters
For consistency with ‘send text messages’/‘send emails’.
2017-08-14 16:26:35 +01:00
Chris Hill-Scott
45a0a767f4 Split settings page into multiple sections
There are quite a few more options that there used to be in the settings
page. This means it’s hard to find the thing you want to change.

Grouping options is a common way of making things easier to find.

Grouping by channel (text, email, letter) is something we do elsewhere
that seems to work pretty well.
2017-08-14 16:23:56 +01:00
Chris Hill-Scott
5c872e7936 Put file name in error message
‘Your data’ sounds ambiguous and computery. Using the name of the file
is better because it’s a thing you know about.
2017-08-14 15:57:51 +01:00
venusbb
9d446bc942 Tests not completed 2017-08-14 11:56:12 +01:00
Chris Hill-Scott
e3d26bb2a2 Allow Science & Technology Facilities Council
> STFC is an executive non-departmental public body, sponsored by the
> Department for Business, Energy & Industrial Strategy.
> http://www.stfc.ac.uk/https://www.gov.uk/government/organisations/science-and-technology-facilities-council
2017-08-14 09:52:11 +01:00
Chris Hill-Scott
77452b1b25 Merge pull request #1418 from alphagov/local-email-address-for-local-government
Tell local government folk that they can sign up
2017-08-11 16:20:06 +01:00
venusbb
bff5c11bab merge pull 2017-08-11 09:43:56 +01:00
venusbb
87e987b148 merge master 2017-08-11 09:36:05 +01:00