X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=e16b2c1d40a0a59f89a31019cc339f69eeaad6c4;hb=8cbe016ac2c28cd209c48f053f361573368e7988;hp=068a8276f4f027f79255d37f033e0d5729eec863;hpb=f7afca1829f8496509d10806439c37fcc1349135;p=freeside.git
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 068a8276f..e16b2c1d4 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -1,210 +1,130 @@
-<%
- my( $cust_main ) = @_;
- my $conf = new FS::Conf;
+% my $s = 0;
+
+% if ( $curuser->access_right('Qualify service') ) {
+ <% $s++ ? ' | ' : '' %>
+ <& qual_link.html, $cust_main &>
+% }
+
+% if ( $curuser->access_right('Order customer package') ) {
+ <% $s++ ? ' | ' : '' %>
+ <& order_pkg_link.html, $cust_main &>
+% }
+
+% if ( $curuser->access_right('One-time charge')
+% && $conf->config('payby-default') ne 'HIDE'
+% ) {
+ <% $s++ ? ' | ' : '' %>
+ <& one_time_charge_link.html, $cust_main &>
+% }
+
+% if ( $curuser->access_right('Bulk change customer packages') ) {
+ <% $s++ ? ' | ' : '' %>
+ <% mt('Bulk order and cancel packages') |h %> (<% mt('preserves services') |h %>)
+% }
- my $packages = get_packages($cust_main, $conf);
-%>
-
-Packages
-
-<%= include('order_pkg.html', $cust_main ) %>
-
-<% if ( $conf->config('payby-default') ne 'HIDE' ) { %>
- <%= include('quick-charge.html', $cust_main ) %>
-<% } %>
-
-Bulk order and cancel packages (preserves services)
-<% if ( @$packages ) { %>
-Current packages
-<% } %>
-
-<% if ( $cust_main->num_cancelled_pkgs ) {
- if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
- || ( $conf->exists('hidecancelledpackages')
- && ! $cgi->param('showcancelledpackages')
- )
- )
- {
- $cgi->param('showcancelledpackages', 1);
-%>
- ( show
-<% } else {
- $cgi->param('showcancelledpackages', 0);
-%>
- ( hide
-<% } %>
- cancelled packages )
-<% } %>
-
-<% if ( @$packages ) { %>
-
-
-
- Package |
- Status |
- Services |
-
-
-<%
-foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
- my $rowspan = 0;
-
- if ($pkg->{cancel}) {
- $rowspan = 0;
- } else {
- foreach my $svcpart (@{$pkg->{svcparts}}) {
- $rowspan += $svcpart->{count};
- $rowspan++ if ($svcpart->{count} < $svcpart->{quantity});
- }
- }
-%>
-
-
-
- >
- <%=$pkg->{pkgnum}%>:
- <%=$pkg->{pkg}%> - <%=$pkg->{comment}%>
-<% unless ($pkg->{cancel}) { %>
- ( <%=pkg_change_link($pkg)%> )
- ( <%=pkg_dates_link($pkg)%> | <%=pkg_customize_link($pkg,$cust_main->custnum)%> )
-<% } %>
- |
-<%
- #foreach (qw(setup last_bill next_bill susp expire cancel)) {
- # print qq! ! . pkg_datestr($pkg,$_,$conf) . qq! | \n!;
- #}
- print "". &itable('');
-
- sub myfreq {
- my $part_pkg = shift;
- my $freq = $part_pkg->freq_pretty;
- $freq =~ s/ / /g;
- $freq;
- }
-
- if ( $pkg->{cancel} ) { #status: cancelled
-
- print ' |
Cancelled | '.
- ''. pkg_datestr($pkg,'cancel',$conf). ' |
';
- unless ( $pkg->{setup} ) {
- print 'Never billed |
';
- } else {
- print "Setup | ".
- pkg_datestr($pkg, 'setup',$conf). ' |
';
- print "Last bill | ".
- pkg_datestr($pkg, 'last_bill',$conf). ' |
'
- if $pkg->{'last_bill'};
- print "Suspended | ".
- pkg_datestr($pkg, 'susp',$conf). ' |
'
- if $pkg->{'susp'};
- }
-
- } else {
-
- if ( $pkg->{susp} ) { #status: suspended
- print 'Suspended | '.
- ''. pkg_datestr($pkg,'susp',$conf). ' |
';
- unless ( $pkg->{setup} ) {
- print 'Never billed |
';
- } else {
- print "Setup | ".
- pkg_datestr($pkg, 'setup',$conf). ' |
';
- }
- print "Last bill | ".
- pkg_datestr($pkg, 'last_bill',$conf). ' |
'
- if $pkg->{'last_bill'};
- # next bill ??
- print "Expires | ".
- pkg_datestr($pkg, 'expire',$conf). ' |
'
- if $pkg->{'expire'};
- print '( '. pkg_unsuspend_link($pkg).
- ' | '. pkg_cancel_link($pkg). ' ) |
';
-
- } else { #status: active
-
- unless ( $pkg->{setup} ) { #not setup
-
- print 'Not yet billed (';
- unless ( $pkg->{freq} ) {
- print 'one-time charge) |
';
- print '( '. pkg_cancel_link($pkg).
- ' ) | ';
- } else {
- print 'billed '. myfreq($pkg->{part_pkg}). ')
';
- }
-
- } else { #setup
-
- unless ( $pkg->{freq} ) {
- print "One-time charge |
".
- 'Billed | '.
- pkg_datestr($pkg,'setup',$conf). ' |
';
- } else {
- print 'Active'.
- ', billed '. myfreq($pkg->{part_pkg}). ' |
'.
- 'Setup | '.
- pkg_datestr($pkg, 'setup',$conf). ' |
';
- }
-
- }
+
+
+
+
+% if ( @$packages ) {
+
+<% mt('Current packages') |h %>
+% }
+% if ( $cust_main->num_cancelled_pkgs ) {
+% if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
+% || ( $conf->exists('hidecancelledpackages')
+% && ! $cgi->param('showcancelledpackages')
+% )
+% )
+% {
+% my $prev = $cgi->param('showcancelledpackages');
+% $cgi->param('showcancelledpackages', 1);
+ ( <% mt('show') |h %>
+% $cgi->param('showcancelledpackages', $prev);
+% } else {
+% $cgi->param('showcancelledpackages', 0);
+ ( <% mt('hide') |h %>
+% $cgi->param('showcancelledpackages', 1);
+% }
+
+ <% mt('cancelled packages') |h %> )
+% }
+% if ( $num_old_packages ) {
+% $cgi->param('showoldpackages', 1);
+ ( <% mt('show old packages') |h %> )
+% } elsif ( $cgi->param('showoldpackages') ) {
+% $cgi->param('showoldpackages', 0);
+ ( <% mt('hide old packages') |h %> )
+% }
+
+ |
+
+ <% 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 ( $conf->exists('cust_pkg-group_by_location') and $show_location ) {
+<& locations.html,
+ 'cust_main' => $cust_main,
+ 'packages' => $packages,
+ &>
+% }
+% 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 ( $cgi->param('fragment') =~ /^cust_pkg(\d+)$/ ) {
+
+% }
+
+<%init>
- print "Last bill | ".
- pkg_datestr($pkg, 'last_bill',$conf). ' |
'
- if $pkg->{'last_bill'};
- print "Next bill | ".
- pkg_datestr($pkg, 'next_bill',$conf). ' |
'
- if $pkg->{'next_bill'};
- print "Expires | ".
- pkg_datestr($pkg, 'expire',$conf). ' |
'
- if $pkg->{'expire'};
- if ( $pkg->{freq} ) {
- print '( '. pkg_suspend_link($pkg).
- ' | '. pkg_cancel_link($pkg). ' ) |
';
- }
+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);
- print "\n";
- if ($rowspan == 0) { print qq!\n!; next; }
+my $show_location = $conf->exists('cust_pkg-always_show_location')
+ || (grep $_->locationnum, @$packages); # ? '1' : '0';
- my $cnt = 0;
- foreach my $svcpart (sort {$a->{svcpart} <=> $b->{svcpart}} @{$pkg->{svcparts}}) {
- foreach my $service (@{$svcpart->{services}}) {
- print '' if ($cnt > 0);
-%>
- <%=svc_link($svcpart,$service)%> |
- <%=svc_label_link($svcpart,$service)%> ( <%=svc_unprovision_link($service)%> ) |
-
-<%
- $cnt++;
- }
- if ($svcpart->{count} < $svcpart->{quantity}) {
- print qq!\n! if ($cnt > 0);
- print qq! !.svc_provision_link($pkg, $svcpart, $conf).qq! | \n
\n!;
- }
- }
-}
-#end display packages
-%>
-
-
-<% } else { %>
-
-<% } %>
-
-<%
+my $countrydefault = scalar($conf->config('countrydefault')) || 'US';
#subroutines
sub get_packages {
my $cust_main = shift or return undef;
my $conf = shift;
-
- my @packages = ();
+
my $method;
if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
|| ( $conf->exists('hidecancelledpackages')
@@ -215,174 +135,51 @@ sub get_packages {
} else {
$method = 'all_pkgs';
}
-
- foreach my $cust_pkg ( $cust_main->$method() ) {
-
- my $part_pkg = $cust_pkg->part_pkg;
- my %pkg = ();
+ my $cust_pkg_fields =
+ join(', ', map { "cust_pkg.$_ AS $_" } fields('cust_pkg') );
- #to get back to the original object... should use it in the first place!!
- $pkg{cust_pkg} = $cust_pkg;
- $pkg{part_pkg} = $part_pkg;
+ my $part_pkg_fields =
+ join(', ', map { "part_pkg.$_ AS part_pkg_$_" } fields('part_pkg') );
- $pkg{pkgnum} = $cust_pkg->pkgnum;
- $pkg{pkg} = $part_pkg->pkg;
- $pkg{pkgpart} = $part_pkg->pkgpart;
- $pkg{comment} = $part_pkg->getfield('comment');
- $pkg{freq} = $part_pkg->freq;
- $pkg{setup} = $cust_pkg->getfield('setup');
- $pkg{last_bill} = $cust_pkg->getfield('last_bill');
- $pkg{next_bill} = $cust_pkg->getfield('bill');
- $pkg{susp} = $cust_pkg->getfield('susp');
- $pkg{expire} = $cust_pkg->getfield('expire');
- $pkg{cancel} = $cust_pkg->getfield('cancel');
-
-
- my %svcparts = map {
- $_->svcpart => {
- $_->part_svc->hash,
- 'quantity' => $_->quantity,
- 'count' => $cust_pkg->num_cust_svc($_->svcpart),
- #'services' => [],
- };
- } $part_pkg->pkg_svc;
+ my $group_by =
+ join(', ', map "cust_pkg.$_", fields('cust_pkg') ). ', '.
+ join(', ', map "part_pkg.$_", fields('part_pkg') );
- foreach my $cust_svc ( $cust_pkg->cust_svc ) {
- #warn "svcnum ". $cust_svc->svcnum. " / svcpart ". $cust_svc->svcpart. "\n";
- my $svc = {
- 'svcnum' => $cust_svc->svcnum,
- 'label' => ($cust_svc->label)[1],
- };
+ my $num_svcs = '( SELECT COUNT(*) FROM cust_svc '.
+ ' WHERE cust_svc.pkgnum = cust_pkg.pkgnum ) AS num_svcs';
- #false laziness with above, to catch extraneous services. whole
- #damn thing should be OO...
- my $svcpart = ( $svcparts{$cust_svc->svcpart} ||= {
- $cust_svc->part_svc->hash,
- 'quantity' => 0,
- 'count' => $cust_pkg->num_cust_svc($cust_svc->svcpart),
- #'services' => [],
- } );
+ 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);
- push @{$svcpart->{services}}, $svc;
-
- }
-
- $pkg{svcparts} = [ values %svcparts ];
-
- push @packages, \%pkg;
-
+ 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;
}
-
- return \@packages;
-}
-
-sub svc_link {
-
- my ($svcpart, $svc) = (shift,shift) or return '';
- return qq!$svcpart->{svc}!;
-
-}
+ unless ( $cgi->param('showoldpackages') ) {
+ my $years = $conf->config('cust_main-packages-years') || 2;
+ my $then = time - $years * 31556926; #60*60*24*365.2422 is close enough
-sub svc_label_link {
-
- my ($svcpart, $svc) = (shift,shift) or return '';
- return qq!$svc->{label}!;
-
-}
-
-sub svc_provision_link {
- my ($pkg, $svcpart, $conf) = @_;
- ( my $svc_nbsp = $svcpart->{svc} ) =~ s/\s+/ /g;
- my $num_left = $svcpart->{quantity} - $svcpart->{count};
- my $pkgnum_svcpart = "pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}";
-
- my $url;
- if ( $svcpart->{svcdb} eq 'svc_external'
- && $conf->exists('svc_external-skip_manual')
- ) {
- $url = "${p}edit/process/$svcpart->{svcdb}.cgi?".
- "pkgnum=$pkg->{pkgnum}&".
- "svcpart=$svcpart->{svcpart}";
- } else {
- $url = "${p}edit/$svcpart->{svcdb}.cgi?$pkgnum_svcpart";
- }
-
- my $link = qq!!.
- "Provision $svc_nbsp ($num_left)";
- if ( $conf->exists('legacy_link') ) {
- $link .= '
'.
- qq!!.
- "Link to legacy $svc_nbsp ($num_left)";
- }
- $link;
-}
-
-sub svc_unprovision_link {
- my $svc = shift or return '';
- qq!Unprovision!;
-}
-
-# This should be generalized to use config options to determine order.
-sub pkgsort_pkgnum_cancel {
- if ($a->{cancel} and $b->{cancel}) {
- return ($a->{pkgnum} <=> $b->{pkgnum});
- } elsif ($a->{cancel} or $b->{cancel}) {
- return (-1) if ($b->{cancel});
- return (1) if ($a->{cancel});
- return (0);
- } else {
- return($a->{pkgnum} <=> $b->{pkgnum});
+ my %hide = ( 'cancelled' => 'cancel',
+ 'one-time charge' => 'setup',
+ );
+
+ @packages =
+ grep { !exists($hide{$_->status}) or $_->get($hide{$_->status}) > $then
+ or $_->num_svcs #don't hide packages w/services
+ }
+ @packages;
}
-}
-
-sub pkg_datestr {
- my($pkg, $field, $conf) = @_ or return '';
- return ' ' unless $pkg->{$field};
- my $format = $conf->exists('pkg_showtimes')
- ? '%D %l:%M:%S%P %z'
- : '%b %o, %Y';
- ( my $strip = time2str($format, $pkg->{$field}) ) =~ s/ (\d)/$1/g;
- $strip;
-}
-sub pkg_change_link {
- my $pkg = shift or return '';
- return qq!!.
- qq!Change package!;
-}
-
-sub pkg_suspend_link {
- my $pkg = shift or return '';
- return qq!Suspend!;
-}
-
-sub pkg_unsuspend_link {
- my $pkg = shift or return '';
- return qq!Unsuspend!;
-}
-
-sub pkg_cancel_link {
- my $pkg = shift or return '';
- qq!!.
- qq!Cancel now | !.
- qq!Cancel later!;
-}
-
-sub pkg_dates_link {
- my $pkg = shift or return '';
- qq!Edit dates!;
-}
+ $num_old_packages -= scalar(@packages);
-sub pkg_customize_link {
- my $pkg = shift or return '';
- my $custnum = shift;
- qq!Customize!;
+ ( \@packages, $num_old_packages );
}
-%>
+%init>