Skip to content

Commit af6da21

Browse files
committed
[Sutton] Reinstate collection frequency.
1 parent d4938e8 commit af6da21

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

t/app/controller/waste_sutton_4443082.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
"ServiceTaskSchedule": {
2121
"ScheduleDescription": "Friday every other week",
2222
"NextInstance": {
23-
"CurrentScheduledDate": { "DateTime": "2022-09-15T23:00:00Z" },
24-
"OriginalScheduledDate": { "DateTime": "2022-09-15T23:00:00Z" }
23+
"CurrentScheduledDate": { "DateTime": "2022-09-15T23:00:00Z", "OffsetMinutes": 60 },
24+
"OriginalScheduledDate": { "DateTime": "2022-09-15T23:00:00Z", "OffsetMinutes": 60 }
2525
},
2626
"LastInstance": {
27-
"CurrentScheduledDate": { "DateTime": "2022-09-02T05:00:00Z" },
28-
"OriginalScheduledDate": { "DateTime": "2022-09-01T23:00:00Z" },
27+
"CurrentScheduledDate": { "DateTime": "2022-09-02T05:00:00Z", "OffsetMinutes": 60 },
28+
"OriginalScheduledDate": { "DateTime": "2022-09-01T23:00:00Z", "OffsetMinutes": 60 },
2929
"Ref": { "Value": { "anyType": [ "22239416", "8280" ] } },
3030
"CompletedDate": { "DateTime": "2022-09-02T06:17:01Z" }
3131
},

t/app/controller/waste_sutton_r.t

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ FixMyStreet::override_config {
125125
set_fixed_time('2022-09-10T12:00:00Z');
126126
$mech->get_ok('/waste/12345');
127127
$mech->content_contains('2 Example Street, Sutton');
128+
$mech->content_contains('Every other Friday');
128129
$mech->content_contains('Friday, 2nd September');
129130
$mech->content_contains('Report a mixed recycling (cans, plastics & glass) collection as missed');
130131
};

templates/web/base/waste/bin_days.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ <h3 class="govuk-heading-l govuk-warning-text__heading">Your subscription is soo
142142
<hr>
143143
<dl class="govuk-summary-list govuk-!-margin-bottom-0">
144144
[% END %]
145-
[% IF unit.schedule %][% IF c.cobrand.moniker != 'sutton' %]
145+
[% IF unit.schedule %]
146146
<div class="govuk-summary-list__row">
147147
<dt class="govuk-summary-list__key">Frequency</dt>
148148
<dd class="govuk-summary-list__value">
@@ -152,7 +152,7 @@ <h3 class="govuk-heading-l govuk-warning-text__heading">Your subscription is soo
152152
[% END %]
153153
</dd>
154154
</div>
155-
[% ELSE %]<!-- [% unit.schedule %] -->[% END %][% END %]
155+
[% END %]
156156
<div class="govuk-summary-list__row">
157157
<dt class="govuk-summary-list__key">Next collection</dt>
158158
<dd class="govuk-summary-list__value">

0 commit comments

Comments
 (0)