Revert "[BANES] Send email when Open311 update submitted."

This reverts commit 6bc39892d7075fac79c0f40b2740de095535329d.

4 files changed, 0 insertions, 60 deletions

diff --git a/bin/send-comments b/bin/send-comments
index fc61169ef..7043df7b8 100755
--- a/bin/send-comments
+++ b/bin/send-comments
@@ -23,8 +23,6 @@ use DateTime;
 use FixMyStreet;
 use FixMyStreet::Cobrand;
 use FixMyStreet::DB;
-use FixMyStreet::Email;
-use FixMyStreet::Map;
 use Open311;
 
 # send_method config values found in by-area config data, for selecting to appropriate method
@@ -34,7 +32,6 @@ use constant SEND_METHOD_OPEN311    => 'Open311';
 use constant COUNCIL_ID_OXFORDSHIRE => 2237;
 use constant COUNCIL_ID_BROMLEY => 2482;
 use constant COUNCIL_ID_LEWISHAM => 2492;
-use constant COUNCIL_ID_BANES => 2551;
 
 # Set up site, language etc.
 my ($verbose, $nomail) = CronFns::options();
@@ -143,7 +140,6 @@ while ( my $body = $bodies->next ) {
         my $id = $o->post_service_request_update( $comment );
 
         if ( $id ) {
-            send_comment_email($comment, $cobrand) if $body->areas->{+COUNCIL_ID_BANES};
             $comment->update( {
                 external_id => $id,
                 whensent    => \'current_timestamp',
@@ -174,50 +170,3 @@ sub retry_timeout {
 
     return 0;
 }
-
-=head2 send_comment_email
-
-Some cobrands (e.g. BANES) want to receive an email for every update that's sent
-via Open311. This function is called after each update is sent, and sends the
-alert-update.txt templated email to the cobrand's update_email (or
-contact_email if update_email isn't defined.)
-
-=cut
-sub send_comment_email {
-    my ($comment, $cobrand) = @_;
-
-    my $handler = $cobrand->call_hook(get_body_handler_for_problem => $comment->problem) or return;
-
-    # Set up map/language so things don't error
-    FixMyStreet::Map::set_map_class($handler->map_type);
-    $handler->set_lang_and_domain( $comment->lang, 1, FixMyStreet->path_to('locale')->stringify );
-    my $to = $cobrand->call_hook('update_email') || $cobrand->contact_email;
-
-    # Construct the data the alert-update email template needs
-    # (bit annoying that we can't just put $comment in data!)
-    my %data = (
-        cobrand => $handler,
-        hide_unsubscribe => 1,
-        data => [ {
-            item_photo => $comment->photo,
-            item_text => $comment->text,
-            item_name => $comment->name,
-            item_anonymous => $comment->anonymous,
-            confirmed => $comment->confirmed,
-            get_first_image_fp => sub { $comment->get_first_image_fp },
-        } ],
-        report => $comment->problem,
-        problem_url => $handler->base_url_for_report($comment->problem) . $comment->problem->url,
-    );
-
-    FixMyStreet::Email::send_cron(
-        FixMyStreet::DB->schema,
-        "alert-update.txt",
-        \%data,
-        { To => $to },
-        undef,
-        0,
-        $handler,
-        $comment->lang,
-    );
-}
diff --git a/perllib/FixMyStreet/Cobrand/BathNES.pm b/perllib/FixMyStreet/Cobrand/BathNES.pm
index 81080bed9..82f79b776 100644
--- a/perllib/FixMyStreet/Cobrand/BathNES.pm
+++ b/perllib/FixMyStreet/Cobrand/BathNES.pm
@@ -19,11 +19,6 @@ sub contact_email {
     return join( '@', 'councilconnect_rejections', 'bathnes.gov.uk' );
 }
 
-sub update_email {
-    my $self = shift;
-    return join( '@', 'highways', 'bathnes.gov.uk' );
-}
-
 sub admin_user_domain { 'bathnes.gov.uk' }
 
 sub base_url {
diff --git a/templates/email/default/alert-update.html b/templates/email/default/alert-update.html
index a2f1c69a9..7ebc9910c 100644
--- a/templates/email/default/alert-update.html
+++ b/templates/email/default/alert-update.html
@@ -14,9 +14,7 @@ INCLUDE '_email_top.html';
   [% start_padded_box %]
   <h1 style="[% h1_style %]">New updates on <a href="[% problem_url %]">[% title %]</a></h1>
   [%~ INCLUDE '_email_comment_list.html' %]
-  [% UNLESS hide_unsubscribe %]
   <p style="[% p_style %]"><a href="[% unsubscribe_url %]">Unsubscribe from alerts about this report</a></p>
-  [% END %]
   [% end_padded_box %]
 </th>
 [% WRAPPER '_email_sidebar.html' object = report %]
diff --git a/templates/email/default/alert-update.txt b/templates/email/default/alert-update.txt
index cfeba2e36..2883fee5e 100644
--- a/templates/email/default/alert-update.txt
+++ b/templates/email/default/alert-update.txt
@@ -19,7 +19,6 @@ please do not reply to it.
 [% signature %]
 
 
-[% IF NOT hide_unsubscribe %]
 Unsubscribe?
 
 We currently email you whenever someone leaves an update on the
@@ -27,4 +26,3 @@ We currently email you whenever someone leaves an update on the
 
 If you no longer wish to receive an email whenever this report is updated,
 please follow this link: [% unsubscribe_url %]
-[% END %]