Commit Graph

8118 Commits

Author SHA1 Message Date
Pea Tyczynska
77d281f44f Introduce new org types 2019-07-16 17:00:26 +01:00
Katie Smith
42300371b0 Merge pull request #3045 from alphagov/stop-allowing-service-org-type-changes
Stop allowing service org type to be changed
2019-07-16 13:42:09 +01:00
Katie Smith
b6ebbe6f67 Add organisation_type property to Service model
This will return the organisation_type of the service's organisation (if
there is one), or the organisation_type of the service if not.
2019-07-16 11:36:19 +01:00
Katie Smith
53214937a8 Stop allowing the service org type to be changed
The service organisation type will either be the same as the org type of
the service's organisation or will be set by a user when creating a new
service. This removes the ability to change it from the platform admin
settings table.
2019-07-16 11:36:19 +01:00
Chris Hill-Scott
3167c6dc31 Merge pull request #3055 from alphagov/query-string-order
Make query string comparison ignore order
2019-07-15 15:23:55 +01:00
Chris Hill-Scott
c17aa249dc Make query string comparison ignore order
Query string ordering is non-deterministic. This can cause tests to fail
in a non helpful way when we’re comparing two URLs. The values in the
query string can match, but the string won’t because the order is
different. This commit adds some code to split up the URL and check that
each part of it matches, rather than checking the thing as a whole.
2019-07-15 14:38:01 +01:00
Chris Hill-Scott
401c87fd3a Merge pull request #3052 from alphagov/5px
Add a tiny bit more spacing under the folder heading when the user has no template search or channel filters
2019-07-15 11:29:23 +01:00
Chris Hill-Scott
e4abc74b80 Add a tiny bit more spacing under the folder heading when the user has no template search or channel filters 2019-07-12 16:03:52 +01:00
Chris Hill-Scott
886992af17 Merge pull request #3043 from alphagov/add-first-letter-contact-experience
Make adding a ‘letter contact block’ for the first time make sense
2019-07-12 15:14:18 +01:00
Chris Hill-Scott
8307e31cb4 Merge pull request #3051 from alphagov/revise-thanks-wording
Make ‘thanks’ page consistent with support page
2019-07-12 12:04:41 +01:00
karlchillmaid
a68db38dd5 Update 'your message' 2019-07-12 11:43:54 +01:00
Chris Hill-Scott
e1c4e51995 Make ‘thanks’ page consistent with support page
On the support page we now promise that we’ll:
- look at tickets within half an hour
- reply within one working day

The thanks page was always promising a reply within half an hour, during
business hours or an emergency. This commit changes the ‘thanks’ page to
be consistent with the support page.
2019-07-12 11:43:32 +01:00
karlchillmaid
c8a3564329 Merge pull request #3050 from alphagov/contact-call-to-action-update
Make 'contact us' links consistent
2019-07-12 11:30:23 +01:00
Chris Hill-Scott
6cd69be66e Fix tests 2019-07-12 11:10:56 +01:00
Chris Hill-Scott
c286ea5fc4 Merge pull request #3042 from alphagov/how-to-pay-update
Updated How to pay content
2019-07-12 10:49:09 +01:00
Chris Hill-Scott
a63bdb78e7 Merge pull request #3048 from alphagov/reply-to-update
Replace 'email reply-to address' with 'reply-to email address'
2019-07-12 10:47:51 +01:00
karlchillmaid
a425fc75d3 Update 'contact us' content 2019-07-12 10:11:32 +01:00
karlchillmaid
e096ff18fc Update 'contact us' content 2019-07-12 10:09:58 +01:00
karlchillmaid
f1c8768f63 Update 'contact us' content 2019-07-12 10:07:54 +01:00
karlchillmaid
18142e8a92 Update 'contact us' content 2019-07-12 10:06:57 +01:00
karlchillmaid
e90f9a2609 Update 'contact us' 2019-07-12 10:02:11 +01:00
karlchillmaid
318df17712 Update 'contact us' 2019-07-11 15:52:06 +01:00
karlchillmaid
4400a24af1 Update 'Contact us' 2019-07-11 15:50:04 +01:00
karlchillmaid
ba04daa64f Update 'contact us' 2019-07-11 15:45:47 +01:00
karlchillmaid
84c6958930 Add contact us 2019-07-11 15:35:52 +01:00
karlchillmaid
17c76eaed1 Update 'reply-to email address' 2019-07-11 14:21:37 +01:00
karlchillmaid
ba670cdcfc Add link to pricing 2019-07-10 15:16:22 +01:00
karlchillmaid
93acdd6de0 Update purchase order content 2019-07-10 15:01:13 +01:00
Chris Hill-Scott
c9f76e427d Fix tests 2019-07-10 10:18:30 +01:00
karlchillmaid
c4c8a34c46 Update 'reply-to email address' 2019-07-09 16:47:11 +01:00
karlchillmaid
d60675071e Update 'reply-to email address' 2019-07-09 16:43:54 +01:00
karlchillmaid
5195b7bcca Updated 'reply-to email address' 2019-07-09 16:42:38 +01:00
karlchillmaid
82a9f841f4 Update 'reply-to email address' 2019-07-09 16:38:47 +01:00
karlchillmaid
1d471d8797 Update 'reply-to email address' 2019-07-09 16:37:22 +01:00
karlchillmaid
678dfcd156 Update content
Update references to 'reply-to email' and remove negative contractions
2019-07-09 16:35:02 +01:00
karlchillmaid
c1e8f82b0a Change 'email reply-to' to 'reply-to email' 2019-07-09 16:32:10 +01:00
Chris Hill-Scott
04144b55be Merge pull request #3044 from alphagov/count-orgs-and-services-on-choose
Add count of organisations and live services for platform admin user
2019-07-09 14:53:17 +01:00
Chris Hill-Scott
ab624e05d3 Merge pull request #3046 from alphagov/stop-model-hiding-attribute-errors
Stop `JSONModel` hiding attribute errors
2019-07-09 14:53:05 +01:00
Chris Hill-Scott
cca19df73c Stop JSONModel hiding attribute errors
`__getattr__` is called whenever an attribute error is raised.

This means that if something deep inside a property on a model raised
an attribute error, that error would be caught by `__getattr__`, which
would then raise an exception that looked like the property itself
didn’t exist. Very confusing.

The solution seems to be to override `__getattribute__` instead, which
handles _all_ attributes, not just those that aren’t explicitly defined.
We then only intervene if the desired attribute is one of the
`ALLOWED_PROPERTIES`, otherwise falling through to the built in methods
of the underlying `object`.
2019-07-09 14:06:49 +01:00
karlchillmaid
8f982bf042 Add abbreviations 2019-07-08 16:14:43 +01:00
karlchillmaid
4321476491 Update app/templates/views/pricing/how-to-pay.html
Co-Authored-By: Chris Hill-Scott <me@quis.cc>
2019-07-08 16:08:42 +01:00
karlchillmaid
edbb1ee1da Update app/templates/views/pricing/how-to-pay.html
Co-Authored-By: Chris Hill-Scott <me@quis.cc>
2019-07-08 16:08:34 +01:00
karlchillmaid
a6c455fe24 Update app/templates/views/pricing/how-to-pay.html
Co-Authored-By: Chris Hill-Scott <me@quis.cc>
2019-07-08 16:08:26 +01:00
Chris Hill-Scott
c11a43cbc4 Update live services count when service is counted
If we change our mind and decide whether a service should/should not be
counted in the list of live services then we should also drop the cache
which stores the count of how many live services there are.
2019-07-08 14:46:34 +01:00
Chris Hill-Scott
959dd6ac38 Make one method for comma-formatting numbers
We were doing this a few different ways in different places.
2019-07-08 14:46:34 +01:00
Chris Hill-Scott
6d5f542a88 Count of orgs and live services for platform admin
This makes it consistent that an option which contains more options has
a hint about how many options it contains.

Also adds a formatter to get us ready for 1,000 services 🎉
2019-07-08 12:31:31 +01:00
Chris Hill-Scott
b6932912ce Refactor back link into view layer 2019-07-08 11:31:55 +01:00
Chris Hill-Scott
76dd222726 Remove unused variable
Presume this is from when we used to render the letter preview in a
different way. Removing this saves us an API call every time we’re
loading this page.
2019-07-08 11:25:06 +01:00
Chris Hill-Scott
7fef51aa6a Apply sender to template when adding
If you’ve come from a template to add a new letter sender then it’s
because you want those words on that template. This commit adds the
extra API call to make that happen.
2019-07-08 11:20:28 +01:00
Chris Hill-Scott
90f56353ab Always offer option to add new sender
Not sure why we had this logic. We shouldn’t make you jump over to the
settings page if none of the available options are right for this
letter.
2019-07-08 10:48:40 +01:00