diff --git a/perllib/FixMyStreet/App/Form/Waste/Request/Brent.pm b/perllib/FixMyStreet/App/Form/Waste/Request/Brent.pm index fa66b21629a..0657bce24c3 100644 --- a/perllib/FixMyStreet/App/Form/Waste/Request/Brent.pm +++ b/perllib/FixMyStreet/App/Form/Waste/Request/Brent.pm @@ -83,6 +83,8 @@ has_field request_reason => ( my $choice = $saved_data->{'container-choice'}; my $months = $value eq 'new_build' ? $new_build_ordered_months{$choice} : $ordered_months{$choice}; + return unless $months; + my $events = $echo->GetEventsForObject(PointAddress => $c->stash->{property}{id}, 2936, $months); $events = $c->cobrand->_parse_events($events, { include_closed_requests => 1 }); $saved_data->{ordered_previously} = $events->{request}{$choice} ? 1 : 0; diff --git a/t/cobrand/brent.t b/t/cobrand/brent.t index 7860140f906..eb6a79ea220 100644 --- a/t/cobrand/brent.t +++ b/t/cobrand/brent.t @@ -1397,6 +1397,16 @@ FixMyStreet::override_config { }, ] }); subtest 'test requesting a sack' => sub { + # Ordered previously, but not referred + $echo->mock('GetEventsForObject', sub { [ { + Guid => 'a-guid', + EventTypeId => 2936, + ResolvedDate => { DateTime => '2024-05-17T12:00:00Z' }, + Data => { ExtensibleDatum => { ChildData => { ExtensibleDatum => { + DatatypeName => 'Container Type', + Value => 8, + } } } }, + } ] } ); $mech->get_ok('/waste/12345'); $mech->follow_link_ok({url => 'http://brent.fixmystreet.com/waste/12345/request'}); $mech->submit_form_ok({ with_fields => { 'container-choice' => 8 } }, "Choose sack"); @@ -1417,6 +1427,7 @@ FixMyStreet::override_config { is $report->get_extra_field_value('Container_Request_Notes'), ''; is $report->get_extra_field_value('Container_Request_Quantity'), '1'; is $report->get_extra_field_value('service_id'), '269'; + is $report->get_extra_field_value('request_referral'), ''; }; $echo->mock('GetServiceUnitsForObject' => sub { return [