Skip to content

Commit

Permalink
[Brent] Fix collection notice on bin day page.
Browse files Browse the repository at this point in the history
Logic to only display when a property had a domestic collection was
broken so the notice was not appearing at all.
  • Loading branch information
neprune authored and dracos committed Sep 24, 2024
1 parent a67d088 commit 0291878
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
10 changes: 8 additions & 2 deletions templates/web/base/waste/bin_days.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@ <h1 class="govuk-heading-xl">Your bin days</h1>
<div class="waste__collections">
[% IF c.cobrand.moniker != 'peterborough' %]
<h2 class="govuk-heading-l govuk-!-margin-bottom-2">Your collections</h2>
[% IF c.cobrand.moniker == 'brent' && service_data.size && domestic_collection %]
<p>Please note all collections can take place between 7am &ndash; 10pm.</p>
[% IF c.cobrand.moniker == 'brent' && service_data.size %]
[% FOR unit IN service_data %]
[% IF unit.service_id == 262 ~%]
[% domestic_collection = 1 ~%]
<p>Please note all collections can take place between 7am &ndash; 10pm.</p>
[% BREAK %]
[% END %]
[% END %]
[% END %]
[% ELSE %]
<div class="govuk-!-margin-bottom-8">
Expand Down
4 changes: 0 additions & 4 deletions templates/web/brent/waste/_services_header.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
[% IF unit.service_id == 262 ~%]
[% domestic_collection = 1 ~%]
[% END ~%]

[% IF c.user.from_body OR c.user.is_superuser %]
<p><a href="[% c.uri_for_action('waste/enquiry', [ property.id ]) %]?category=Staff+general+enquiry&amp;service_id=[% unit.service_id %]">Staff general enquiry</a></p>
<p><a href="[% c.uri_for_action('waste/enquiry', [ property.id ]) %]?category=Additional+collection&amp;service_id=[% unit.service_id %]">Log an additional collection</a></p>
Expand Down

0 comments on commit 0291878

Please sign in to comment.