Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bexley WW container requests: post go-live amendments #5282

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bexley WW container requests: post go-live amendments #5282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09cfe56
[Bexley][WW] Add link for clinical waste
nephila-nacrea Dec 2, 2024
da34f05
[Bexley][WW] Change container->bin for container enquiries
nephila-nacrea Dec 2, 2024
bff0707
fixup! [Bexley][WW] Change container->bin for container enquiries
nephila-nacrea Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions t/app/controller/waste_bexley.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ $contact2->update;

my $contact3 = $mech->create_contact_ok(
body => $body,
category => 'Request container enquiry',
category => 'Replacement bin enquiry',
email => '[email protected]',
extra => { type => 'waste' },
group => ['Waste'],
Expand Down Expand Up @@ -1229,7 +1229,7 @@ FixMyStreet::override_config {
my $joined = join('; ', @{$_->{containers}});
$mech->delete_problems_for_body( $body->id );
$mech->get_ok("/waste/$_->{id}");
$mech->follow_link_ok({ url_regex => qr{/waste/$_->{id}/enquiry\?category=Request\+container\+enquiry} });
$mech->follow_link_ok({ url_regex => qr{/waste/$_->{id}/enquiry\?category=Replacement\+bin\+enquiry} });
$mech->content_contains('Which container(s) do you require?');
foreach (@{$_->{containers}}) {
$mech->content_contains($_);
Expand Down Expand Up @@ -1259,7 +1259,7 @@ FixMyStreet::override_config {
my ($email_submit, $email_logged) = $mech->get_email;
$email_submit = $mech->get_html_body_from_email($email_submit);
$email_logged = $mech->get_text_body_from_email($email_logged);
like $email_logged, qr{Containers requested: $joined};
like $email_logged, qr{Bins requested: $joined};
like $email_submit, qr{<td>New/replacement container</td> <td>$joined};
like $email_submit, qr{<td>UPRN</td> <td>$_->{id}</td>}
};
Expand Down
2 changes: 1 addition & 1 deletion templates/email/bexley/waste/_email_data.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
is_delivery_request = report.category == 'Request new container';
is_removal_request = report.category == 'Request container removal';
is_container_request = is_delivery_request || is_removal_request;
is_request_enquiry = report.category == 'Request container enquiry';
is_request_enquiry = report.category == 'Replacement bin enquiry';
is_no_collections_missed_enquiry
= report.category == 'Business or organisation missed collection enquiry'
|| report.category == 'Missed collection enquiry';
Expand Down
2 changes: 1 addition & 1 deletion templates/email/bexley/waste/_report_details.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
key = 'Old bin(s) requested for collection';
detail = report.title.remove('Request removal of ');
ELSIF is_request_enquiry;
key = 'Containers requested';
key = 'Bins requested';
END;
%]
[% key %]:
Expand Down
2 changes: 1 addition & 1 deletion templates/email/bexley/waste/_sidebar_content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
key = 'Old bin(s) requested for collection';
detail = report.title.remove('Request removal of ');
ELSIF is_request_enquiry;
key = 'Containers requested';
key = 'Bins requested';
END;
%]
<h2 style="[% h2_style %]">[% key %]:</h2>
Expand Down
4 changes: 3 additions & 1 deletion templates/email/bexley/waste/other-reported.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
<h1 style="[% h1_style %]">Thank you for reporting a missed collection</h1>
[% ELSIF is_container_request %]
<h1 style="[% h1_style %]">Thank you for requesting replacement bins</h1>
[% ELSIF is_no_collections_missed_enquiry OR is_request_enquiry %]
[% ELSIF is_request_enquiry %]
<h1 style="[% h1_style %]">Thank you for your replacement bin enquiry</h1>
[% ELSIF is_no_collections_missed_enquiry %]
<h1 style="[% h1_style %]">Thank you for your [% report.category %]</h1>
[% ELSE %]
<h1 style="[% h1_style %]">Your report has been&nbsp;logged</h1>
Expand Down
4 changes: 2 additions & 2 deletions templates/email/bexley/waste/other-reported.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[% PROCESS 'waste/_email_data.html' ~%]
Subject: [% IF is_missed_collection %]Thank you for reporting a missed collection[% ELSIF is_container_request %]Thank you for requesting a replacement bin[% ELSE %]Thank you for your [% report.category %][% END %]
Subject: [% IF is_missed_collection %]Thank you for reporting a missed collection[% ELSIF is_container_request %]Thank you for requesting a replacement bin[% ELSIF is_request_enquiry %]Thank you for your replacement bin enquiry[% ELSE %]Thank you for your [% report.category %][% END %]

Dear [% report.name %],

[% IF is_missed_collection %]Thank you for reporting a missed collection[% ELSIF is_container_request %]Thank you for requesting a replacement bin[% ELSE %]Thank you for your [% report.category %][% END %].
[% IF is_missed_collection %]Thank you for reporting a missed collection[% ELSIF is_container_request %]Thank you for requesting a replacement bin[% ELSIF is_request_enquiry %]Thank you for your replacement bin enquiry[% ELSE %]Thank you for your [% report.category %][% END %].

[% INCLUDE 'waste/_council_reference.txt' problem=report %]

Expand Down
3 changes: 2 additions & 1 deletion templates/web/bexley/waste/_more_services_sidebar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ <h3>More services</h3>
<li><a [% external_new_tab | safe %] href="https://mybexley.bexley.gov.uk/service/rubbish_and_recycling_enquiries">Report an issue with your collection service</a></li>

[% IF property.is_communal OR NOT service_data.size %]
<li><a href="[% c.uri_for_action('waste/enquiry', [ property.id ]) %]?category=Request+container+enquiry">Order replacement bins, boxes or sacks</a></li>
<li><a href="[% c.uri_for_action('waste/enquiry', [ property.id ]) %]?category=Replacement+bin+enquiry">Order replacement bins, boxes or sacks</a></li>
[% ELSE %]
[% IF property.containers_for_delivery.size %]
<li><a [% external_new_tab | safe %] href="[% c.uri_for_action('waste/request', [ property.id ]) %]?request_type=delivery">Order replacement bins, boxes or sacks</a></li>
Expand All @@ -23,6 +23,7 @@ <h3>More services</h3>
<li><a [% external_new_tab | safe %] href="https://www.bexley.gov.uk/services/rubbish-and-recycling/garden-waste-collection-service/sign-garden-waste-collection">Manage garden waste bins</a></li>
[% END %]

<li><a [% external_new_tab | safe %] href="https://www.bexley.gov.uk/services/rubbish-and-recycling/clinical-waste-collections/get-clinical-waste-collected">Get clinical waste collected</a></li>
<li><a [% external_new_tab | safe %] href="https://www.bexley.gov.uk/services/rubbish-and-recycling/recycling/which-bin-should-i-use">Which bin should I use?</a></li>
<li><a [% external_new_tab | safe %] href="https://www.bexley.gov.uk/services/rubbish-and-recycling/bulky-or-large-item-collections/arrange-bulky-or-large-item-collection">Arrange a bulky waste collection</a></li>
<li><a [% external_new_tab | safe %] href="https://www.bexley.gov.uk/services/rubbish-and-recycling/assisted-collections/help-putting-bins-out">Get help with putting your bins out</a></li>
Expand Down