Merge branch 'send-report-rewrite' into bromley-new-send-reports

Conflicts:
	bin/send-reports
	perllib/FixMyStreet/Geocode/Bing.pm
	web/js/map-OpenLayers.js

1 files changed, 13 insertions, 0 deletions

diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index c971a5a82..6c0089d26 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -6,6 +6,19 @@ sub restriction {
     return {};
 }
 
+sub get_council_sender {
+    my ( $self, $area_id, $area_info ) = shift;
+
+    my $sender_conf = mySociety::Config::get( 'SENDERS' );
+    return $sender_conf->{ $council } if exists $sender_conf->{ $council };
+
+    return 'London' if $area_info->{type} eq 'LBO';
+
+    return 'Open311' if FixMyStreet::App->model("DB::Open311conf")->search( { area_id => $council, endpoint => { '!=', '' } } )->first;
+
+    return 'Email';
+}
+
 sub generate_problem_banner {
     my ( $self, $problem ) = @_;