[SLWP] Tweaks to garden bin day text.

Show container end date if it differs.

Author: dracos

perllib/FixMyStreet/Roles/Cobrand/Echo.pm

@@ -224,13 +224,14 @@ sub bin_services_for_address {
         my $garden_cost = 0;
         my $garden_due;
         my $garden_overdue = 0;
+        my $garden_container_end_date; # Containers may be changing whilst subscription already renewed
         if (lc($service_name) eq 'garden waste') {
             $garden = 1;
             $garden_due = $self->waste_sub_due($schedules->{end_date});
             $garden_overdue = $schedules if $_->{expired};
             if ($self->moniker eq 'sutton' || $self->moniker eq 'kingston') {
                 my $data = Integrations::Echo::force_arrayref($servicetask->{ServiceTaskLines}, 'ServiceTaskLine');
-                ($garden_bins, $garden_sacks, $garden_cost, $garden_container) = $self->garden_container_data_extract($data, $containers, $quantities, $schedules);
+                ($garden_bins, $garden_sacks, $garden_cost, $garden_container, $garden_container_end_date) = $self->garden_container_data_extract($data, $containers, $quantities, $schedules);
             } else {
                 my $data = Integrations::Echo::force_arrayref($servicetask->{Data}, 'ExtensibleDatum');
                 foreach (@$data) {
@@ -256,6 +257,7 @@ sub bin_services_for_address {
             garden_container => $garden_container,
             garden_cost => $garden_cost,
             garden_due => $garden_due,
+            garden_container_end_date => $garden_container_end_date,
             garden_overdue => $garden_overdue,
             request_allowed => $request_allowed,
             requests_open => $open_requests,

perllib/FixMyStreet/Roles/Cobrand/SLWP2.pm

@@ -339,11 +339,12 @@ sub garden_container_data_extract {
     my $costs = WasteWorks::Costs->new({ cobrand => $self });
 
     my $today = DateTime->now->set_time_zone(FixMyStreet->local_time_zone)->strftime("%F");
-    my ($garden_bins, $garden_sacks, $garden_cost, $garden_container);
+    my ($garden_bins, $garden_sacks, $garden_cost, $garden_container, $container_end_date);
     foreach (@$data) {
         my $start_date = construct_bin_date($_->{StartDate})->strftime("%F");
         my $end_date = construct_bin_date($_->{EndDate})->strftime("%F");
         next if $start_date gt $today || $end_date lt $today;
+        $container_end_date = $end_date;
         my $asset_id = $_->{AssetTypeId};
         if ($asset_id == $GARDEN_CONTAINER_IDS{sack}) {
             $garden_sacks = 1;
@@ -359,7 +360,7 @@ sub garden_container_data_extract {
     }
     push @$containers, $garden_container;
     $quantities->{$garden_container} = $garden_bins;
-    return ($garden_bins, $garden_sacks, $garden_cost, $garden_container);
+    return ($garden_bins, $garden_sacks, $garden_cost, $garden_container, $container_end_date);
 }
 
 # We don't have overdue renewals here

templates/web/base/waste/_services_garden_current.html

@@ -1,7 +1,13 @@
 
 <dl class="govuk-summary-list">
     <div class="govuk-summary-list__row">
-      <dt class="govuk-summary-list__key">Subscription</dt>
+      <dt class="govuk-summary-list__key">[%
+        IF c.cobrand.moniker == 'sutton' OR c.cobrand.moniker == 'kingston';
+            'Current subscription';
+        ELSE;
+            'Subscription';
+        END
+      %]</dt>
       <dd class="govuk-summary-list__value">
         [%~ PROCESS 'waste/_services_garden_subscription.html' ~%]
       </dd>

templates/web/base/waste/_services_garden_subscription.html

@@ -1,5 +1,11 @@
 [% IF unit.garden_sacks %]
     £[% tprintf('%.2f', unit.garden_cost) %] per year
 [% ELSE %]
-    £[% tprintf('%.2f', unit.garden_cost) %] per year ([% unit.garden_bins %] [% nget('bin', 'bins', unit.garden_bins) %])
+    £[% tprintf('%.2f', unit.garden_cost) %] per year
+    (
+    [%~ unit.garden_bins %] [% nget('bin', 'bins', unit.garden_bins) ~%]
+    [%~ IF unit.garden_container_end_date AND unit.garden_container_end_date != unit.end_date %],
+    until [% date.format(unit.garden_container_end_date _ ' 00:00:00', '%d %B %Y') ~%]
+    [%~ END ~%]
+    )
 [% END %]