diff options
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Default.pm | 17 | ||||
| -rw-r--r-- | perllib/FixMyStreet/DB/ResultSet/AlertType.pm | 18 |
2 files changed, 21 insertions, 14 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm index 7b55f1180..8597565ad 100644 --- a/perllib/FixMyStreet/Cobrand/Default.pm +++ b/perllib/FixMyStreet/Cobrand/Default.pm @@ -613,6 +613,23 @@ sub find_closest_address_for_rss { return $str; } +=head2 format_postcode + +Takes a postcode string and if it looks like a valid postcode then transforms it +into the canonical postcode. + +=cut + +sub format_postcode { + my ( $self, $postcode ) = @_; + + if ( $postcode ) { + $postcode = mySociety::PostcodeUtil::canonicalise_postcode($postcode) + if $postcode && mySociety::PostcodeUtil::is_valid_postcode($postcode); + } + + return $postcode; +} =head2 council_check Paramters are COUNCILS, QUERY, CONTEXT. Return a boolean indicating whether diff --git a/perllib/FixMyStreet/DB/ResultSet/AlertType.pm b/perllib/FixMyStreet/DB/ResultSet/AlertType.pm index 58a48c2b0..c3d4a3672 100644 --- a/perllib/FixMyStreet/DB/ResultSet/AlertType.pm +++ b/perllib/FixMyStreet/DB/ResultSet/AlertType.pm @@ -91,7 +91,8 @@ sub email_alerts ($) { $data{data} .= $row->{item_text} . "\n\n------\n\n"; # this is ward and council problems } else { - my $postcode = _format_postcode( $row->{postcode} ); + my $postcode = $cobrand->format_postcode( $row->{postcode} ); + $postcode = ", $postcode" if $postcode; $data{data} .= $url . "/report/" . $row->{id} . " - $row->{title}$postcode\n\n"; if ( exists $row->{geocode} && $row->{geocode} && $ref =~ /ward|council/ ) { my $nearest_st = _get_address_from_gecode( $row->{geocode} ); @@ -160,7 +161,8 @@ sub email_alerts ($) { alert_id => $alert->id, parameter => $row->{id}, } ); - my $postcode = _format_postcode( $row->{postcode} ); + my $postcode = $cobrand->format_postcode( $row->{postcode} ); + $postcode = ", $postcode" if $postcode; $data{data} .= $url . "/report/" . $row->{id} . " - $row->{title}$postcode\n\n"; if ( exists $row->{geocode} && $row->{geocode} ) { my $nearest_st = _get_address_from_gecode( $row->{geocode} ); @@ -243,16 +245,4 @@ sub _get_address_from_gecode { return $str; } -sub _format_postcode { - my $postcode = shift; - - if ( $postcode ) { - $postcode = mySociety::PostcodeUtil::canonicalise_postcode($postcode) - if $postcode && mySociety::PostcodeUtil::is_valid_postcode($postcode); - $postcode = ", $postcode"; - } - - return $postcode; -} - 1; |