Remove various UK specific code out of Default cobrand into UK one.

1 files changed, 2 insertions, 46 deletions

diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index d838ec84b..d44c58f37 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -1,8 +1,5 @@
 package FixMyStreet::Cobrand::FixMyStreet;
-use base 'FixMyStreet::Cobrand::Default';
-
-sub area_types          { return qw(DIS LBO MTD UTA CTY COI); }
-sub area_min_generation { 10 }
+use base 'FixMyStreet::Cobrand::UK';
 
 # FixMyStreet should return all cobrands
 sub restriction {
@@ -13,21 +10,6 @@ sub admin_base_url {
     return 'https://secure.mysociety.org/admin/bci/';
 }
 
-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 'London' if $area_info->{type} eq 'LBO';
-
-    return 'Email';
-}
-
 sub all_reports_style { return 'detailed'; }
 
 sub generate_problem_banner {
@@ -56,33 +38,7 @@ sub generate_problem_banner {
     return $banner;
 }
 
-sub process_extras {
-    my $self    = shift;
-    my $ctx     = shift;
-    my $area_id = shift;
-    my $extra   = shift;
-    my $fields  = shift || [];
-
-    if ( $area_id == 2482 ) {
-        my @fields = ( 'fms_extra_title', @$fields );
-        for my $field ( @fields ) {
-            my $value = $ctx->request->param( $field );
+sub allow_crosssell_adverts { return 1; }
 
-            if ( !$value ) {
-                $ctx->stash->{field_errors}->{ $field } = _('This information is required');
-            }
-            push @$extra, {
-                name => $field,
-                description => uc( $field),
-                value => $value || '',
-            };
-        }
-
-        if ( $ctx->request->param('fms_extra_title') ) {
-            $ctx->stash->{fms_extra_title} = $ctx->request->param('fms_extra_title');
-            $ctx->stash->{extra_name_info} = 1;
-        }
-    }
-}
 1;