diff --git a/perllib/FixMyStreet/App/Form/Waste/Garden/Cancel/Bexley.pm b/perllib/FixMyStreet/App/Form/Waste/Garden/Cancel/Bexley.pm index 1cd10736a7..332deae4e7 100644 --- a/perllib/FixMyStreet/App/Form/Waste/Garden/Cancel/Bexley.pm +++ b/perllib/FixMyStreet/App/Form/Waste/Garden/Cancel/Bexley.pm @@ -17,8 +17,8 @@ sub options_reason { my @options = ( 'Price', - 'Service Issues', - 'Moving Out of Borough', + 'Service issues', + 'Moving out of borough', 'Other', ); return map { { label => $_, value => $_ } } @options; diff --git a/perllib/FixMyStreet/App/Form/Waste/GardenTandC.pm b/perllib/FixMyStreet/App/Form/Waste/GardenTandC.pm index 85d1c7d6cd..4a703b677a 100644 --- a/perllib/FixMyStreet/App/Form/Waste/GardenTandC.pm +++ b/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 terms and conditions 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 terms and conditions'; } else { $text = 'I agree to the terms and conditions'; } diff --git a/t/app/controller/waste_bexley_garden.t b/t/app/controller/waste_bexley_garden.t index 499d60dedd..ade2da9f20 100644 --- a/t/app/controller/waste_bexley_garden.t +++ b/t/app/controller/waste_bexley_garden.t @@ -269,10 +269,7 @@ FixMyStreet::override_config { FixMyStreet::Script::Reports::send(); my @emails = $mech->get_email; my $email_body = $mech->get_text_body_from_email($emails[1]); - TODO: { - local $TODO = 'Quantity not yet read in _garden_data.html'; - like $email_body, qr/Number of bin subscriptions: 2/; - } + like $email_body, qr/Number of bin subscriptions: 2/; like $email_body, qr/Bins to be delivered: 2/; like $email_body, qr/Total:.*?$test->{pounds_cost}/; $mech->clear_emails_ok; @@ -352,10 +349,7 @@ FixMyStreet::override_config { FixMyStreet::Script::Reports::send(); my @emails = $mech->get_email; my $email_body = $mech->get_text_body_from_email($emails[1]); - TODO: { - local $TODO = 'Quantity not yet read in _garden_data.html'; - like $email_body, qr/Number of bin subscriptions: 1/; - } + like $email_body, qr/Number of bin subscriptions: 1/; unlike $email_body, qr/Bins to be delivered/; like $email_body, qr/Total:.*?75.00/; }; @@ -392,10 +386,7 @@ FixMyStreet::override_config { FixMyStreet::Script::Reports::send(); my @emails = $mech->get_email; my $email_body = $mech->get_text_body_from_email($emails[1]); - TODO: { - local $TODO = 'Quantity not yet read in _garden_data.html'; - like $email_body, qr/Number of bin subscriptions: 1/; - } + like $email_body, qr/Number of bin subscriptions: 1/; like $email_body, qr/Bins to be removed: 1/; like $email_body, qr/Total:.*?75.00/; }; @@ -551,10 +542,7 @@ FixMyStreet::override_config { } @emails; ok $to_user, 'Email sent to user'; my $email_body = $mech->get_text_body_from_email($to_user); - TODO: { - local $TODO = 'Quantity not yet read in _garden_data.html'; - like $email_body, qr/Number of bin subscriptions: 3/; - } + like $email_body, qr/Number of bin subscriptions: 3/; like $email_body, qr/Bins to be delivered: 1/; unlike $email_body, qr/Bins to be removed/; like $email_body, qr/Total:.*?185.00/; @@ -611,10 +599,7 @@ FixMyStreet::override_config { } @emails; ok $to_user, 'Email sent to user'; my $email_body = $mech->get_text_body_from_email($to_user); - TODO: { - local $TODO = 'Quantity not yet read in _garden_data.html'; - like $email_body, qr/Number of bin subscriptions: 1/; - } + like $email_body, qr/Number of bin subscriptions: 1/; unlike $email_body, qr/Bins to be delivered/; like $email_body, qr/Bins to be removed: 1/; like $email_body, qr/Total:.*?75.00/; @@ -726,10 +711,7 @@ FixMyStreet::override_config { } @emails; ok $to_user, 'Email sent to user'; my $email_body = $mech->get_text_body_from_email($to_user); - TODO: { - local $TODO = 'Quantity not yet read in _garden_data.html'; - like $email_body, qr/Number of bin subscriptions: 1/; - } + like $email_body, qr/Number of bin subscriptions: 1/; unlike $email_body, qr/Bins to be delivered/; like $email_body, qr/Bins to be removed: 1/; like $email_body, qr/Total:.*?75.00/; diff --git a/templates/email/default/waste/_garden_data.html b/templates/email/default/waste/_garden_data.html index 970896a354..022bcb6c55 100644 --- a/templates/email/default/waste/_garden_data.html +++ b/templates/email/default/waste/_garden_data.html @@ -1,5 +1,7 @@ [% - +IF cobrand.moniker == 'bexley'; +SET quantity = report.get_extra_field_value('total_containers'); +ELSE; SET container = report.get_extra_field_value('Paid_Collection_Container_Type'); IF container; SET sacks = (container == 2); @@ -11,6 +13,7 @@ SET quantity = report.get_extra_field_value('Subscription_Details_Quantity'); END; END; +END; SET new_bins = report.get_extra_field_value('new_containers') || 0; SET pro_rata = report.get_extra_field_value('pro_rata'); diff --git a/templates/email/default/waste/other-reported-garden.html b/templates/email/default/waste/other-reported-garden.html index 6a8e1fac20..442f9162e0 100644 --- a/templates/email/default/waste/other-reported-garden.html +++ b/templates/email/default/waste/other-reported-garden.html @@ -96,7 +96,7 @@ [% IF new_bins > 0 ~%]

- [% IF cobrand.moniker == 'brent' OR cobrand.moniker == 'merton' %] + [% IF cobrand.moniker == 'bexley' OR cobrand.moniker == 'brent' OR cobrand.moniker == 'merton' %] We will aim to deliver your [% IF sacks %]sacks[% ELSE %]new bin(s)[% END %] within 10 working days. [% ELSE %] We will aim to deliver your [% IF sacks %]roll of sacks[% ELSE %]new bin(s)[% END %] within 20 working days. diff --git a/templates/email/default/waste/other-reported-garden.txt b/templates/email/default/waste/other-reported-garden.txt index ee97905d15..7f9f2dea66 100644 --- a/templates/email/default/waste/other-reported-garden.txt +++ b/templates/email/default/waste/other-reported-garden.txt @@ -78,7 +78,7 @@ You can check your collection day online: [% cobrand.feature('waste_features').garden_check_bin_day_link %] [% IF new_bins > 0 ~%] -[% IF cobrand.moniker == 'brent' OR cobrand.moniker == 'merton' %] +[% IF cobrand.moniker == 'bexley' OR cobrand.moniker == 'brent' OR cobrand.moniker == 'merton' %] We will aim to deliver your [% IF sacks %]sacks[% ELSE %]new bin(s)[% END %] within 10 working days. [% ELSE %] We will aim to deliver your [% IF sacks %]roll of sacks[% ELSE %]new bin(s)[% END %] within 20 working days. diff --git a/templates/web/base/waste/garden/subscribe_details_bin_desc.html b/templates/web/base/waste/garden/subscribe_details_bin_desc.html index 2cb83ba907..33c661925d 100644 --- a/templates/web/base/waste/garden/subscribe_details_bin_desc.html +++ b/templates/web/base/waste/garden/subscribe_details_bin_desc.html @@ -18,11 +18,18 @@

[% IF cobrand.moniker == 'bexley' %] + Our garden waste bins are brown, have a 240L capacity and are + collected fortnightly, apart from the Christmas and new year period + when there will be 4 weeks between collections.

+ Neighbours can share a garden waste service, but the bin must be put + out at the property that has the contract allocated to them. [% - SET first_bin_discount = garden_costs.first_bin_discount_absolute_amount / 100; + SET first_bin_discount = garden_costs.first_bin_discount_absolute_amount / 100; -%] - Each garden waste bin holds 240 litres of waste. We collect them every 2 weeks.
- Note the first bin costs £[% tprintf('%.2f', first_bin_discount) %] less if you choose to pay by Direct Debit. + [% IF first_bin_discount %] +

+ Note the first bin costs £[% tprintf('%.2f', first_bin_discount) %] less if you choose to pay by Direct Debit. + [% END %] [% ELSIF cobrand.moniker == 'brent' %] Our 240 litre wheelie bins are green, and hold the equivalent of 5 or 6 bags of green garden waste. [% ELSIF cobrand.moniker == 'bromley' %] diff --git a/templates/web/base/waste/garden/subscribe_existing_bin_desc.html b/templates/web/base/waste/garden/subscribe_existing_bin_desc.html index f70d4c06a3..2662f68f17 100644 --- a/templates/web/base/waste/garden/subscribe_existing_bin_desc.html +++ b/templates/web/base/waste/garden/subscribe_existing_bin_desc.html @@ -17,7 +17,13 @@

- [% IF cobrand.moniker == 'brent' %] + [% IF cobrand.moniker == 'bexley' %] + Our garden waste bins are brown, have a 240L capacity and are + collected fortnightly, apart from the Christmas and new year period + when there will be 4 weeks between collections.

+ Neighbours can share a garden waste service, but the bin must be put + out at the property that has the contract allocated to them. + [% ELSIF cobrand.moniker == 'brent' %] Our 240 litre wheelie bins are green, and hold the equivalent of 5 or 6 bags of green garden waste. [% ELSIF cobrand.moniker == 'bromley' %] Our 240 litre wheelie bins have grey sides and a brown top, and hold the diff --git a/templates/web/bexley/waste/garden/cancel.html b/templates/web/bexley/waste/garden/cancel.html new file mode 100644 index 0000000000..99f4173eb1 --- /dev/null +++ b/templates/web/bexley/waste/garden/cancel.html @@ -0,0 +1,8 @@ +[% BLOCK 'content' %] +

+ Please be aware refunds will only be given if a subscription is cancelled within 14 days of the original sign up. +

+ +[% END %] + +[% INCLUDE 'waste/garden/property_page.html' %] diff --git a/templates/web/bexley/waste/garden/subscribe_intro.html b/templates/web/bexley/waste/garden/subscribe_intro.html index 0d5eaec7c8..87313d8a9d 100644 --- a/templates/web/bexley/waste/garden/subscribe_intro.html +++ b/templates/web/bexley/waste/garden/subscribe_intro.html @@ -2,10 +2,13 @@ [% INCLUDE waste/header.html %] [% PROCESS 'govuk/fields.html' %] -[% PROCESS title title=form.title %] +

Garden waste collection service

[% PROCESS errors %] -

Introductory text/links here. +

Use this webform if you want to:

+
[% PROCESS form %]