X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=383c2a75e93d05827d1887a32e18b11e26474697;hb=073169e80bea0560b64e468a76121bf837de34f3;hp=9b1d5b317a064beb8e146e4b996f274c6b60968b;hpb=3b5ccffae54e59c012eb1ebb348207510ca1d5ce;p=freeside.git
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 9b1d5b317..383c2a75e 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -1,18 +1,13 @@
-Packages
-
% 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,
- )
- %>
+ <% include('order_pkg_link.html', $cust_main) %>
% }
% if ( $curuser->access_right('One-time charge')
@@ -27,8 +22,12 @@
Bulk order and cancel packages (preserves services)
% }
-
+
+
+
+
+
% if ( @$packages ) {
Current packages
@@ -40,15 +39,14 @@ Current packages
% )
% )
% {
+% my $prev = $cgi->param('showcancelledpackages');
% $cgi->param('showcancelledpackages', 1);
-%
-
( show
+% $cgi->param('showcancelledpackages', $prev);
% } else {
% $cgi->param('showcancelledpackages', 0);
-%
-
( hide
+% $cgi->param('showcancelledpackages', 1);
% }
cancelled packages )
@@ -60,63 +58,40 @@ Current packages
% $cgi->param('showoldpackages', 0);
( hide old packages )
% }
-% if ( @$packages ) {
-<% include('/elements/table-grid.html') %>
-% my $bgcolor1 = '#eeeeee';
-% my $bgcolor2 = '#ffffff';
-% my $bgcolor = '';
-
- |
- Package |
- Status |
-% if ( $show_location ) {
- Location |
+
+
+ Package reports
+% if ( $curuser->access_right('Qualify service') ) {
+ | View Qualifications
% }
- | Services |
-
-
-% my %part_pkg = ();
-% foreach my $cust_pkg (@$packages) {
-%
-% if ( $bgcolor eq $bgcolor1 ) {
-% $bgcolor = $bgcolor2;
-% } else {
-% $bgcolor = $bgcolor1;
-% }
-%
-% $part_pkg{$cust_pkg->pkgpart} ||= $cust_pkg->part_pkg;
-% $cust_pkg->{'_pkgpart'} ||= $part_pkg{$cust_pkg->pkgpart}; #XXX cache kludge
-%
-% my %iopt = (
-% 'bgcolor' => $bgcolor,
-% 'cust_pkg' => $cust_pkg,
-% 'part_pkg' => $part_pkg{$cust_pkg->pkgpart},
-% %conf_opt,
-% );
-%
-% my $oldDEBUG = $FS::cust_pkg::DEBUG;
-% $FS::cust_pkg::DEBUG = 2;
-
-
-
- <% include('packages/package.html', %iopt) %>
- <% include('packages/status.html', %iopt) %>
-% if ( $show_location ) {
- <% include('packages/location.html', %iopt) %>
-% }
- <% include('packages/services.html', %iopt) %>
-
-
-% $FS::cust_pkg::DEBUG = $oldDEBUG;
-
+
+ Service reports:
+ accounts
+ Usage reports:
+ CDRs
+
+
+
+
+
+% 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 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'),
-);
+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 {
@@ -174,20 +135,44 @@ sub get_packages {
$method = 'all_pkgs';
}
- my @packages = $cust_main->$method();
+ my $cust_pkg_fields =
+ join(', ', map { "cust_pkg.$_ AS $_" } fields('cust_pkg') );
+
+ my $part_pkg_fields =
+ join(', ', map { "part_pkg.$_ AS part_pkg_$_" } fields('part_pkg') );
+
+ my $group_by =
+ join(', ', map "cust_pkg.$_", fields('cust_pkg') ). ', '.
+ join(', ', map "part_pkg.$_", fields('part_pkg') );
+
+ my $num_svcs = '( SELECT COUNT(*) FROM cust_svc '.
+ ' WHERE cust_svc.pkgnum = cust_pkg.pkgnum ) AS num_svcs';
+
+ my @packages = $cust_main->$method( {
+ 'select' => "$cust_pkg_fields, $part_pkg_fields, $num_svcs",
+ 'addl_from' => 'LEFT JOIN part_pkg USING ( pkgpart )',
+ } );
my $num_old_packages = scalar(@packages);
+ foreach my $cust_pkg ( @packages ) {
+ my %hash = $cust_pkg->hash;
+ my %part_pkg = map { /^part_pkg_(.+)$/ or die; ( $1 => $hash{$_} ); }
+ grep { /^part_pkg_/ } keys %hash;
+ $cust_pkg->{'_pkgpart'} = new FS::part_pkg \%part_pkg;
+ }
+
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',
);
@packages =
- grep { !exists($hide{$_->status}) or $_->get($hide{$_->status}) > $then }
+ grep { !exists($hide{$_->status}) or $_->get($hide{$_->status}) > $then
+ or $_->num_svcs #don't hide packages w/services
+ }
@packages;
}