aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perllib/FixMyStreet/SendReport/EmptyHomes.pm7
-rw-r--r--templates/email/emptyhomes/cy/submit.txt2
-rw-r--r--templates/email/emptyhomes/en-gb/submit.txt2
3 files changed, 10 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/SendReport/EmptyHomes.pm b/perllib/FixMyStreet/SendReport/EmptyHomes.pm
index b29c1fd3c..b116ee206 100644
--- a/perllib/FixMyStreet/SendReport/EmptyHomes.pm
+++ b/perllib/FixMyStreet/SendReport/EmptyHomes.pm
@@ -36,12 +36,17 @@ sub build_recipient_list {
my $area_info = mySociety::MaPit::call('area', $body->area_id);
my $country = $area_info->{country};
if ($country eq 'W') {
- $recips{ 'shelter@' . mySociety::Config::get('EMAIL_DOMAIN') } = 1;
+ $recips{ 'wales@' . mySociety::Config::get('EMAIL_DOMAIN') } = 1;
+ } elsif ($country eq 'S') {
+ $recips{ 'scotland@' . mySociety::Config::get('EMAIL_DOMAIN') } = 1;
} else {
$recips{ 'eha@' . mySociety::Config::get('EMAIL_DOMAIN') } = 1;
}
}
+ # Set address email parameter from added data
+ $h->{address} = $row->extra->{address};
+
return () unless $all_confirmed;
return keys %recips;
}
diff --git a/templates/email/emptyhomes/cy/submit.txt b/templates/email/emptyhomes/cy/submit.txt
index 57c0d58b7..fe430aea6 100644
--- a/templates/email/emptyhomes/cy/submit.txt
+++ b/templates/email/emptyhomes/cy/submit.txt
@@ -34,6 +34,8 @@ E-bost: <?=$values['email']?>
Math o eiddo: <?=$values['category']?>
+Address: <?=$values['address']?>
+
Manylion: <?=$values['detail']?>
<?=$values['closest_address']?>----------
diff --git a/templates/email/emptyhomes/en-gb/submit.txt b/templates/email/emptyhomes/en-gb/submit.txt
index 4bbaed408..a27fffdbf 100644
--- a/templates/email/emptyhomes/en-gb/submit.txt
+++ b/templates/email/emptyhomes/en-gb/submit.txt
@@ -32,6 +32,8 @@ Email: <?=$values['email']?>
Property type: <?=$values['category']?>
+Address: <?=$values['address']?>
+
Details: <?=$values['detail']?>
<?=$values['closest_address']?>----------