WIP [Bexley][WW] Add generic order link for deprecated boxes

mysociety · Nov 11, 2024 · bcdf2a9 · bcdf2a9
1 parent e5d59b7
commit bcdf2a9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/perllib/FixMyStreet/Cobrand/Bexley/Waste.pm b/perllib/FixMyStreet/Cobrand/Bexley/Waste.pm
@@ -1303,6 +1303,7 @@ sub construct_bin_request_form {
 
         $page_list = [
             request => {
+                intro => 'container_delivery_intro.html',
                 fields => [ grep { ! ref $_ } @$delivery_field_list, 'continue' ],
                 title => 'Which containers do you need?',
                 check_unique_id => 0,
@@ -1726,7 +1727,7 @@ sub _set_request_containers {
                 push @containers_for_delivery,
                     _containers_for_requests()->{'Recycling Box Lids'};
 
-                $property->{can_order_lids} = 1;
+                $property->{has_boxes} = 1;
             }
 
             $boxes_done = 1;

diff --git a/t/app/controller/waste_bexley_container_requests.t b/t/app/controller/waste_bexley_container_requests.t
@@ -173,7 +173,7 @@ subtest '_set_request_containers' => sub {
     note 'Checking containers set on property';
     cmp_deeply $property, {
         household_size_check => 1,
-        can_order_lids => 1,
+        has_boxes => 1,
 
         containers_for_delivery => [
             {   name        => 'Green Wheelie Bin',

diff --git a/templates/web/bexley/waste/_more_services_sidebar.html b/templates/web/bexley/waste/_more_services_sidebar.html
@@ -14,7 +14,7 @@ <h3>More services</h3>
     [% IF property.containers_for_removal.size %]
       <li><a [% external_new_tab | safe %] href="[% c.uri_for_action('waste/request', [ property.id ]) %]?request_type=removal">Order removal of old containers</a></li>
     [% END %]
-    [% IF property.can_order_lids %]
+    [% IF property.has_boxes %]
       <li><a [% external_new_tab | safe %] href="[% c.uri_for_action('waste/request', [ property.id ]) %]?request_type=delivery">Order lids for recycling boxes</a></li>
     [% END %]
   [% END %]

diff --git a/templates/web/bexley/waste/_services_request.html b/templates/web/bexley/waste/_services_request.html
@@ -1,4 +1,5 @@
-[% IF unit.delivery_allowed && !unit.delivery_open %]
+[% SET is_box = unit.service_name.match('Box$') %]
+[% IF ( unit.delivery_allowed || is_box ) && !unit.delivery_open %]
   <form method="post" action="[% c.uri_for_action('waste/request', [ property.id ]) %]?request_type=delivery" id="form-[% unit.service_id %]-delivery">
 
     <input type="hidden" name="token" value="[% csrf_token %]">
@@ -10,7 +11,7 @@
       <input type="hidden" name="parent-[% unit.parent_name.replace(' ','-') %]" value="1">
     [% END %]
 
-    <input type="submit" value="Request a new or replacement [% unit.service_name FILTER lower %]" class="waste-service-descriptor waste-service-link">
+    <input type="submit" value="Request a new or replacement [% IF unit.delivery_allowed %][% unit.service_name FILTER lower %][% ELSE %]recycling box[% END %]" class="waste-service-descriptor waste-service-link">
   </form>
 [% END %]
 

diff --git a/templates/web/bexley/waste/container_delivery_intro.html b/templates/web/bexley/waste/container_delivery_intro.html
@@ -0,0 +1,3 @@
+[% IF property.has_boxes %]
+  <p>Certain recycling boxes are being phased out and can no longer be ordered. Please use the box options below.</p>
+[% END %]