X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=da4d587f2dcc00b0dfd895b21ec5fdda9f5420b4;hb=c231b383ee220e6d53c2434a945a6311724ef972;hp=bd056a31ce8a7f9ca9afb53a3b4b83364b7c37ed;hpb=cf49d3c860a2000cfc23a0e0db472a7d6fc58935;p=freeside.git diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html index bd056a31c..da4d587f2 100755 --- a/httemplate/view/cust_main/packages.html +++ b/httemplate/view/cust_main/packages.html @@ -1,40 +1,53 @@ + % my $s = 0; + +% if ( $curuser->access_right('Qualify service') ) { + <% $s++ ? ' | ' : '' %> + <& qual_link.html, $cust_main &> +% } + % if ( $curuser->access_right('Order customer package') ) { <% $s++ ? ' | ' : '' %> - <% include( '/elements/popup_link-cust_main.html', - 'action' => $p. 'misc/order_pkg.html', - 'label' => 'Order new package', - 'actionlabel' => 'Order new package', - 'color' => '#333399', - 'cust_main' => $cust_main, - 'closetext' => 'Close', - 'width' => 763, - 'height' => 350, - ) - %> + <& /elements/order_pkg_link.html, 'cust_main'=>$cust_main &> % } % if ( $curuser->access_right('One-time charge') % && $conf->config('payby-default') ne 'HIDE' % ) { <% $s++ ? ' | ' : '' %> - <% include('one_time_charge_link.html', $cust_main) %> + <& one_time_charge_link.html, $cust_main &> % } % if ( $curuser->access_right('Bulk change customer packages') ) { <% $s++ ? ' | ' : '' %> - Bulk order and cancel packages (preserves services) + <% mt('Bulk order and cancel packages') |h %> (<% mt('preserves services') |h %>) % }

- - - -% if ( $show_location ) { - -% } - - - -% #$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, -% ); -% - - - - <% 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 ) { +<& locations.html, + 'cust_main' => $cust_main, + 'packages' => $packages, + &> % } - <% include('packages/services.html', %iopt) %> - - -% } - +% else { +% # in this format, put all packages in one section +<& /elements/table-grid.html &> +<& packages/section.html, + 'cust_main' => $cust_main, + 'packages' => $packages, + 'show_location' => $show_location, + &>
+ % if ( @$packages ) { -Current packages +<% mt('Current packages') |h %> % } % if ( $cust_main->num_cancelled_pkgs ) { % if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me @@ -45,89 +58,58 @@ Current packages % { % my $prev = $cgi->param('showcancelledpackages'); % $cgi->param('showcancelledpackages', 1); - ( show + ( <% mt('show') |h %> % $cgi->param('showcancelledpackages', $prev); % } else { % $cgi->param('showcancelledpackages', 0); - ( hide + ( <% mt('hide') |h %> % $cgi->param('showcancelledpackages', 1); % } - cancelled packages ) + <% mt('cancelled packages') |h %> ) % } % if ( $num_old_packages ) { % $cgi->param('showoldpackages', 1); - ( show old packages ) + ( <% mt('show old packages') |h %> ) % } elsif ( $cgi->param('showoldpackages') ) { % $cgi->param('showoldpackages', 0); - ( hide old packages ) + ( <% mt('hide old packages') |h %> ) % } - Package reports
- Service reports: - accounts + <% mt('Package reports') |h %> +% if ( $curuser->access_right('Qualify service') ) { + | <% mt('View Qualifications') |h %> +% } +
+ <% mt('Service reports:') |h %> + <% mt('accounts') |h %>
+ <% mt('Usage reports:') |h %> + <% mt('CDRs') |h %>
- -% if ( @$packages ) { - -<% include('/elements/table-grid.html') %> -% my $bgcolor1 = '#eeeeee'; -% my $bgcolor2 = '#ffffff'; -% my $bgcolor = ''; - -
PackageStatusLocationServices
- -% } else { -
-% } - +% } - % if ( $cgi->param('fragment') =~ /^cust_pkg(\d+)$/ ) { % } - + <%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'), - - #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' => $conf->config('svc_broadband-manage_link'), -); +my $show_location = $conf->exists('cust_pkg-always_show_location') + || (grep $_->locationnum ne $cust_main->ship_locationnum, @$packages); +my $countrydefault = scalar($conf->config('countrydefault')) || 'US'; #subroutines sub get_packages { @@ -217,8 +181,7 @@ sub get_packages { unless ( $cgi->param('showoldpackages') ) { my $years = $conf->config('cust_main-packages-years') || 2; - my $seconds = 31556926; #60*60*24*365.2422 is close enough - my $then = time - $seconds; + my $then = time - $years * 31556926; #60*60*24*365.2422 is close enough my %hide = ( 'cancelled' => 'cancel', 'one-time charge' => 'setup', @@ -232,6 +195,10 @@ sub get_packages { } $num_old_packages -= scalar(@packages); + + # don't include supplemental packages in this list; they'll be found from + # their main packages + @packages = grep !$_->main_pkgnum, @packages; ( \@packages, $num_old_packages ); }