Merge remote-tracking branch 'origin/kands-bulky-setup' into kingston…

…-waste
mysociety · Oct 9, 2023 · 26e913f · 26e913f
2 parents e25c34b + 1499010
commit 26e913f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -0,0 +1,6 @@
+[% IF c.cobrand.moniker == 'sutton' || c.cobrand.moniker == 'kingston' %]
+[% SET collection_time = c.cobrand.bulky_nice_collection_time %]
+<p>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.</p>
+<p>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.</p>
+<p>Items must be out for collection by [% collection_time %] on the collection day.</p>
+[% END %]
-Original file line number
+Diff line change
@@ Expand Up / @@ -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' } });
@@ Expand Down @@