From 9fbd9dd04b65ce4ae349e63b2d24eafc7a3cac50 Mon Sep 17 00:00:00 2001
From: Dave Arter <davea@mysociety.org>
Date: Wed, 29 May 2024 12:37:34 +0100
Subject: [PATCH] [Bromley][Waste] Move general enquiry form

For FD-3744
---
 t/app/controller/waste_bromley_bulky.t           | 2 +-
 templates/web/bromley/waste/enquiry-problem.html | 1 +
 templates/web/bromley/waste/services.html        | 6 ------
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/t/app/controller/waste_bromley_bulky.t b/t/app/controller/waste_bromley_bulky.t
index edb48b98606..c8e0760ecff 100644
--- a/t/app/controller/waste_bromley_bulky.t
+++ b/t/app/controller/waste_bromley_bulky.t
@@ -255,7 +255,7 @@ FixMyStreet::override_config {
         $mech->submit_form_ok( { with_fields => { address => '12345' } } );
 
         $mech->content_contains('Bulky Waste');
-        $mech->submit_form_ok({ form_number => 2 }); # 'Book Collection'
+        $mech->submit_form_ok; # 'Book Collection'
         $mech->content_contains( 'Before you start your booking',
             'Should be able to access the booking form' );
     };
diff --git a/templates/web/bromley/waste/enquiry-problem.html b/templates/web/bromley/waste/enquiry-problem.html
index f8d33a7d507..0302fe05bd4 100644
--- a/templates/web/bromley/waste/enquiry-problem.html
+++ b/templates/web/bromley/waste/enquiry-problem.html
@@ -20,6 +20,7 @@
     { value = 'Damage to 3rd party', label = 'Someone else’s vehicle was damaged' },
     { value = 'Damage to Property', label = 'My property was damaged' },
     { value = 'Failure to deliver bin', label = 'My bin was not delivered' },
+    { value = 'General Enquiry', label = 'Other' },
 );
 
 PROCESS waste/enquiry.html
diff --git a/templates/web/bromley/waste/services.html b/templates/web/bromley/waste/services.html
index cb8364d53e9..97afb13b782 100644
--- a/templates/web/bromley/waste/services.html
+++ b/templates/web/bromley/waste/services.html
@@ -58,9 +58,3 @@
   </form>
   [% END %]
 [% END %]
-
-  <form method="get" action="[% c.uri_for_action('waste/enquiry', [ property.id ]) %]">
-    <input type="hidden" name="service_id" value="[% unit.service_id %]">
-    <input type="hidden" name="category" id="category" value="General Enquiry">
-    <input type="submit" value="Contact us about a [% unit.service_name FILTER lower %] collection" class="waste-service-descriptor waste-service-link">
-  </form>