diff options
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Angus.pm | 5 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Greenwich.pm | 5 | ||||
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Oxfordshire.pm | 4 | ||||
| -rw-r--r-- | perllib/FixMyStreet/SendReport/Angus.pm | 2 | ||||
| -rw-r--r-- | templates/web/oxfordshire/report/_council_sent_info.html | 7 |
5 files changed, 19 insertions, 4 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Angus.pm b/perllib/FixMyStreet/Cobrand/Angus.pm index 138c54660..23d0d2c58 100644 --- a/perllib/FixMyStreet/Cobrand/Angus.pm +++ b/perllib/FixMyStreet/Cobrand/Angus.pm @@ -9,6 +9,11 @@ sub council_area { return 'Angus'; } sub council_name { return 'Angus Council'; } sub council_url { return 'angus'; } +sub base_url { + return FixMyStreet->config('BASE_URL') if FixMyStreet->config('STAGING_SITE'); + return 'https://fix.angus.gov.uk'; +} + sub enter_postcode_text { my ($self) = @_; return 'Enter an Angus postcode, or street name and area'; diff --git a/perllib/FixMyStreet/Cobrand/Greenwich.pm b/perllib/FixMyStreet/Cobrand/Greenwich.pm index 7535a34bf..d23e62138 100644 --- a/perllib/FixMyStreet/Cobrand/Greenwich.pm +++ b/perllib/FixMyStreet/Cobrand/Greenwich.pm @@ -9,6 +9,11 @@ sub council_area { return 'Greenwich'; } sub council_name { return 'Royal Borough of Greenwich'; } sub council_url { return 'greenwich'; } +sub base_url { + return FixMyStreet->config('BASE_URL') if FixMyStreet->config('STAGING_SITE'); + return 'https://fix.royalgreenwich.gov.uk'; +} + sub example_places { return ( 'SE18 6HQ', "Woolwich Road" ); } diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm index c78ae5e09..543dd431a 100644 --- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm +++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm @@ -52,6 +52,8 @@ sub default_show_name { 0 } Returns the number of working days that are expected to elapse between the problem being reported and it being responded to by the council/body. +If the value 'emergency' is returned, a different template block +is triggered that has custom wording. =cut @@ -79,7 +81,7 @@ sub problem_response_days { return 10 if $p->category eq 'Road traffic signs'; return 10 if $p->category eq 'Roads/highways'; return 10 if $p->category eq 'Skips and scaffolding'; - return 10 if $p->category eq 'Street lighting'; + return 'emergency' if $p->category eq 'Street lighting'; return 10 if $p->category eq 'Traffic lights'; # phone if urgent return 10 if $p->category eq 'Traffic'; return 10 if $p->category eq 'Trees'; diff --git a/perllib/FixMyStreet/SendReport/Angus.pm b/perllib/FixMyStreet/SendReport/Angus.pm index 4373c3c37..15441cc1f 100644 --- a/perllib/FixMyStreet/SendReport/Angus.pm +++ b/perllib/FixMyStreet/SendReport/Angus.pm @@ -148,8 +148,6 @@ sub send { my $authresult = $angus_service->AuthenticateJADU(); my $authtoken = $self->get_auth_token( $authresult ); # authenticationtoken, CallerId, CallerAddressId, DeliveryId, DeliveryAddressId, CRMRequestType, JADUXFormRef, PaymentRef, JADUFormFields - my $message = ent(encode_utf8($h->{message})); - my $name = ent(encode_utf8($h->{name})); my $result = $angus_service->CreateServiceRequest( $authtoken, '1', '1', '1', '1', $self->crm_request_type($row, $h), 'FMS', '', $self->jadu_form_fields($row, $h) diff --git a/templates/web/oxfordshire/report/_council_sent_info.html b/templates/web/oxfordshire/report/_council_sent_info.html index 499fd4637..52b20a0af 100644 --- a/templates/web/oxfordshire/report/_council_sent_info.html +++ b/templates/web/oxfordshire/report/_council_sent_info.html @@ -10,7 +10,12 @@ </h3> [% END %] - [% IF c.cobrand.problem_response_days(problem) > 0 %] + [% IF c.cobrand.problem_response_days(problem) == 'emergency' %] + <p> + Thank you for contacting Oxfordshire County Council [% problem.category %], unfortunately we are currently only available to respond to emergency situations which may have an impact on the health and safety of members of the public, these will be dealt with within a 24 hour period.<br /> + Reported faults will continue to be registered on our management system and these will be tackled in coming months. + </p> + [% ELSIF c.cobrand.problem_response_days(problem) > 0 %] <p> Problems in the [% problem.category %] |