Commit Graph

2868 Commits

Author SHA1 Message Date
Chris Hill-Scott
61ce4c5a02 Merge pull request #1525 from alphagov/only-mandate-mandatory-columns
Only mandate mandatory address columns
2017-10-04 10:14:39 +01:00
Chris Hill-Scott
775fa1ac2d Merge pull request #1524 from alphagov/key-types-and-letters
Add note about relationship between team API key and letters
2017-10-04 10:14:32 +01:00
Chris Hill-Scott
76bee708af Merge pull request #1523 from alphagov/79-84
79 - 84
2017-10-03 14:13:52 +01:00
Chris Hill-Scott
95f6257852 Merge pull request #1512 from alphagov/email-reply-tweaks
Tweak email reply to pages, add IDs
2017-10-03 14:12:56 +01:00
Chris Hill-Scott
4154dbba1f Only mandate mandatory address columns
If you miss ‘postcode’ from your file then you get told that you need
‘address_line_1’, ‘address_line_2’, ‘address_line_3’, etc.

This is incorrect – the only required address columns are lines 1 and 2,
plus the postcode. So this commit corrects the error message to be
factually accurate.

We had a user report this to Fajer as a bug.
2017-10-03 14:08:25 +01:00
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
Pete Herlihy
cdacdc388a 79 - 84
Pembrokeshire County Council
G Cloud Team
Government Whips' Office
DCLG Housing and Planning Data Collection Team
Returner team - Government Equalities Office
2017-10-03 13:04:17 +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
bb44479b3e disable statsd when testing
or it won't run if you're offline
2017-09-29 10:16:20 +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
Chris Hill-Scott
26d1bda43c Update email-message.scss
Got my first and last mixed up…
2017-09-28 16:15:48 +01:00
Chris Hill-Scott
84a225ffdb Merge pull request #1517 from alphagov/right-padding-email-message
Fix overridden padding on email subject
2017-09-28 16:03:55 +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
Chris Hill-Scott
c35088796a Hide ID when only one reply to address is shown
Most user will only have one reply to address. Which means they should
never have to worry about IDs. And if you only have one then you never
need its ID, because the last remaining address will always be the
default.

So IDs should only be shown when a service has created more than one
reply to address.

This required a bit of visual tweaking of the _user list_ pattern,
because its spacing wasn’t defined in a way that worked when only the
name of the thing, and not its details were shown on the page.
2017-09-28 11:35:52 +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
06caccdd26 Fix overridden padding on email subject
Something in a new version of GOV.UK Elements, Template, or Frontend
Toolkit has introduced a rules which removes padding for the last
column in a table.

This is undesirable in the case of email message previews.
2017-09-28 10:47:33 +01:00
Chris Hill-Scott
c78fac911a Say manage if there’s more than none
‘Change’ as a label for the link is misleading, because this is also the
page you go to in order to get the ID of a given reply to address.
‘Manage’ feels a bit more general.
2017-09-28 10:42:05 +01:00
Chris Hill-Scott
b68784207b Add email reply address to ID to the page
The first users of multiple email reply to addresses will be using the
API. This means that the need to be able to specify the ID of the reply
to address they want.

We chose to implement it like this instead of by passing the address in
directly because that means deploying code. For some teams deploying
code can take weeks, and we’d like to let teams have the flexibility to
make changes faster than this.

Same as for templates, you shouldn’t have to go to the _edit_ page in
order to get the ID. This means listing them on the page where you see
all the reply to addresses.

Listing the IDs like this means that it’s not really a table any more,
because the information isn’t organised in columns. So I think it makes
sense to reuse the pattern from the manage team page, which has a
similar relationship between the information.
2017-09-28 10:42:04 +01:00
Chris Hill-Scott
47ebb6190a Make language consistent
The `is_default` text and text of the checkbox should use the same
terminology (‘email address’ not ‘address’).
2017-09-28 10:42:04 +01:00
Chris Hill-Scott
8d4418cf61 Equalise spacing
Make the amount of space above and below is equal, and consistent with
the spacing when we show the checkbox.
2017-09-28 10:42:04 +01:00
Chris Hill-Scott
e65e98a9f1 Fix indentation 2017-09-28 10:42:03 +01:00
Chris Hill-Scott
8fb55ffa78 Grey out None when email reply to not set
This is consistent with how we differentiate other ‘unset’ values on the
settings page.
2017-09-28 10:42:03 +01:00
Chris Hill-Scott
2f6cf3df38 Refactor permissions handling to use sets
We didn’t like the nested conditional way of doing this. So this commit
refactors the way that permissions are set by:

- splitting it up into multiple, clearly named methods
- treating the list of permissions as `set`s, which they naturally are,
  because you can’t have duplicate permissions (this removes a lot of
  the complexity around having to test for membership before removing
  a permission, for example)
2017-09-27 12:02:17 +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
Chris Waszczuk
1dcfae41d1 Merge pull request #1509 from gov-cjwaszczuk/master
Allow user to add multiple reply-to addresses
2017-09-26 09:48:45 +01:00
Chris Hill-Scott
ab6e49ac6a Merge pull request #1508 from alphagov/default-notification-style
Change text style of default banner
2017-09-26 09:29:27 +01:00
chrisw
f012ec57c0 Allow user to add multiple reply-to addresses 2017-09-25 17:05:41 +01:00
Chris Hill-Scott
0b1a08deef Change text style of default banner
The green text looks nicer than the black text.

The bold makes it stand out more.
2017-09-25 15:09:26 +01:00
venusbb
b0e267f677 Fixed tests 2017-09-22 23:09:44 +01:00
venusbb
0895717680 Merge branch 'master' of https://github.com/alphagov/notifications-admin into vb-platform-admin-admin 2017-09-22 15:47:19 +01:00
venusbb
3a1e76ba92 Progress: passed trial_mode to /service end point 2017-09-22 15:46:52 +01:00
Chris Hill-Scott
241e3c2232 Merge pull request #1504 from alphagov/77-78
77-78 for Legal Aid Agency
2017-09-21 15:28:41 +01:00
Pete Herlihy
033872c34e And now to 79 2017-09-21 15:10:42 +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
Pete Herlihy
d5ff02e5f7 77-78 for Legal Aid Agency 2017-09-21 12:08:30 +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
Leo Hemsted
f8fab35ee7 show letters as accepted, not created or sending, on the api page 2017-09-20 14:38:15 +01:00
venusbb
d14bdbe899 Merge branch 'master' of https://github.com/alphagov/notifications-admin into vb-platform-admin-admin 2017-09-19 14:44:06 +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