8 files changed, 118 insertions, 12 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm
index 3047b195c..f2bb23350 100644
--- a/perllib/FixMyStreet/App/Controller/Around.pm
+++ b/perllib/FixMyStreet/App/Controller/Around.pm
@@ -45,7 +45,7 @@ sub around_index : Path : Args(0) {
           || $c->forward('/location/determine_location_from_pc');
 
     # Check to see if the spot is covered by a council - if not show an error.
-    return unless $c->forward('check_location_is_acceptable');
+    return unless $c->cobrand->moniker eq 'fixmybarangay' || $c->forward('check_location_is_acceptable');
 
     # If we have a partial - redirect to /report/new so that it can be
     # completed.
@@ -204,6 +204,7 @@ sub display_location : Private {
         longitude => $short_longitude,
         clickable => 1,
         pins      => \@pins,
+        area      => $c->cobrand->areas_on_around,
     );
 
     return 1;
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index ede0cd219..b18e6e39f 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -1001,6 +1001,13 @@ sub save_user_and_report : Private {
     # Set unknown to DB unknown
     $report->council( undef ) if $report->council eq '-1';
 
+    # if there is a Message Manager message ID, pass it back to the client view
+    if ($c->cobrand->moniker eq 'fixmybarangay' && $c->req->param('external_source_id')=~/^\d+$/) {
+        $c->stash->{external_source_id} = $c->req->param('external_source_id');
+        $report->external_source_id( $c->req->param('external_source_id') );
+        $report->external_source( $c->config->{MESSAGE_MANAGER_URL} ) ;
+    }
+    
     # save the report;
     $report->in_storage ? $report->update : $report->insert();
 
@@ -1071,7 +1078,13 @@ sub redirect_or_confirm_creation : Private {
     if ( $report->confirmed ) {
         # Subscribe problem reporter to email updates
         $c->forward( 'create_reporter_alert' );
-        my $report_uri = $c->cobrand->base_url_for_report( $report ) . $report->url;
+        my $report_uri;
+
+        if ( $c->cobrand->moniker eq 'fixmybarangay' && $c->user->from_council && $c->stash->{external_source_id}) {
+            $report_uri = $c->uri_for( '/report', $report->id, undef, { external_source_id => $c->stash->{external_source_id} } );
+        } else {
+            $report_uri = $c->cobrand->base_url_for_report( $report ) . $report->url;
+        }
         $c->log->info($report->user->id . ' was logged in, redirecting to /report/' . $report->id);
         $c->res->redirect($report_uri);
         $c->detach;
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index 04265963a..0eff95d48 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -650,6 +650,24 @@ sub example_places {
     return FixMyStreet->config('EXAMPLE_PLACES') || [ 'High Street', 'Main Street' ];
 }
 
+=head2 only_authed_can_create
+
+If true, only users with the from_council flag set are able to create reports.
+
+=cut
+
+sub only_authed_can_create {
+    return 0;
+}
+
+=head2 areas_on_around
+
+If set to an arrayref, will plot those area ID(s) from mapit on all the /around pages.
+
+=cut
+
+sub areas_on_around {}
+
 sub process_extras {}
 
 =head 2 pin_colour
diff --git a/perllib/FixMyStreet/Cobrand/FixMyBarangay.pm b/perllib/FixMyStreet/Cobrand/FixMyBarangay.pm
new file mode 100644
index 000000000..1092a5f07
--- /dev/null
+++ b/perllib/FixMyStreet/Cobrand/FixMyBarangay.pm
@@ -0,0 +1,57 @@
+package FixMyStreet::Cobrand::FixMyBarangay;
+use base 'FixMyStreet::Cobrand::Default';
+
+use strict;
+use warnings;
+
+sub get_council_sender {
+    my ( $self, $area_id, $area_info ) = @_;
+
+    my $send_method;
+
+    my $council_config = FixMyStreet::App->model("DB::Open311conf")->search( { area_id => $area_id } )->first;
+    $send_method = $council_config->send_method if $council_config;
+
+    return $send_method if $send_method;
+
+    return 'Email';
+}
+
+sub path_to_web_templates {
+    my $self = shift;
+    return [
+        FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify,
+        FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify
+    ];
+}
+
+sub country {
+    return 'PH';
+}
+
+sub area_types {
+    return ( 'BGY' );
+}
+
+sub disambiguate_location {
+    return {
+        country => 'ph',
+        bing_country => 'Philippines',
+    };
+}
+
+sub site_title {
+    my ($self) = @_;
+    return 'FixMyBarangay';
+}
+
+sub only_authed_can_create {
+    return 1;
+}
+
+sub areas_on_around {
+    return [ 1, 2 ];
+}
+
+1;
+
diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index 04c137674..00f161dea 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -1,11 +1,19 @@
 package FixMyStreet::Cobrand::FixMyStreet;
 use base 'FixMyStreet::Cobrand::UK';
 
+sub area_types          { return qw(DIS LBO MTD UTA CTY COI); }
+sub area_min_generation { 10 }
+
 # FixMyStreet should return all cobrands
 sub restriction {
     return {};
 }
 
+sub enter_postcode_text {
+    my ( $self ) = @_;
+    return _("Enter a nearby GB postcode, or street name and area");
+}
+
 sub admin_base_url {
     return 'https://secure.mysociety.org/admin/bci/';
 }
diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm
index 91695d7d0..8c9fea282 100644
--- a/perllib/FixMyStreet/DB/Result/Comment.pm
+++ b/perllib/FixMyStreet/DB/Result/Comment.pm
@@ -54,10 +54,6 @@ __PACKAGE__->add_columns(
   { data_type => "boolean", default_value => \"false", is_nullable => 0 },
   "problem_state",
   { data_type => "text", is_nullable => 1 },
-  "external_id",
-  { data_type => "text", is_nullable => 1 },
-  "extra",
-  { data_type => "text", is_nullable => 1 },
   "send_fail_count",
   { data_type => "integer", default_value => 0, is_nullable => 0 },
   "send_fail_reason",
@@ -66,6 +62,10 @@ __PACKAGE__->add_columns(
   { data_type => "timestamp", is_nullable => 1 },
   "whensent",
   { data_type => "timestamp", is_nullable => 1 },
+  "external_id",
+  { data_type => "text", is_nullable => 1 },
+  "extra",
+  { data_type => "text", is_nullable => 1 },
 );
 __PACKAGE__->set_primary_key("id");
 __PACKAGE__->belongs_to(
@@ -82,8 +82,8 @@ __PACKAGE__->belongs_to(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-03-26 15:44:18
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nvkElEgSU6XcLd9znSqhmQ
+# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-07-11 18:53:26
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:tSejJzLxHD/fMWjpa10lfA
 
 __PACKAGE__->filter_column(
     extra => {
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 9ae040acc..c55ed3403 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -85,13 +85,17 @@ __PACKAGE__->add_columns(
   "geocode",
   { data_type => "bytea", is_nullable => 1 },
   "send_fail_count",
-  { data_type => "integer", is_nullable => 1 },
+  { data_type => "integer", default_value => 0, is_nullable => 0 },
   "send_fail_reason",
   { data_type => "text", is_nullable => 1 },
   "send_fail_timestamp",
   { data_type => "timestamp", is_nullable => 1 },
   "send_method_used",
   { data_type => "text", is_nullable => 1 },
+  "external_source",
+  { data_type => "text", is_nullable => 1 },
+  "external_source_id",
+  { data_type => "integer", is_nullable => 1 },
 );
 __PACKAGE__->set_primary_key("id");
 __PACKAGE__->has_many(
@@ -114,8 +118,8 @@ __PACKAGE__->belongs_to(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-05-03 16:05:20
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:EvwI91Ot7SioQWqwnXRTBQ
+# Created by DBIx::Class::Schema::Loader v0.07017 @ 2012-07-12 11:05:48
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:sOVQRjsQJUtpzElZvuCp8Q
 
 # Add fake relationship to stored procedure table
 __PACKAGE__->has_one(
diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm
index 42c103b82..56473cf5f 100644
--- a/perllib/FixMyStreet/SendReport/Open311.pm
+++ b/perllib/FixMyStreet/SendReport/Open311.pm
@@ -94,10 +94,15 @@ sub send {
             $row->user->name( $row->user->id . ' ' . $row->user->name );
         }
 
+        if ($row->cobrand eq 'fixmybarangay') {
+            # FixMyBarangay endpoints expect external_id as an attribute
+            $row->extra( [ { 'name' => 'external_id', 'value' => $row->id  } ]  ); 
+        }
+
         my $resp = $open311->send_service_request( $row, $h, $contact->email );
 
         # make sure we don't save user changes from above
-        if ( $row->council =~ /2218/ || $row->council =~ /2482/ ) {
+        if ( $row->council =~ /2218/ || $row->council =~ /2482/ || $row->cobrand eq 'fixmybarangay') {
             $row->discard_changes();
         }