Kingston/Sutton Echo changes

perllib/FixMyStreet/App/Controller/Waste.pm

@@ -36,8 +36,8 @@ has index_template => (
 
 my %GARDEN_IDS = (
     merton => { bin240 => 26, bin140 => 27, sack => 28 },
-    kingston => { bin240 => 26, bin140 => 27, sack => 28 },
-    sutton => { bin240 => 26, bin140 => 27, sack => 28 },
+    kingston => { bin240 => 39, bin140 => 37, sack => 36 },
+    sutton => { bin240 => 39, bin140 => 37, sack => 36 },
 );
 lock_hash(%GARDEN_IDS);
 
@@ -1361,9 +1361,10 @@ sub process_garden_cancellation : Private {
 
     my $now = DateTime->now->set_time_zone(FixMyStreet->local_time_zone);
     my $end_date_field = $c->cobrand->call_hook(alternative_backend_field_names => 'Subscription_End_Date') || 'Subscription_End_Date';
-    $c->set_param($end_date_field, $now->ymd);
+    $c->set_param($end_date_field, $now->dmy('/'));
 
     my $service = $c->cobrand->garden_current_subscription;
+    # Not actually used by Kingston/Sutton
     if (!$c->stash->{slwp_garden_sacks} || $service->{garden_container} == $GARDEN_IDS{$c->cobrand->moniker}{bin240} || $service->{garden_container} == $GARDEN_IDS{$c->cobrand->moniker}{bin140}) {
         my $bin_count = $c->cobrand->get_current_garden_bins;
         $data->{new_bins} = $bin_count * -1;
@@ -1459,6 +1460,7 @@ sub process_garden_modification : Private {
     my $service = $c->cobrand->garden_current_subscription;
     my $costs = WasteWorks::Costs->new({ cobrand => $c->cobrand, discount => $data->{apply_discount} });
     if ($c->stash->{slwp_garden_sacks} && $service->{garden_container} == $GARDEN_IDS{$c->cobrand->moniker}{sack}) { # SLWP Sack
+        # This must be Kingston
         $data->{bins_wanted} = 1;
         $data->{new_bins} = 1;
         $payment = $costs->sacks($data->{bins_wanted});

perllib/FixMyStreet/App/Form/Waste/Bulky/Shared.pm

@@ -49,7 +49,6 @@ has_page location => (
             $fields->{location} = { required => 1 };
         }
         if ($form->c->cobrand->moniker eq 'kingston' || $form->c->cobrand->moniker eq 'sutton') {
-            $fields->{location}{label} = 'Please tell us where you will place the items for collection (include any access codes the crew will need)';
             $fields->{location}{tags}{hint} = 'For example, ‘On the driveway’';
         }
 

perllib/FixMyStreet/App/Form/Waste/Garden/Modify.pm

@@ -124,10 +124,19 @@ has_field task => (
     label => 'What do you want to do?',
     required => 1,
     widget => 'RadioGroup',
-    options => [
-        { value => 'modify', label => 'Increase or reduce the number of bins in your subscription' },
-        { value => 'cancel', label => 'Cancel your garden waste subscription' },
-    ],
+    options_method => sub {
+        my $self = shift;
+        my $form = $self->form;
+        my $c = $form->c;
+        my @options;
+        if ($c->cobrand->moniker eq 'kingston' || $c->cobrand->moniker eq 'sutton' || $c->cobrand->moniker eq 'brent') {
+            push @options, { value => 'modify', label => 'Increase the number of bins in your subscription' };
+        } else {
+            push @options, { value => 'modify', label => 'Increase or reduce the number of bins in your subscription' };
+        }
+        push @options, { value => 'cancel', label => 'Cancel your garden waste subscription' };
+        return \@options;
+    },
 );
 
 has_field current_bins => (
@@ -181,4 +190,20 @@ has_field submit => (
     order => 999,
 );
 
+sub validate {
+    my $self = shift;
+    my $cobrand = $self->{c}->cobrand->moniker;
+
+    if ($cobrand eq 'kingston' || $cobrand eq 'sutton' || $cobrand eq 'brent') {
+        unless ( $self->field('current_bins')->is_inactive ) {
+            my $total = $self->field('bins_wanted')->value;
+            my $current = $self->field('current_bins')->value;
+            $self->add_form_error('You can only increase the number of bins')
+                if $total <= $current;
+        }
+    }
+
+    $self->next::method();
+}
+
 1;

perllib/FixMyStreet/App/Form/Waste/Garden/Sacks/Choice.pm

@@ -3,6 +3,7 @@ package FixMyStreet::App::Form::Waste::Garden::Sacks::Choice;
 use utf8;
 use HTML::FormHandler::Moose::Role;
 
+# Used by Merton only, below, to default the container choice
 use constant CONTAINER_GARDEN_BIN => 26;
 use constant CONTAINER_GARDEN_BIN_140 => 27;
 use constant CONTAINER_GARDEN_SACK => 28;

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

@@ -18,7 +18,7 @@ use utf8;
 use HTML::FormHandler::Moose;
 extends 'FixMyStreet::App::Form::Waste::Request';
 
-use constant CONTAINER_REFUSE_240 => 2;
+use constant CONTAINER_REFUSE_240 => 3;
 
 =head2 About you
 
@@ -40,7 +40,7 @@ has_page about_you => (
             my $total_paid_quantity = 0;
             foreach (@services) {
                 my ($id) = /container-(.*)/;
-                my $quantity = $data->{"quantity-$id"};
+                my $quantity = $data->{"quantity-$id"} or next;
                 my $names = $c->stash->{containers};
                 if ($names->{$id} !~ /bag|sack|food/i) {
                     $total_paid_quantity += $quantity;
@@ -74,15 +74,21 @@ has_page how_many_exchange => (
     fields => ['how_many_exchange', 'continue'],
     title => 'Black bin size change request',
     intro => 'request/intro.html',
+    post_process => sub {
+        my $form = shift;
+        my $data = $form->saved_data;
+        if ($data) {
+            my $how_many = $data->{"how_many_exchange"} || '';
+            return if $how_many eq 'less5' || $how_many eq '7more';
+            $form->c->cobrand->waste_exchange_bin_setup_data($data, CONTAINER_REFUSE_240);
+        }
+    },
     next => sub {
         my $data = shift;
         my $how_many = $data->{"how_many_exchange"};
         if ($how_many eq 'less5' || $how_many eq '7more') {
             return 'biggest_bin_allowed';
         }
-        $data->{'container-' . CONTAINER_REFUSE_240} = 1;
-        $data->{'quantity-' . CONTAINER_REFUSE_240} = 1;
-        $data->{'removal-' . CONTAINER_REFUSE_240} = 1;
         return 'about_you';
     },
 );