diff options
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Bexley.pm | 9 | ||||
| -rw-r--r-- | t/cobrand/bexley.t | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Bexley.pm b/perllib/FixMyStreet/Cobrand/Bexley.pm index 5fc7b37a0..275d7dfaf 100644 --- a/perllib/FixMyStreet/Cobrand/Bexley.pm +++ b/perllib/FixMyStreet/Cobrand/Bexley.pm @@ -165,12 +165,13 @@ sub open311_post_send { $outofhours_email = 1; } elsif ($row->category eq 'Gulley covers' || $row->category eq 'Manhole covers') { my $reportType = $row->get_extra_field_value('reportType') || ''; - $p1_email = 1 if $reportType eq 'Cover missing'; - $p1_email = 1 if $dangerous eq 'Yes'; - $outofhours_email = 1 if $dangerous eq 'Yes'; + if ($reportType eq 'Cover missing' || $dangerous eq 'Yes') { + $p1_email = 1; + $outofhours_email = 1; + } } elsif ($row->category eq 'Damage to kerb' || $row->category eq 'Damaged road' || $row->category eq 'Damaged pavement') { $p1_email = 1; - $outofhours_email = 1 if $dangerous eq 'Yes'; + $outofhours_email = 1; } elsif (!$lighting{$row->category}) { $p1_email = 1 if $dangerous eq 'Yes'; $outofhours_email = 1 if $dangerous eq 'Yes'; diff --git a/t/cobrand/bexley.t b/t/cobrand/bexley.t index f0c8d24e4..b8682edad 100644 --- a/t/cobrand/bexley.t +++ b/t/cobrand/bexley.t @@ -80,13 +80,13 @@ FixMyStreet::override_config { extra => { 'name' => 'dangerous', description => 'Was it dangerous?', 'value' => 'Yes' } }, { category => 'Something dangerous', code => 'DANG', extra => { 'name' => 'dangerous', description => 'Was it dangerous?', 'value' => 'No' } }, - { category => 'Gulley covers', email => ['p1'], code => 'GULL', + { category => 'Gulley covers', email => ['p1', 'outofhours', 'ooh2'], code => 'GULL', extra => { 'name' => 'reportType', description => 'Type of report', 'value' => 'Cover missing' } }, { category => 'Gulley covers', code => 'GULL', extra => { 'name' => 'reportType', description => 'Type of report', 'value' => 'Cover damaged' } }, { category => 'Gulley covers', email => ['p1', 'outofhours', 'ooh2'], code => 'GULL', extra => { 'name' => 'dangerous', description => 'Was it dangerous?', 'value' => 'Yes' } }, - { category => 'Damaged road', code => 'ROAD', email => ['p1'], + { category => 'Damaged road', code => 'ROAD', email => ['p1', 'outofhours', 'ooh2'], extra => { 'name' => 'dangerous', description => 'Was it dangerous?', 'value' => 'No' } }, { category => 'Damaged road', code => 'ROAD', email => ['p1', 'outofhours', 'ooh2'], extra => { 'name' => 'dangerous', description => 'Was it dangerous?', 'value' => 'Yes' } }, |