<I><FONT SIZE=-1>(default service address)</FONT><BR>
% }
- <% $loc->address1 |h %><BR>
-
-% if ( $loc->address2 !~ /^\s*$/ ) {
- <% $loc->address2 |h %><BR>
-% }
-
- <% $loc->city |h %><% $loc->county ? ' ('.$loc->county.' county)' : '' |h %>,
- <% $loc->state |h %> <% $loc->zip |h %><BR>
-
-% if ( $loc->country ne $countrydefault ) {
- <% code2country( $loc->country ) %>
-% }
+ <% $loc->location_label( 'join_string' => '<BR>',
+ 'double_space' => ' ',
+ 'escape_function' => \&encode_entities,
+ 'countrydefault' => $countrydefault,
+ )
+ %>
+% unless ( $cust_pkg->locationnum ) {
</I>
+% }
% if ( ! $cust_pkg->get('cancel')
% && $FS::CurrentUser::CurrentUser->access_right('Change customer package')
my %opt = @_;
-my $conf = new FS::Conf;
-
my $bgcolor = $opt{'bgcolor'};
my $cust_pkg = $opt{'cust_pkg'};
-my $part_pkg = $opt{'part_pkg'};
-my $conf = new FS::Conf;
-my $countrydefault = $conf->config('countrydefault') || 'US';
-my $statedefault = $conf->config('statedefault')
+my $countrydefault = $opt{'countrydefault'} || 'US';
+my $statedefault = $opt{'statedefault'}
|| ($countrydefault eq 'US' ? 'CA' : '');
my $loc = $cust_pkg->cust_location_or_main;