X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Flocation.html;h=f2d379841b943897f10be1ac75495c2945b22f5d;hb=2e761a72c380dc9d7320ccd822cfe8476534b369;hp=34e3a64c335a6062c8b714c247140d8595cc4cd7;hpb=d5cdad7fae9c5e45701a7e83abeb903d31b7983f;p=freeside.git diff --git a/httemplate/view/cust_main/packages/location.html b/httemplate/view/cust_main/packages/location.html index 34e3a64c3..f2d379841 100644 --- a/httemplate/view/cust_main/packages/location.html +++ b/httemplate/view/cust_main/packages/location.html @@ -1,7 +1,5 @@ - - -% unless ( $cust_pkg->locationnum ) { - (<% mt('default service address') |h %>)
+% if ( $default ) { +
% } <% $loc->location_label( 'join_string' => '
', @@ -24,8 +22,8 @@ % } -% unless ( $cust_pkg->locationnum ) { -
+% if ( $default ) { +
% } % if ( ! $cust_pkg->get('cancel') @@ -41,19 +39,19 @@ % } - <%init> my $conf = new FS::Conf; my %opt = @_; -my $bgcolor = $opt{'bgcolor'}; my $cust_pkg = $opt{'cust_pkg'}; my $countrydefault = $opt{'countrydefault'} || 'US'; my $statedefault = $opt{'statedefault'} || ($countrydefault eq 'US' ? 'CA' : ''); my $loc = $cust_pkg->cust_location_or_main; +# dubious--they should all have a location now +my $default = $cust_pkg->locationnum == $opt{'cust_main'}->ship_locationnum; sub pkg_change_location_link { my $cust_pkg = shift;