diff options
| author | Mark Wells <mark@freeside.biz> | 2013-03-27 13:26:46 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2013-03-27 13:26:46 -0700 |
| commit | 6b93f13c012ee4d15216c51136794d8a38726ed6 (patch) | |
| tree | cf3e34410d6379ce7278968074bbfed397a5b688 | |
| parent | c5310e027f5d7264b22640f72c3f1744148045ff (diff) | |
fix non-grouped display of package locations, #22207
| -rw-r--r-- | httemplate/view/cust_main/packages/location.html | 11 | ||||
| -rwxr-xr-x | httemplate/view/cust_main/packages/section.html | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/httemplate/view/cust_main/packages/location.html b/httemplate/view/cust_main/packages/location.html index 34e3a64c3..aa3fabf8e 100644 --- a/httemplate/view/cust_main/packages/location.html +++ b/httemplate/view/cust_main/packages/location.html @@ -1,7 +1,8 @@ <TD CLASS="inv" BGCOLOR="<% $bgcolor %>" WIDTH="20%"> -% unless ( $cust_pkg->locationnum ) { - <I><FONT SIZE=-1>(<% mt('default service address') |h %>)</FONT><BR> +% if ( $default ) { + <DIV STYLE="font-style: italic; font-size: small"> + (<% emt('default service address') %>)<BR> % } <% $loc->location_label( 'join_string' => '<BR>', @@ -24,8 +25,8 @@ </FONT> % } -% unless ( $cust_pkg->locationnum ) { - </I> +% if ( $default ) { + </DIV> % } % if ( ! $cust_pkg->get('cancel') @@ -54,6 +55,8 @@ 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; diff --git a/httemplate/view/cust_main/packages/section.html b/httemplate/view/cust_main/packages/section.html index 52246192f..909798e4b 100755 --- a/httemplate/view/cust_main/packages/section.html +++ b/httemplate/view/cust_main/packages/section.html @@ -84,10 +84,11 @@ my %conf_opt = ( 'manage_link_loc' => scalar($conf->config('svc_broadband-manage_link_loc')), 'manage_link-new_window' => $conf->exists('svc_broadband-manage_link-new_window'), 'maestro-status_test' => $conf->exists('maestro-status_test'), - 'cust_pkg-large_pkg_size' => $conf->config('cust_pkg-large_pkg_size'), + 'cust_pkg-large_pkg_size' => scalar($conf->config('cust_pkg-large_pkg_size')), # for packages.html Change location link 'show_location' => $show_location, ); +warn Dumper \%conf_opt; </%init> |