diff options
Diffstat (limited to 'httemplate/view/cust_main/packages.html')
| -rwxr-xr-x | httemplate/view/cust_main/packages.html | 96 |
1 files changed, 19 insertions, 77 deletions
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html index ce34158d8..383c2a75e 100755 --- a/httemplate/view/cust_main/packages.html +++ b/httemplate/view/cust_main/packages.html @@ -75,61 +75,23 @@ Current packages <TR> <TD COLSPAN=2> - -% if ( @$packages ) { - -<% include('/elements/table-grid.html') %> -% my $bgcolor1 = '#eeeeee'; -% my $bgcolor2 = '#ffffff'; -% my $bgcolor = ''; - -<TR> - <TH CLASS="grid" BGCOLOR="#cccccc">Package</TH> - <TH CLASS="grid" BGCOLOR="#cccccc">Status</TH> -% if ( $show_location ) { - <TH CLASS="grid" BGCOLOR="#cccccc">Location</TH> -% } - <TH CLASS="grid" BGCOLOR="#cccccc">Services</TH> -</TR> - -% #$FS::cust_pkg::DEBUG = 2; -% foreach my $cust_pkg (@$packages) { -% -% if ( $bgcolor eq $bgcolor1 ) { -% $bgcolor = $bgcolor2; -% } else { -% $bgcolor = $bgcolor1; -% } -% -% my %iopt = ( -% 'bgcolor' => $bgcolor, -% 'cust_pkg' => $cust_pkg, -% 'part_pkg' => $cust_pkg->part_pkg, -% %conf_opt, -% ); -% - - <!--pkgnum: <% $cust_pkg->pkgnum %>--> - <TR> - <% include('packages/package.html', %iopt) %> - <% include('packages/status.html', %iopt) %> -% if ( $show_location ) { - <% include('packages/location.html', %iopt) %> +% if ( $conf->exists('cust_pkg-group_by_location') and $show_location ) { +<% include('locations.html', + 'cust_main' => $cust_main, + 'packages' => $packages, +) %> % } - <% include('packages/services.html', %iopt) %> - </TR> - -% } - +% else { +% # in this format, put all packages in one section +<% include('/elements/table-grid.html') %> +<% include('packages/section.html', + 'packages' => $packages, + 'show_location' => $show_location, +) %> </TABLE> - -% } else { -<BR> -% } - +% } </TD> </TR> -</TABLE> % if ( $cgi->param('fragment') =~ /^cust_pkg(\d+)$/ ) { <SCRIPT> @@ -140,42 +102,22 @@ Current packages if ( el ) el.scrollIntoView(true); </SCRIPT> % } - +</TABLE> <%init> -my( $cust_main ) = @_; +my $cust_main = shift; +my %opt = @_; my $conf = new FS::Conf; my $curuser = $FS::CurrentUser::CurrentUser; my( $packages, $num_old_packages ) = get_packages($cust_main, $conf); -my $show_location = $conf->exists('cust_pkg-always_show_location') - || ( grep $_->locationnum, @$packages ); # ? '1' : '0'; -my $countrydefault = scalar($conf->config('countrydefault')) || 'US'; -my %conf_opt = ( - #for services.html and status.html - 'cust_pkg-display_times' => ($conf->exists('cust_pkg-display_times') - || $curuser->option('cust_pkg-display_times')), - #for status.html - 'cust_pkg-show_autosuspend' => $conf->exists('cust_pkg-show_autosuspend'), - #for status.html pkg-balances - 'pkg-balances' => $conf->exists('pkg-balances'), - 'money_char' => ( $conf->config('money_char') || '$' ), - - #for location.html - 'countrydefault' => $countrydefault, - 'statedefault' => ( scalar($conf->config('statedefault')) - || ($countrydefault eq 'US' ? 'CA' : '') ), - #for services.html - 'svc_external-skip_manual' => $conf->exists('svc_external-skip_manual'), - 'legacy_link' => $conf->exists('legacy_link'), - 'svc_broadband-manage_link' => scalar($conf->config('svc_broadband-manage_link')), - 'maestro-status_test' => $conf->exists('maestro-status_test'), - 'cust_pkg-large_pkg_size' => $conf->config('cust_pkg-large_pkg_size'), -); +my $show_location = $conf->exists('cust_pkg-always_show_location') + || (grep $_->locationnum, @$packages); # ? '1' : '0'; +my $countrydefault = scalar($conf->config('countrydefault')) || 'US'; #subroutines sub get_packages { |