diff --git a/perllib/FixMyStreet/Cobrand/Bexley/Waste.pm b/perllib/FixMyStreet/Cobrand/Bexley/Waste.pm index f3c21f27042..4341b766c72 100644 --- a/perllib/FixMyStreet/Cobrand/Bexley/Waste.pm +++ b/perllib/FixMyStreet/Cobrand/Bexley/Waste.pm @@ -1092,18 +1092,23 @@ sub waste_munge_report_data { my $c = $self->{c}; - my $address = $c->stash->{property}->{address}; - my $service = $c->stash->{services}{$id}{service_name}; + my $property = $c->stash->{property}; + my $address = $property->{address}; + my $service_id = $c->stash->{services}{$id}{service_id}; + my $service_name = $c->stash->{services}{$id}{service_name}; my $uprn = $c->stash->{services}{$id}{uprn}; - $data->{title} = "Report missed $service"; + my $containers = $self->_containers($property); + my $service_description = $containers->{$service_id}->{description}; + $service_description = 'Various' if $service_description =~ /
  • /; + $data->{title} = "$service_name ($service_description)"; $data->{detail} = "$data->{title}\n\n$address"; $c->set_param('uprn', $uprn); $c->set_param('service_id', $id); $c->set_param('location_of_containers', $data->{extra_detail}) if $data->{extra_detail}; - $c->set_param('service_item_name', $c->stash->{services}{$id}{service_id}); + $c->set_param('service_item_name', $service_id); # Check if this property has assisted collections - my $contracts = $self->whitespace->GetSiteContracts($c->stash->{property}{uprn}); + my $contracts = $self->whitespace->GetSiteContracts($property->{uprn}); $c->set_param('assisted_yn', (grep { $_->{ContractID} == 7 } @$contracts) ? 'Yes' : 'No'); } diff --git a/t/app/controller/waste_bexley.t b/t/app/controller/waste_bexley.t index 7360d97b966..59963d31d6d 100644 --- a/t/app/controller/waste_bexley.t +++ b/t/app/controller/waste_bexley.t @@ -6,6 +6,7 @@ use Test::MockTime 'set_fixed_time'; use Test::Output; use FixMyStreet::TestMech; use FixMyStreet::Script::Reports; +use FixMyStreet::Script::Alerts; FixMyStreet::App->log->disable('info'); END { FixMyStreet::App->log->enable('info'); } @@ -846,7 +847,13 @@ FixMyStreet::override_config { 'Submitting missed collection report' ); $mech->content_contains('Missed collection has been reported'); - + FixMyStreet::Script::Reports::send(); + my @emails = $mech->get_email; + my $email; + for my $mail (@emails) { + $email = $mail->as_string if $mail->header('To') =~ 'test@example.com'; + }; + like $email, qr/Brown Caddy \(Food waste\)/, 'Service added to title'; my @reports = FixMyStreet::DB->resultset("Problem")->all; is @reports, 1, 'only one report created'; diff --git a/templates/email/bexley/waste/_sidebar_content.html b/templates/email/bexley/waste/_sidebar_content.html index ff0ae715e72..3d28c3de0c0 100644 --- a/templates/email/bexley/waste/_sidebar_content.html +++ b/templates/email/bexley/waste/_sidebar_content.html @@ -6,7 +6,7 @@ title = title.remove(address); ELSIF is_missed_collection; title = report.title; - title = title.remove('Report missed '); + title = title.remove('Report missed '); # For any older reports END %]

    Bins reported as missed:

    diff --git a/templates/web/base/report/form/photo_upload.html b/templates/web/base/report/form/photo_upload.html index 9331db42c0c..6678844d944 100644 --- a/templates/web/base/report/form/photo_upload.html +++ b/templates/web/base/report/form/photo_upload.html @@ -3,7 +3,10 @@ [% IF field_errors.photo %] diff --git a/templates/web/base/waste/bin_days.html b/templates/web/base/waste/bin_days.html index 8370866b3ad..1326268ac01 100644 --- a/templates/web/base/waste/bin_days.html +++ b/templates/web/base/waste/bin_days.html @@ -15,6 +15,9 @@

    Your bin days

    [% IF c.cobrand.moniker != 'peterborough' %]

    Your collections

    + [% IF c.cobrand.moniker == 'brent' && service_data.size %] +

    Please note all collections can take place between 7am – 10pm.

    + [% END %] [% ELSE %]

    Your collections

    diff --git a/templates/web/nottinghamshirepolice/around/intro.html b/templates/web/nottinghamshirepolice/around/intro.html new file mode 100644 index 00000000000..8c5830d3d2a --- /dev/null +++ b/templates/web/nottinghamshirepolice/around/intro.html @@ -0,0 +1,2 @@ +

    Report, view, or discuss local problems

    +

    (like graffiti, litter, overgrown areas, or low level gardening)

    diff --git a/templates/web/nottinghamshirepolice/index-steps.html b/templates/web/nottinghamshirepolice/index-steps.html new file mode 100644 index 00000000000..5db1fdb96db --- /dev/null +++ b/templates/web/nottinghamshirepolice/index-steps.html @@ -0,0 +1,8 @@ +

    [% loc('How to report a problem') %]

    + +
      +
    1. [% question %]
    2. +
    3. Locate the problem on a map of the area
    4. +
    5. Enter details of the problem; please note that we require images to make our initial assessment, so if possible please attach these
    6. +
    7. We send it to the council on your behalf
    8. +