1 files changed, 28 insertions, 5 deletions

diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm
index 8d7a418af..efd172640 100644
--- a/perllib/FixMyStreet/SendReport/Open311.pm
+++ b/perllib/FixMyStreet/SendReport/Open311.pm
@@ -9,6 +9,9 @@ use FixMyStreet::App;
 use mySociety::Config;
 use DateTime::Format::W3CDTF;
 use Open311;
+use Readonly;
+
+Readonly::Scalar my $COUNCIL_ID_OXFORDSHIRE => 2237;
 
 sub should_skip {
     my $self = shift;
@@ -34,7 +37,7 @@ sub send {
         my $send_notpinpointed  = 0;
         my $use_service_as_deviceid = 0;
 
-        my $basic_desc = 0;
+        my $extended_desc = 1;
 
         # Extra bromley fields
         if ( $row->council =~ /2482/ ) {
@@ -64,7 +67,22 @@ sub send {
                 push @$extra, { name => 'last_name', value => $lastname };
             }
 
-            $basic_desc = 1;
+            $extended_desc = 0;
+        }
+
+        # extra Oxfordshire fields: send nearest street, postcode, northing and easting, and the FMS id
+        if ( $row->council =~ /$COUNCIL_ID_OXFORDSHIRE/ ) {
+
+            my $extra = $row->extra;
+            push @$extra, { name => 'external_id', value => $row->id };
+            push @$extra, { name => 'closest_address', value => $h->{closest_address} } if $h->{closest_address};
+            if ( $row->used_map || ( !$row->used_map && !$row->postcode ) ) {
+                push @$extra, { name => 'northing', value => $h->{northing} };
+                push @$extra, { name => 'easting', value => $h->{easting} };
+            }
+            $row->extra( $extra );
+
+            $extended_desc = 'oxfordshire';
         }
 
         # FIXME: we've already looked this up before
@@ -81,7 +99,7 @@ sub send {
             always_send_latlong     => $always_send_latlong,
             send_notpinpointed      => $send_notpinpointed,
             use_service_as_deviceid => $use_service_as_deviceid,
-            basic_description       => $basic_desc,
+            extended_description    => $extended_desc,
         );
 
         # non standard west berks end points
@@ -89,20 +107,25 @@ sub send {
             $open311->endpoints( { services => 'Services', requests => 'Requests' } );
         }
 
+        # non-standard Oxfordshire endpoint (because it's just a script, not a full Open311 service)
+        if ( $row->council =~ /$COUNCIL_ID_OXFORDSHIRE/ ) {
+            $open311->endpoints( { requests => 'open311_service_request.cgi' } );
+        }
+
         # required to get round issues with CRM constraints
         if ( $row->council =~ /2218/ ) {
             $row->user->name( $row->user->id . ' ' . $row->user->name );
         }
 
         if ($row->cobrand eq 'fixmybarangay') {
-            # FixMyBarangay endpoints expect external_id as an attribute
+            # FixMyBarangay endpoints expect external_id as an attribute, as do Oxfordshire
             $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/ || $row->cobrand eq 'fixmybarangay') {
+        if ( $row->council =~ /(2218|2482|$COUNCIL_ID_OXFORDSHIRE)/ || $row->cobrand eq 'fixmybarangay') {
             $row->discard_changes();
         }