diff options
Diffstat (limited to 'httemplate')
| -rwxr-xr-x | httemplate/browse/cust_main_county.cgi | 2 | ||||
| -rw-r--r-- | httemplate/edit/bulk-cust_main_county.html | 2 | ||||
| -rw-r--r-- | httemplate/elements/select-country.html | 4 | ||||
| -rw-r--r-- | httemplate/view/cust_main/contacts.html | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi index e8c09e434..522614886 100755 --- a/httemplate/browse/cust_main_county.cgi +++ b/httemplate/browse/cust_main_county.cgi @@ -456,7 +456,7 @@ my %seen_county = (); my @fields = ( sub { my $country = shift->country; return '' if $seen_country{$country}++; - code2country($country). " ($country)"; + FS::geocode_Mixin->code2country($country). " ($country)"; }, #state diff --git a/httemplate/edit/bulk-cust_main_county.html b/httemplate/edit/bulk-cust_main_county.html index 6b5a7c26e..8b1234825 100644 --- a/httemplate/edit/bulk-cust_main_county.html +++ b/httemplate/edit/bulk-cust_main_county.html @@ -109,7 +109,7 @@ my @cust_main_county = @taxnum; my %seen_country = {}; -my @countries = map code2country($_)." ($_)", +my @countries = map FS::geocode_Mixin->code2country($_)." ($_)", grep !$seen_country{$_}++, map $_->country, @cust_main_county; diff --git a/httemplate/elements/select-country.html b/httemplate/elements/select-country.html index f3d98767a..c98147907 100644 --- a/httemplate/elements/select-country.html +++ b/httemplate/elements/select-country.html @@ -98,7 +98,7 @@ Example: <OPTION VALUE="<% $country |h %>" <% $country eq $opt{'country'} ? ' SELECTED' : '' %> - ><% code2country($country). " ($country)" %> + ><% FS::geocode_Mixin->code2country($country). " ($country)" %> % } @@ -130,7 +130,7 @@ my $default = $conf->config('countrydefault') || 'US'; my @all_countries = ( sort { ($b eq $default) <=> ($a eq $default) - or code2country($a) cmp code2country($b) + or FS::geocode_Mixin->code2country($a) cmp FS::geocode_Mixin->code2country($b) } map { $_->country } qsearch({ diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html index 136f634a4..053f0396c 100644 --- a/httemplate/view/cust_main/contacts.html +++ b/httemplate/view/cust_main/contacts.html @@ -106,11 +106,11 @@ <TD ALIGN="right"><% mt('State') |h %></TD> <TD BGCOLOR="#ffffff"><% state_label( $location->state, $location->country ) |h %></TD> <TD ALIGN="right"><% mt('Zip') |h %></TD> - <TD BGCOLOR="#ffffff"><% $location->zip %></TD> + <TD BGCOLOR="#ffffff"><% $location->zip |h %></TD> </TR> <TR> <TD ALIGN="right"><% mt('Country') |h %></TD> - <TD BGCOLOR="#ffffff"><% code2country( $location->country ) %></TD> + <TD BGCOLOR="#ffffff"><% $location->country_full |h %></TD> </TR> % if ( $location->latitude && $location->longitude ) { |