[Kingston] Show removals on request summary page.

Author: dracos

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

@@ -45,8 +45,6 @@ has_page how_much => (
         return 'how_many' if $how_much eq 'less1';
         return 'request_static' if $how_much eq '3more';
         $data->{'container-' . CONTAINER_REFUSE_240} = 1;
-        $data->{'quantity-' . CONTAINER_REFUSE_240} = 1;
-        $data->{'removal-' . CONTAINER_REFUSE_240} = 1;
         return 'about_you';
     },
 );
@@ -70,8 +68,6 @@ has_page how_many => (
         my $data = shift;
         return 'request_static' if $data->{how_many} eq 'less5';
         $data->{'container-' . CONTAINER_REFUSE_240} = 1;
-        $data->{'quantity-' . CONTAINER_REFUSE_240} = 1;
-        $data->{'removal-' . CONTAINER_REFUSE_240} = 1;
         return 'about_you';
     },
 );

t/app/controller/waste.t

@@ -291,8 +291,8 @@ FixMyStreet::override_config {
         $mech->get_ok('/waste/12345/request');
         $mech->submit_form_ok({ with_fields => { 'container-9' => 1, 'quantity-9' => 2, 'container-10' => 1, 'quantity-10' => 1 } });
         $mech->submit_form_ok({ with_fields => { name => "Test McTest", email => $user->email } });
-        $mech->content_like(qr{Outside Food Waste Container</dt>\s*<dd[^>]*>1</dd>});
-        $mech->content_like(qr{Kitchen Caddy</dt>\s*<dd[^>]*>2</dd>});
+        $mech->content_like(qr{Outside Food Waste Container</dt>\s*<dd[^>]*>\s*1\s*</dd>});
+        $mech->content_like(qr{Kitchen Caddy</dt>\s*<dd[^>]*>\s*2\s*</dd>});
         $mech->submit_form_ok({ with_fields => { process => 'summary' } });
         $mech->content_contains('Now check your email');
         my $link = $mech->get_link_from_email; # Only one email sent, this also checks

t/app/controller/waste_kingston_r.t

@@ -187,6 +187,12 @@ FixMyStreet::override_config {
         $mech->submit_form_ok({ with_fields => { name => 'Bob Marge', email => $user->email }});
         $mech->content_contains('Continue to payment');
 
+        $mech->content_like(qr/Food waste bin \(outdoor\)<\/dt>\s*<dd[^>]*>\s*2\s*<\/dd>/);
+        $mech->content_like(qr/Green recycling box \(55L\)<\/dt>\s*<dd[^>]*>\s*2\s+to deliver,\s+1 to remove\s*<\/dd>/);
+        $mech->content_like(qr/Black rubbish bin<\/dt>\s*<dd[^>]*>\s*1\s*<\/dd>/);
+        $mech->content_like(qr/Blue lid paper and cardboard bin \(240L\)<\/dt>\s*<dd[^>]*>\s*1\s+to deliver,\s+1 to remove\s*<\/dd>/);
+        $mech->content_like(qr/Green recycling bin \(240L\)<\/dt>\s*<dd[^>]*>\s*1 to remove\s*<\/dd>/);
+
         $mech->waste_submit_check({ with_fields => { process => 'summary' } });
         my $pay_params = $sent_params;
         is scalar @{$pay_params->{items}}, 4, 'right number of line items';

templates/web/base/waste/summary_request.html

@@ -13,6 +13,8 @@
     [% ELSE %]
         [% SET container_id = container.replace('container-', '') %]
         [% SET quantity_key = container.replace('container-', 'quantity-') %]
+        [%# removal-* is used by Kingston %]
+        [% SET removal_key = container.replace('container-', 'removal-') %]
     [% END %]
     <div class="govuk-summary-list__row">
         <dt class="govuk-summary-list__key govuk-summary-list__key--sub">[% containers.$container_id %]</dt>
@@ -21,10 +23,23 @@
       [% ELSIF c.cobrand.moniker == 'sutton' %]
         <dd class="govuk-summary-list__value">[% data.request_reason.ucfirst %]</dd>
       [% ELSE %]
-        <dd class="govuk-summary-list__value">[% data.$quantity_key %]</dd>
+        <dd class="govuk-summary-list__value">
+            [% data.$quantity_key %]
+            [% ' to deliver, ' IF data.$quantity_key AND data.$removal_key %]
+            [% IF data.$removal_key %][% data.$removal_key %] to remove[% END %]
+        </dd>
       [% END %]
     </div>
   [% END %]
+  [% FOR removal IN data.keys.grep('^removal-') %]
+    [% SET container_key = removal.replace('removal-', 'container-') %]
+    [% SET container_id = removal.replace('removal-', '') %]
+    [% NEXT UNLESS data.$removal AND NOT data.$container_key %]
+    <div class="govuk-summary-list__row">
+        <dt class="govuk-summary-list__key govuk-summary-list__key--sub">[% containers.$container_id %]</dt>
+        <dd class="govuk-summary-list__value">[% data.$removal %] to remove</dd>
+    </div>
+  [% END %]
 
   [% IF data.payment %]
     <div class="govuk-summary-list__row">