Merge remote branch 'origin/zurich'

Conflicts:
	bin/open311-populate-service-list
	bin/send-comments
	bin/update-all-reports
	conf/crontab.ugly
	db/schema.sql
	perllib/FixMyStreet/App/Controller/Admin.pm
	perllib/FixMyStreet/App/Controller/Report/New.pm
	perllib/FixMyStreet/App/Controller/Reports.pm
	perllib/FixMyStreet/Cobrand/Default.pm
	perllib/FixMyStreet/Cobrand/LichfieldDC.pm
	perllib/FixMyStreet/DB/Result/Open311conf.pm
	perllib/FixMyStreet/DB/Result/Problem.pm
	perllib/FixMyStreet/DB/ResultSet/Problem.pm
	perllib/FixMyStreet/SendReport.pm
	perllib/FixMyStreet/SendReport/Email.pm
	perllib/FixMyStreet/SendReport/Open311.pm
	perllib/Open311/GetServiceRequestUpdates.pm
	perllib/Open311/PopulateServiceList.pm
	t/app/controller/report_new.t
	t/app/controller/rss.t
	templates/web/bromley/report/display.html
	templates/web/default/admin/council_contacts.html
	templates/web/default/common_header_tags.html
	templates/web/default/dashboard/index.html
	templates/web/default/front/stats.html
	templates/web/default/report/_main.html
	templates/web/default/report/update-form.html
	templates/web/emptyhomes/index.html
	templates/web/emptyhomes/report/display.html
	templates/web/emptyhomes/report/new/councils_text_all.html
	templates/web/emptyhomes/reports/body.html
	templates/web/emptyhomes/reports/index.html
	templates/web/fixmystreet/report/new/fill_in_details_form.html
	templates/web/fixmystreet/report/update-form.html
	web/cobrands/fixmystreet/fixmystreet.js
	web/js/fixmystreet.js

1 files changed, 58 insertions, 0 deletions

diff --git a/perllib/FixMyStreet/SendReport/Zurich.pm b/perllib/FixMyStreet/SendReport/Zurich.pm
new file mode 100644
index 000000000..e0c95283e
--- /dev/null
+++ b/perllib/FixMyStreet/SendReport/Zurich.pm
@@ -0,0 +1,58 @@
+package FixMyStreet::SendReport::Zurich;
+
+use Moose;
+
+BEGIN { extends 'FixMyStreet::SendReport::Email'; }
+
+sub build_recipient_list {
+    my ( $self, $row, $h ) = @_;
+
+    # Only one body ever, most of the time with an email endpoint
+    my $body = @{ $self->bodies }[0];
+    $body = FixMyStreet::App->model("DB::Body")->find( { id => $row->external_body } )
+        if $row->external_body;
+    my $body_email = $body->endpoint;
+
+    my @bodies = $body->bodies;
+    if ($body->parent && @bodies) {
+        # Division, might have an individual contact email address
+        my $contact = FixMyStreet::App->model("DB::Contact")->find( {
+            body_id => $body->id,
+            category => $row->category
+        } );
+        $body_email = $contact->email if $contact && $contact->email;
+    }
+
+    push @{ $self->to }, [ $body_email, $body->name ];
+    return $body_email;
+}
+
+sub get_template {
+    my ( $self, $row ) = @_;
+
+    my $template;
+    if ( $row->state eq 'unconfirmed' || $row->state eq 'confirmed' ) {
+        $template = 'submit.txt';
+    } elsif ( $row->state eq 'in progress' ) {
+        $template = 'submit-in-progress.txt';
+    } elsif ( $row->state eq 'planned' ) {
+        $template = 'submit-feedback-pending.txt';
+    } elsif ( $row->state eq 'closed' ) {
+        $template = 'submit-external.txt';
+        if ( $row->extra->{third_personal} ) {
+            $template = 'submit-external-personal.txt';
+        }
+    }
+
+    my $template_path = FixMyStreet->path_to( "templates", "email", "zurich", $template )->stringify;
+    $template = Utils::read_file( $template_path );
+    return $template;
+}
+
+# Zurich emails come from the site itself
+sub send_from {
+    my ( $self, $row ) = @_;
+    return [ FixMyStreet->config('CONTACT_EMAIL'), FixMyStreet->config('CONTACT_NAME') ];
+}
+
+1;