From 1499010d7e3d57f24e65a416921ad0fc1bf7ef39 Mon Sep 17 00:00:00 2001 From: Moray Jones Date: Fri, 6 Oct 2023 12:52:24 +0100 Subject: [PATCH] [SLWP] Add explanatory text on Location page https://3.basecamp.com/4020879/buckets/33314444/todos/6618280655 --- perllib/FixMyStreet/App/Form/Waste/Bulky/Shared.pm | 1 + t/app/controller/waste_kands_bulky.t | 1 + t/app/controller/waste_peterborough_bulky.t | 1 + templates/web/base/waste/bulky/location.html | 6 ++++++ 4 files changed, 9 insertions(+) create mode 100644 templates/web/base/waste/bulky/location.html diff --git a/perllib/FixMyStreet/App/Form/Waste/Bulky/Shared.pm b/perllib/FixMyStreet/App/Form/Waste/Bulky/Shared.pm index f1a5cf037eb..f5183c729c6 100644 --- a/perllib/FixMyStreet/App/Form/Waste/Bulky/Shared.pm +++ b/perllib/FixMyStreet/App/Form/Waste/Bulky/Shared.pm @@ -38,6 +38,7 @@ has_page choose_date_later => ( has_page location => ( title => 'Location details', + intro => 'bulky/location.html', fields => [ 'location', 'location_photo', 'location_photo_fileid', 'continue' ], next => 'summary', diff --git a/t/app/controller/waste_kands_bulky.t b/t/app/controller/waste_kands_bulky.t index a5affaa6c7c..81bc4d2cd9c 100644 --- a/t/app/controller/waste_kands_bulky.t +++ b/t/app/controller/waste_kands_bulky.t @@ -318,6 +318,7 @@ FixMyStreet::override_config { }, }, ); + $mech->content_contains('Items must be out for collection by 6:30am on the collection day.'); $mech->submit_form_ok({ with_fields => { location => '' } }, 'Will error with a blank location'); $mech->submit_form_ok({ with_fields => { location => 'in the middle of the drive' } }); diff --git a/t/app/controller/waste_peterborough_bulky.t b/t/app/controller/waste_peterborough_bulky.t index b83f1df64e6..5d72791f305 100644 --- a/t/app/controller/waste_peterborough_bulky.t +++ b/t/app/controller/waste_peterborough_bulky.t @@ -1307,6 +1307,7 @@ FixMyStreet::override_config { $mech->submit_form_ok({ with_fields => { chosen_date => '2022-08-26T00:00:00' } }); $mech->submit_form_ok({ with_fields => { 'item_1' => 'Amplifiers', 'item_2' => 'High chairs' } }); $mech->content_contains('a href="peterborough-bulky-waste-tandc.com"'); + $mech->content_lacks('Items must be out for collection by', 'Lacks Kingston/Sutton extra text'); $mech->submit_form_ok({ with_fields => { location => '' } }); $mech->content_contains('tandc', 'Can have a blank location'); $mech->back; diff --git a/templates/web/base/waste/bulky/location.html b/templates/web/base/waste/bulky/location.html new file mode 100644 index 00000000000..302a8e775a2 --- /dev/null +++ b/templates/web/base/waste/bulky/location.html @@ -0,0 +1,6 @@ +[% IF c.cobrand.moniker == 'sutton' || c.cobrand.moniker == 'kingston' %] +[% SET collection_time = c.cobrand.bulky_nice_collection_time %] +

Items must be accessible and clearly visible from the front of your house, placed as close to the pavement as possible (but not on it). Our collections crews will not enter your home or retrieve items from your back garden.

+

If you live in a block of flats, you can place your items (on the morning of collection) in your communal bin store area. If an access code is needed please tell us below.

+

Items must be out for collection by [% collection_time %] on the collection day.

+[% END %]