Commit Graph

1282 Commits

Author SHA1 Message Date
Chris Hill-Scott
d7fc7b082f Make trial mode message less verbose
Frontloads the ‘not’ part of the message, and makes it shorter, so
it’s more likely to be read and understood. Also makes it fit better
with the new ‘Can’t be used to send letters’ message.
2017-10-03 13:32:10 +01:00
Chris Hill-Scott
9c25b2d2da Add note about letters
When trying to send letters using the API, the ‘team and whitelist’ key
is confusing. We don’t have addresses for your team members, nor is
there a whitelist for letter addresses. The actual behaviour is that
you’ll get an error if you try to use this key to send letters.

So, for services who have letters available, we should add a hint
telling users that team and whitelist is probably not the key they’re
looking for.
2017-10-03 13:29:12 +01:00
Chris Hill-Scott
f93a0c074b Test existing functionality
When picking an API key you get a choice of different key types. Which
types are available depends on whether or not your service is in trial
mode.

This commit adds missing tests for the existing functionality which
determined the types of key that should be available to the user.
2017-10-03 13:27:49 +01:00
Chris Waszczuk
c2a50a7c37 Merge pull request #1520 from gov-cjwaszczuk/master
Added letters info to service / admin dashboard & activity page
2017-10-03 10:40:59 +01:00
chrisw
43395bc9d9 Added letters info to service / admin dashboard & activity page 2017-10-03 10:28:34 +01:00
venusbb
33a2909a76 reverse code not seperating trial_mode_services 2017-10-02 14:26:08 +01:00
Chris Hill-Scott
7b12b7e03d Merge pull request #1513 from alphagov/add-letters-to-go-live
Add letters to the request to go live page
2017-10-02 10:53:08 +01:00
Leo Hemsted
cf3f4d5cee Merge pull request #1516 from alphagov/empty-inbound-sms
make sure inbound sms page doesn't break if you receive a blank inbou…
2017-09-29 13:51:30 +01:00
Leo Hemsted
57b4971ac1 update conftest and tests to contain accurate test data
specifically, we identify inbound vs outbound by presence of
"notify_number", so ensure that test content actually contains that
field
2017-09-29 10:15:17 +01:00
Pete Herlihy
74992da1c8 Adding acas.org.uk to whitelist 2017-09-29 09:24:07 +01:00
Leo Hemsted
b1e809e82a make sure inbound sms page doesn't break if you receive a blank inbound message 2017-09-28 15:37:18 +01:00
Imdad Ahad
a273cfe951 Merge pull request #1511 from alphagov/imdad-katie-feat-make-add-letter-contact-validation
Make the letter contact block (service settings form) compulsory
2017-09-28 11:23:56 +01:00
Chris Hill-Scott
fb3e7b5fde Add letters to the request to go live page
It’s not either text messages, or emails, or both now – it’s any
combination of the three channels.

This commit adds ‘letters’ as an option on the request to go live page
by changing the radio buttons to a group of checkboxes, so the user can
choose as many or as few as they want.

This commit also does a bunch of housekeeping stuff around the tests for
this page, because they haven’t been touched in quite some time.
2017-09-27 10:46:52 +01:00
Imdad Ahad
fdabe814cc Make the letter contact block (service settings form) compulsory 2017-09-26 14:41:07 +01:00
Chris Hill-Scott
9581a3bb77 Allow services to turn international SMS on/off
We didn’t make this self-service before because the pricing information
wasn’t published (ie we had to send it to services that asked for it).

Now that we publish pricing information in the app, there’s no reason
why services can’t make an informed decision about whether they want
international SMS or not.

So this commit:
- removes the platform admin button
- adds some radio buttons that our users can click with their mice
2017-09-26 14:21:06 +01:00
chrisw
f012ec57c0 Allow user to add multiple reply-to addresses 2017-09-25 17:05:41 +01:00
venusbb
b0e267f677 Fixed tests 2017-09-22 23:09:44 +01:00
Chris Hill-Scott
7327f4b611 Merge pull request #1503 from alphagov/logoless-organisations
Allow creation of an organisation without a logo
2017-09-21 13:01:44 +01:00
Chris Hill-Scott
d01c397bb4 Allow creation of an organisation without a logo
Now we have the org banner branding, not all organisations need a logo.
So it shouldn’t be an error to not provide one.

Depends on:
- [ ] https://github.com/alphagov/notifications-api/pull/1265
2017-09-21 11:57:39 +01:00
Chris Hill-Scott
9b663d0865 Merge pull request #1502 from alphagov/bbsrc
Add Biotechnology and Biological Sciences Research Council to email domain list
2017-09-21 10:21:51 +01:00
Chris Hill-Scott
6d421a0424 Add Biotechnology and Biological Sciences Research Council to email domain list
> BBSRC is an executive non-departmental public body, sponsored by the
> Department for Business, Energy & Industrial Strategy.

– https://www.gov.uk/government/organisations/biotechnology-biological-sciences-research-council
2017-09-20 16:23:18 +01:00
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
8cf29a7d04 Merge branch 'master' into inbound_number_admin 2017-08-21 13:50:49 +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