2 files changed, 47 insertions, 4 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index af4cdd5aa..7b630d36f 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -124,12 +124,16 @@ sub report_form_ajax : Path('ajax') : Args(0) {
     my $category = $c->render_fragment( 'report/new/category.html');
     my $councils_text = $c->render_fragment( 'report/new/councils_text.html');
     my $has_open311 = keys %{ $c->stash->{category_extras} };
+    my $extra_name_info = $c->stash->{extra_name_info}
+        ? $c->render_fragment('report/new/extra_name.html')
+        : '';
 
     my $body = JSON->new->utf8(1)->encode(
         {
             councils_text   => $councils_text,
             category        => $category,
             has_open311     => $has_open311,
+            extra_name_info => $extra_name_info,
         }
     );
 
@@ -394,6 +398,13 @@ sub initialize_report : Private {
 
     }
 
+    if ( $c->req->param('first_name') && $c->req->param('last_name') ) {
+        $c->stash->{first_name} = $c->req->param('first_name');
+        $c->stash->{last_name} = $c->req->param('last_name');
+
+        $c->req->param( 'name', sprintf( '%s %s', $c->req->param('first_name'), $c->req->param('last_name') ) );
+    }
+
     # Capture whether the map was used
     $report->used_map( $c->req->param('skipped') ? 0 : 1 );
 
@@ -542,14 +553,14 @@ sub setup_categories_and_councils : Private {
         );
         $category_label = _('Property type:');
 
-    } elsif ($first_council->{type} eq 'LBO') {
+    } elsif ($first_council->{id} != 2482 && $first_council->{type} eq 'LBO') {
 
         $area_ids_to_list{ $first_council->{id} } = 1;
         @category_options = (
             _('-- Pick a category --'),
             sort keys %{ Utils::london_categories() }
         );
-        $category_label = _('Category:');
+        $category_label = _('Category');
 
     } else {
 
@@ -579,7 +590,7 @@ sub setup_categories_and_councils : Private {
         if (@category_options) {
             @category_options =
               ( _('-- Pick a category --'), @category_options, _('Other') );
-            $category_label = _('Category:');
+            $category_label = _('Category');
         }
     }
 
@@ -589,6 +600,7 @@ sub setup_categories_and_councils : Private {
     $c->stash->{category_options} = \@category_options;
     $c->stash->{category_extras}  = \%category_extras;
     $c->stash->{category_extras_json}  = encode_json \%category_extras;
+    $c->stash->{extra_name_info} = $first_council->{id} == 2482 ? 1 : 0;
 
     my @missing_details_councils =
       grep { !$area_ids_to_list{$_} }    #
@@ -733,7 +745,7 @@ sub process_report : Private {
         $councils = join( ',', @{ $c->stash->{area_ids_to_list} } ) || -1;
         $report->council( $councils );
 
-    } elsif ( $first_council->{type} eq 'LBO') {
+    } elsif ( $first_council->{id} != 2482 && $first_council->{type} eq 'LBO') {
 
         unless ( Utils::london_categories()->{ $report->category } ) {
             $c->stash->{field_errors}->{category} = _('Please choose a category');
@@ -785,6 +797,8 @@ sub process_report : Private {
             };
         }
 
+        $c->cobrand->process_extras( $c, \@contacts, \@extra );
+
         if ( @extra ) {
             $c->stash->{report_meta} = \@extra;
             $report->extra( \@extra );
@@ -916,6 +930,8 @@ sub check_for_errors : Private {
         %{ $c->stash->{report}->check_for_errors },
     );
 
+    # FIXME: need to check for required bromley fields here
+
     # if they're got the login details wrong when signing in then
     # we don't care about the name field even though it's validated
     # by the user object
diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm
index 15444f556..114c86c28 100644
--- a/perllib/FixMyStreet/App/Controller/Report/Update.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm
@@ -153,6 +153,15 @@ want to move adding these elsewhere
 sub process_update : Private {
     my ( $self, $c ) = @_;
 
+    if ( $c->req->param('first_name' ) && $c->req->param('last_name' ) ) {
+        my $first_name = $c->req->param('first_name');
+        my $last_name = $c->req->param('last_name');
+        $c->req->param('name', sprintf( '%s %s', $first_name, $last_name ) );
+
+        $c->stash->{first_name} = $first_name;
+        $c->stash->{last_name} = $last_name;
+    }
+
     my %params =
       map { $_ => scalar $c->req->param($_) } ( 'update', 'name', 'fixed', 'state', 'reopen' );
 
@@ -185,6 +194,24 @@ sub process_update : Private {
         $update->problem_state( $params{state} );
     }
 
+    if ( $c->req->param('fms_extra_title') ) {
+        my %extras = ();
+        $extras{title} = $c->req->param('fms_extra_title');
+        $extras{email_alerts_required} = $c->req->param('add_alert');
+        $update->extra( \%extras );
+
+        $c->stash->{fms_extra_title} = $c->req->param('fms_extra_title');
+    }
+
+    if ( $c->stash->{ first_name } && $c->stash->{ last_name } ) {
+        my $extra = $update->extra || {};
+        $extra->{first_name} = $c->stash->{ first_name };
+        $extra->{last_name} = $c->stash->{ last_name };
+        $update->extra( $extra );
+    }
+
+    $c->log->debug( 'name is ' . $c->req->param('name') );
+
     $c->stash->{update}        = $update;
     $c->stash->{add_alert}     = $c->req->param('add_alert');