X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=383c2a75e93d05827d1887a32e18b11e26474697;hb=95c2cfba9666f31c5444f8f6c207e7a728a5e96f;hp=dbbdf679784a77e7b0e44f5d3559368956d924fa;hpb=00156a6b621cc0e0227564ebbc53bda3aeb9dc14;p=freeside.git
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index dbbdf6797..383c2a75e 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -1,17 +1,13 @@
% my $s = 0;
+
+% if ( $curuser->access_right('Qualify service') ) {
+ <% $s++ ? ' | ' : '' %>
+ <% include('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,
- )
- %>
+ <% include('order_pkg_link.html', $cust_main) %>
% }
% if ( $curuser->access_right('One-time charge')
@@ -66,66 +62,36 @@ Current packages
Package reports
+% if ( $curuser->access_right('Qualify service') ) {
+ | View Qualifications
+% }
+
+ Service reports:
+ accounts
+ Usage reports:
+ CDRs
|
-
-% if ( @$packages ) {
-
-<% include('/elements/table-grid.html') %>
-% my $bgcolor1 = '#eeeeee';
-% my $bgcolor2 = '#ffffff';
-% my $bgcolor = '';
-
- |
- Package |
- Status |
-% if ( $show_location ) {
- Location |
-% }
- Services |
-
-
-% #$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) %>
-% }
- <% include('packages/services.html', %iopt) %>
-
-
+% if ( $conf->exists('cust_pkg-group_by_location') and $show_location ) {
+<% include('locations.html',
+ 'cust_main' => $cust_main,
+ 'packages' => $packages,
+) %>
% }
-
+% 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,
+) %>
-
-% } 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, @$packages); # ? '1' : '0';
+my $countrydefault = scalar($conf->config('countrydefault')) || 'US';
#subroutines
sub get_packages {
@@ -215,8 +163,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',