[Bexley][WW] Change container->bin for container enquiries

t/app/controller/waste_bexley.t

@@ -217,7 +217,7 @@ $contact2->update;
 
 my $contact3 = $mech->create_contact_ok(
     body => $body,
-    category => 'Request container enquiry',
+    category => 'Replacement bin enquiry',
     email => '[email protected]',
     extra => { type => 'waste' },
     group => ['Waste'],
@@ -1193,7 +1193,7 @@ FixMyStreet::override_config {
             my $joined = join('; ', @{$_->{containers}});
             $mech->delete_problems_for_body( $body->id );
             $mech->get_ok("/waste/$_->{id}");
-            $mech->follow_link_ok({ url_regex => qr{/waste/$_->{id}/enquiry\?category=Request\+container\+enquiry} });
+            $mech->follow_link_ok({ url_regex => qr{/waste/$_->{id}/enquiry\?category=Replacement\+bin\+enquiry} });
             $mech->content_contains('Which container(s) do you require?');
             foreach (@{$_->{containers}}) {
                 $mech->content_contains($_);
@@ -1223,7 +1223,7 @@ FixMyStreet::override_config {
             my ($email_submit, $email_logged) = $mech->get_email;
             $email_submit = $mech->get_html_body_from_email($email_submit);
             $email_logged = $mech->get_text_body_from_email($email_logged);
-            like $email_logged, qr{Containers requested: $joined};
+            like $email_logged, qr{Bins requested: $joined};
             like $email_submit, qr{<td>New/replacement container</td> <td>$joined};
             like $email_submit, qr{<td>UPRN</td> <td>$_->{id}</td>}
         };

templates/email/bexley/waste/_email_data.html

@@ -3,7 +3,7 @@
 is_delivery_request = report.category == 'Request new container';
 is_removal_request = report.category == 'Request container removal';
 is_container_request = is_delivery_request || is_removal_request;
-is_request_enquiry = report.category == 'Request container enquiry';
+is_request_enquiry = report.category == 'Replacement bin enquiry';
 is_no_collections_missed_enquiry
     =  report.category == 'Business or organisation missed collection enquiry'
     || report.category == 'Missed collection enquiry';

templates/email/bexley/waste/_report_details.txt

@@ -11,7 +11,7 @@
     key = 'Old bin(s) requested for collection';
     detail = report.title.remove('Request removal of ');
   ELSIF is_request_enquiry;
-    key = 'Containers requested';
+    key = 'Bins requested';
   END;
 %]
 [% key %]:

templates/email/bexley/waste/_sidebar_content.html

@@ -11,7 +11,7 @@
     key = 'Old bin(s) requested for collection';
     detail = report.title.remove('Request removal of ');
   ELSIF is_request_enquiry;
-    key = 'Containers requested';
+    key = 'Bins requested';
   END;
 %]
 <h2 style="[% h2_style %]">[% key %]:</h2>

templates/email/bexley/waste/other-reported.html

@@ -17,7 +17,7 @@ <h1 style="[% h1_style %]">Thank you for reporting a missed collection</h1>
   [% ELSIF is_container_request %]
     <h1 style="[% h1_style %]">Thank you for requesting replacement bins</h1>
   [% ELSIF is_no_collections_missed_enquiry OR is_request_enquiry %]
-    <h1 style="[% h1_style %]">Thank you for your [% report.category %]</h1>
+    <h1 style="[% h1_style %]">Thank you for your [% report.category | lower %]</h1>
   [% ELSE %]
     <h1 style="[% h1_style %]">Your report has been&nbsp;logged</h1>
   [% END %]

templates/email/bexley/waste/other-reported.txt

@@ -1,9 +1,9 @@
 [% PROCESS 'waste/_email_data.html' ~%]
-Subject: [% IF is_missed_collection %]Thank you for reporting a missed collection[% ELSIF is_container_request %]Thank you for requesting a replacement bin[% ELSE %]Thank you for your [% report.category %][% END %]
+Subject: [% IF is_missed_collection %]Thank you for reporting a missed collection[% ELSIF is_container_request %]Thank you for requesting a replacement bin[% ELSE %]Thank you for your [% report.category | lower %][% END %]
 
 Dear [% report.name %],
 
-[% IF is_missed_collection %]Thank you for reporting a missed collection[% ELSIF is_container_request %]Thank you for requesting a replacement bin[% ELSE %]Thank you for your [% report.category %][% END %].
+[% IF is_missed_collection %]Thank you for reporting a missed collection[% ELSIF is_container_request %]Thank you for requesting a replacement bin[% ELSE %]Thank you for your [% report.category | lower %][% END %].
 
 [% INCLUDE 'waste/_council_reference.txt' problem=report %]
 

templates/web/bexley/waste/_more_services_sidebar.html

@@ -6,7 +6,7 @@ <h3>More services</h3>
   <li><a [% external_new_tab | safe %] href="https://mybexley.bexley.gov.uk/service/rubbish_and_recycling_enquiries">Report an issue with your collection service</a></li>
 
   [% IF property.is_communal OR NOT service_data.size %]
-    <li><a href="[% c.uri_for_action('waste/enquiry', [ property.id ]) %]?category=Request+container+enquiry">Order replacement bins, boxes or sacks</a></li>
+    <li><a href="[% c.uri_for_action('waste/enquiry', [ property.id ]) %]?category=Replacement+bin+enquiry">Order replacement bins, boxes or sacks</a></li>
   [% ELSE %]
     [% IF property.containers_for_delivery.size %]
       <li><a [% external_new_tab | safe %] href="[% c.uri_for_action('waste/request', [ property.id ]) %]?request_type=delivery">Order replacement bins, boxes or sacks</a></li>