Bexley ww ggw misc todos

perllib/FixMyStreet/App/Form/Waste/Garden/Cancel/Bexley.pm

@@ -17,15 +17,14 @@ sub options_reason {
 
     my @options = (
         'Price',
-        'Service Issues',
-        'Moving Out of Borough',
+        'Service issues',
+        'Moving out of borough',
         'Other',
     );
     return map { { label => $_, value => $_ } } @options;
 }
 
 has_field reason_further_details => (
-    required => 1,
     type => 'Text',
     widget => 'Textarea',
     label =>

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

@@ -12,6 +12,8 @@ has_field tandc => (
         my $text;
         if ($cobrand->moniker eq 'brent') {
             $text = 'I agree to the <a href="/about/garden_terms" target="_blank">terms and conditions</a> and accept that if my bin does not display a valid bin sticker, it will not be collected';
+        } elsif ($cobrand->moniker eq 'bexley') {
+            $text = 'I agree to the <a href="https://www.bexley.gov.uk/services/rubbish-and-recycling/garden-waste-collection-service/sign-garden-waste-collection" target="_blank">terms and conditions</a>';
         } else {
             $text = 'I agree to the <a href="/about/garden_terms" target="_blank">terms and conditions</a>';
         }

perllib/FixMyStreet/Cobrand/Bexley.pm

@@ -261,7 +261,7 @@ sub open311_post_send {
     my ($self, $row, $h, $sender) = @_;
 
     # Check Open311 was successful, or if this was the first time a Symology report failed
-    if ($sender->contact->email !~ /^(Confirm|Uniform)/) { # it's a Symology report
+    if ($sender->contact->email !~ /^(Confirm|Uniform|Agile)/) { # it's a Symology report
         # failed at least once, assume email was sent on first failure
         return if $row->send_fail_count;
     } else {

perllib/FixMyStreet/Cobrand/Bexley/Garden.pm

@@ -9,6 +9,8 @@
 use DateTime::Format::Strptime;
 use Integrations::Agile;
 use FixMyStreet::App::Form::Waste::Garden::Cancel::Bexley;
+use Try::Tiny;
+use JSON::MaybeXS;
 
 use Moo::Role;
 with 'FixMyStreet::Roles::Cobrand::SCP',
@@ -32,55 +34,131 @@
     return [ 'GA-140', 'GA-240' ];
 }
 
+sub lookup_subscription_for_uprn {
+    my ($self, $uprn) = @_;
+
+    my $sub = {
+        row => undef,
+
+        email => undef,
+        cost => undef,
+        end_date => undef,
+        customer_external_ref => undef,
+        bins_count => undef,
+    };
+
+
+    my ( $customer, $contract );
+
+    my $results = $self->agile->CustomerSearch($uprn);
+
+    # find the first 'ACTIVATED' Customer with an 'ACTIVE'/'PRECONTRACT' contract
+    my $customers = $results->{Customers} || [];
+    OUTER: for ( @$customers ) {
+        next unless ( $_->{CustomertStatus} // '' ) eq 'ACTIVATED'; # CustomertStatus (sic) options seem to be ACTIVATED/INACTIVE
+        my $contracts = $_->{ServiceContracts} || [];
+        next unless $contracts;
+        $customer = $_;
+        for ( @$contracts ) {
+            next unless $_->{ServiceContractStatus} =~ /(ACTIVE|PRECONTRACT|RENEWALDUE)/; # Options seem to be ACTIVE/NOACTIVE/PRECONTRACT/RENEWALDUE
+            $contract = $_;
+            # use the first matching customer/contract
+            last OUTER if $customer && $contract;
+        }
+    }
+
+    return unless $customer && $contract;
+
+    # XXX should maybe sort by CreatedDate rather than assuming first is OK
+    $sub->{cost} = try {
+        my ($payment) = grep { $_->{PaymentStatus} eq 'Paid' } @{ $contract->{Payments} };
+        return $payment->{Amount};
+    };
+
+    my $parser = DateTime::Format::Strptime->new( pattern => '%d/%m/%Y %H:%M' );
+    $sub->{end_date} = $parser->parse_datetime( $contract->{EndDate} );
+
+    $sub->{customer_external_ref} = $customer->{CustomerExternalReference};
+
+    $sub->{bins_count} = $contract->{WasteContainerQuantity};
+
+    my $c = $self->{c};
+    my $p = $c->model('DB::Problem')->search({
+        category => 'Garden Subscription',
+        extra => { '@>' => encode_json({ "_fields" => [ { name => "uprn", value => $uprn } ] }) },
+        state => { '!=' => 'hidden' },
+        external_id => "Agile-" . ( $contract->{Reference} // '' ),
+    })->order_by('-id')->to_body($c->cobrand->body)->first;
+
+    if ($p) {
+        $self->{c}->stash->{orig_sub} = $sub->{row} = $p;
+    }
+
+    return $sub;
+}
+
 sub garden_current_subscription {
-    my $self = shift;
+    my ($self, $services) = @_;
 
     my $current = $self->{c}->stash->{property}{garden_current_subscription};
     return $current if $current;
 
     my $uprn = $self->{c}->stash->{property}{uprn};
     return undef unless $uprn;
 
-# TODO Fetch active subscription from DB for UPRN
-#      (get_original_sub() in Controller/Waste.pm needs to handle Bexley UPRN).
-#      Could be more than one customer, so match against email.
-#      Could be more than one contract, so match against reference.
-
-    my $results = $self->agile->CustomerSearch($uprn);
-    return undef unless $results && $results->{Customers};
-    my $customer = $results->{Customers}[0];
-    return undef unless $customer && $customer->{ServiceContracts};
-    my $contract = $customer->{ServiceContracts}[0];
-    return unless $contract;
+    my $sub = $self->lookup_subscription_for_uprn($uprn);
+    return undef unless $sub;
 
-    my $parser
-        = DateTime::Format::Strptime->new( pattern => '%d/%m/%Y %H:%M' );
-    my $end_date = $parser->parse_datetime( $contract->{EndDate} );
+    my $garden_due = $self->waste_sub_due( $sub->{end_date} );
 
     # Agile says there is a subscription; now get service data from
     # Whitespace
-    my $services = $self->{c}->stash->{services};
+    my $service_ids = { map { $_->{service_id} => $_ } @$services };
     for ( @{ $self->garden_service_ids } ) {
-        if ( my $srv = $services->{$_} ) {
-            $srv->{customer_external_ref}
-                = $customer->{CustomerExternalReference};
-            $srv->{end_date} = $end_date;
+        if ( my $srv = $service_ids->{$_} ) {
+            $srv->{customer_external_ref} = $sub->{customer_external_ref};
+            $srv->{end_date} = $sub->{end_date};
+            $srv->{garden_bins} = $sub->{bins_count};
+            $srv->{garden_cost} = $sub->{cost};
+            $srv->{garden_due} = $garden_due;
+
             return $srv;
         }
     }
 
-    return {
+    # If we reach here then Whitespace doesn't think there's a garden service for this
+    # property. If Agile does have a subscription then we need to add a service
+    # to the list for this property so the frontend displays it.
+    my $service = {
         agile_only => 1,
-        customer_external_ref => $customer->{CustomerExternalReference},
-        end_date => $end_date,
+        customer_external_ref => $sub->{customer_external_ref},
+        end_date => $sub->{end_date},
+        garden_bins => $sub->{bins_count},
+        garden_cost => $sub->{cost},
+        garden_due  => $garden_due,
+
+        uprn => $uprn,
+        garden_waste => 1,
+        service_description => "Garden waste",
+        service_name => "Brown wheelie bin",
+        service_id => "GA-240",
+        schedule => "Pending",
+        round_schedule => '',
+        next => { pending => 1 },
     };
+    push @$services, $service;
+    $self->{c}->stash->{property}{garden_current_subscription} = $service;
+    $self->{c}->stash->{property}{has_garden_subscription} = 1;
+    return $service;
 }
 
-# TODO This is a placeholder
-sub get_current_garden_bins { 1 }
+sub get_current_garden_bins { shift->garden_current_subscription->{garden_bins} }
 
 sub waste_cancel_asks_staff_for_user_details { 1 }
 
+# TODO Needs to check 14-day window after subscription started
+sub waste_garden_allow_cancellation { 'all' }
+
 sub waste_cancel_form_class {
     'FixMyStreet::App::Form::Waste::Garden::Cancel::Bexley';
 }
@@ -89,10 +167,9 @@
     my ( $self, $data, $type ) = @_;
 
     my $c = $self->{c};
+    my $srv = $self->garden_current_subscription;
 
     if ( $data->{category} eq 'Cancel Garden Subscription' ) {
-        my $srv = $self->garden_current_subscription;
-
         my $parser = DateTime::Format::Strptime->new( pattern => '%d/%m/%Y' );
         my $due_date_str = $parser->format_datetime( DateTime->now->add(days => 1) );
 
@@ -103,9 +180,53 @@
         $c->set_param( 'customer_external_ref', $srv->{customer_external_ref} );
         $c->set_param( 'due_date', $due_date_str );
         $c->set_param( 'reason', $reason );
+
+    } elsif ( $data->{title} =~ /Renew/ ) {
+        $c->set_param( 'type', 'renew' );
+        $c->set_param( 'customer_external_ref', $srv->{customer_external_ref} );
+        $c->set_param( 'total_containers', $data->{bins_wanted} );
+
+    } elsif ( $data->{category} eq 'Garden Subscription' ) {
+        $c->set_param( 'total_containers', $data->{bins_wanted} );
+
     }
 }
 
+sub garden_due_days { 42 }
+
+=head2 waste_sub_due
+
+Returns true/false if now is less than garden_due_days before DATE.
+
+=cut
+
+sub waste_sub_due {
+    my ( $self, $date ) = @_;
+
+    my $now = DateTime->now->set_time_zone( FixMyStreet->local_time_zone );
+    my $sub_end = DateTime::Format::W3CDTF->parse_datetime($date);
+
+    my $diff = $now->delta_days($sub_end)->in_units('days');
+    return $diff <= $self->garden_due_days;
+}
+
+=head2 waste_sub_overdue
+
+Returns true/false if now is past DATE.
+
+=cut
+
+sub waste_sub_overdue {
+    my ( $self, $date ) = @_;
+
+    my $now = DateTime->now->set_time_zone( FixMyStreet->local_time_zone )
+        ->truncate( to => 'day' );
+    my $sub_end = DateTime::Format::W3CDTF->parse_datetime($date)
+        ->truncate( to => 'day' );
+
+    return $now > $sub_end;
+}
+
 =item * You can order a maximum of five bins
 
 =cut

perllib/FixMyStreet/Cobrand/Bexley/Waste.pm

@@ -381,6 +381,7 @@
             },
             assisted_collection => $assisted_collection,
             uprn => $uprn,
+            garden_waste => $container->{description} eq 'Garden waste' ? 1 : 0,
         };
 
         if ($last_dt) {
@@ -398,7 +399,7 @@
         $property->{above_shop} = 1
             if $filtered_service->{service_id} eq 'MDR-SACK';
         $property->{has_garden_subscription} = 1
-            if $filtered_service->{service_description} eq 'Garden waste';
+            if $filtered_service->{garden_waste};
 
         # Frequency of collection
         if ( @round_schedules > 1 ) {
@@ -459,13 +460,13 @@
         ];
     }
 
-    $property->{garden_current_subscription}
-        = $self->garden_current_subscription;
-
     @site_services_filtered = $self->_remove_service_if_assisted_exists(@site_services_filtered);
 
     @site_services_filtered = $self->service_sort(@site_services_filtered);
 
+    $property->{garden_current_subscription}
+        = $self->garden_current_subscription(\@site_services_filtered);
+
     $self->_set_request_containers( $property, @site_services_filtered );
 
     return \@site_services_filtered;

t/app/controller/waste_bexley.t

@@ -359,6 +359,7 @@ FixMyStreet::override_config {
                     date => ignore(),
                 },
                 uprn => ignore(),
+                garden_waste => 0,
             );
             cmp_deeply \@sorted, [
                 {   id             => 8,