[Bexley][WW] Allow user to request new containers

perllib/FixMyStreet/App/Controller/Waste.pm

@@ -772,24 +772,35 @@ sub construct_bin_request_form {
 
 sub request : Chained('property') : Args(0) {
     my ($self, $c) = @_;
-    my $field_list = construct_bin_request_form($c);
 
-    $c->stash->{first_page} = 'request';
-    my $next = $c->cobrand->call_hook('waste_request_form_first_next');
-    my $title = $c->cobrand->call_hook('waste_request_form_first_title') || 'Which containers do you need?';
+    my %form_settings
+        = $c->cobrand->call_hook( 'construct_bin_request_form', $c );
+
+    my $field_list = $form_settings{field_list}
+        || construct_bin_request_form($c);
+
+    $c->stash->{first_page} = $form_settings{first_page} || 'request';
 
     my $cls = ucfirst $c->cobrand->council_url;
     $c->stash->{form_class} = "FixMyStreet::App::Form::Waste::Request::$cls";
 
-    $c->stash->{page_list} = [
-        request => {
-            fields => [ grep { ! ref $_ } @$field_list, 'submit' ],
-            title => $title,
-            intro => 'request/intro.html',
-            check_unique_id => 0,
-            next => $next,
-        },
-    ];
+    if ( $form_settings{page_list} ) {
+        $c->stash->{page_list} = $form_settings{page_list};
+    } else {
+        my $next  = $c->cobrand->call_hook('waste_request_form_first_next');
+        my $title = $c->cobrand->call_hook('waste_request_form_first_title')
+            || 'Which containers do you need?';
+
+        $c->stash->{page_list} = [
+            request => {
+                fields => [ grep { ! ref $_ } @$field_list, 'submit' ],
+                title => $title,
+                intro => 'request/intro.html',
+                check_unique_id => 0,
+                next => $next,
+            },
+        ];
+    }
 
     $c->cobrand->call_hook("waste_munge_request_form_pages", $c->stash->{page_list}, $field_list);
     $c->stash->{field_list} = $field_list;

perllib/FixMyStreet/App/Form/Waste/Request.pm

@@ -65,6 +65,8 @@ sub validate {
         $any = 1 if $_->name =~ /^container-/ && ($_->value || $self->saved_data->{$_->name});
         # Kingston special case for change-size-first-page
         $any = 1 if $_->name eq 'how_many_exchange' && ($_->value || $self->saved_data->{$_->name});
+        # Bexley special case for household_size first page
+        $any = 1 if $_->name eq 'household_size' && ($_->value || $self->saved_data->{$_->name});
     }
     $self->add_form_error('Please specify what you need')
         unless $any;

perllib/FixMyStreet/App/Form/Waste/Request/Bexley.pm

@@ -0,0 +1,62 @@
+package FixMyStreet::App::Form::Waste::Request::Bexley;
+
+use utf8;
+use HTML::FormHandler::Moose;
+extends 'FixMyStreet::App::Form::Waste::Request';
+
+has_field category_delivery => (
+    type => 'Hidden',
+    default => 'Request new container',
+);
+
+has_field category_removal => (
+    type => 'Hidden',
+    default => 'Request container removal',
+);
+
+# Shown as first page if property able to order Green Wheelie Bins
+has_page household_size => (
+    title => 'Household size',
+    fields => [ 'household_size', 'continue' ],
+    next => 'request',
+);
+
+has_field household_size => (
+    type => 'Select',
+    widget => 'RadioGroup',
+    label   => 'How many people live at the property?',
+    options => [
+        map {
+            label     => $_,
+            value     => $_,
+        },
+        ( 1..4, '5 or more' )
+    ],
+);
+
+has_page request_reason => (
+    fields => ['request_reason', 'continue'],
+    title => 'Reason for request',
+    next => 'about_you',
+);
+
+has_field request_reason => (
+    type => 'Select',
+    widget => 'RadioGroup',
+    required => 1,
+    label => 'Why do you need new containers?',
+);
+
+sub options_request_reason {
+    my $form = shift;
+
+    my @options = (
+        'My existing bin is too small or big',
+        'My existing bin is damaged',
+        'My existing bin has gone missing',
+        'I have moved into a new development',
+    );
+    return map { { label => $_, value => $_ } } @options;
+}
+
+1;

perllib/FixMyStreet/Cobrand/Bexley.pm

@@ -445,7 +445,9 @@ Missed collection reports are automatically confirmed
 
 sub waste_auto_confirm_report {
     my ($self, $report) = @_;
-    return $report->category eq 'Report missed collection';
+    return $report->category eq 'Report missed collection'
+        || $report->category eq 'Request new container'
+        || $report->category eq 'Request container removal';
 }
 
 1;