X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=3ac4861c3e3199680e8f17aafc7b02593d7a8f88;hb=7b125e587a4d1ee0aca692e23ea7897f671855ae;hp=ece1b62bbef1f5947868b2e280a26d385e1e674f;hpb=673b9a458d9138523026963df6fa3b4683e09bae;p=freeside.git diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html index ece1b62bb..3ac4861c3 100755 --- a/httemplate/view/cust_main/packages.html +++ b/httemplate/view/cust_main/packages.html @@ -1,310 +1,173 @@ -<% - my( $cust_main ) = @_; - my $conf = new FS::Conf; +% my $s = 0; +% if ( $curuser->access_right('Order customer package') ) { + <% $s++ ? ' | ' : '' %> + <% include('order_pkg_link.html', $cust_main) %> +% } + +% if ( $curuser->access_right('One-time charge') +% && $conf->config('payby-default') ne 'HIDE' +% ) { + <% $s++ ? ' | ' : '' %> + <% include('one_time_charge_link.html', $cust_main) %> +% } + +% if ( $curuser->access_right('Bulk change customer packages') ) { + <% $s++ ? ' | ' : '' %> + Bulk order and cancel packages (preserves services) +% } - 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 ) { %> - - - - - - - - -<% -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}); - } - } -%> - - - - - +
PackageStatusServices
> - <%=$pkg->{pkgnum}%>: - <%=$pkg->{pkg}%> - <%=$pkg->{comment}%>
-<% unless ($pkg->{cancel}) { %> - ( <%=pkg_change_link($pkg)%> ) - ( <%=pkg_dates_link($pkg)%> | <%=pkg_customize_link($pkg,$cust_main->custnum)%> ) -<% } %> - 		> - - -<% - sub myfreq { - my $part_pkg = shift; - my $freq = $part_pkg->freq_pretty; - $freq =~ s/ / /g; - $freq; - } - - #this should use cust_pkg->status and cust_pkg->statuscolor eventually - - my $colspan = $conf->exists('cust_pkg-display_times') ? 8 : 4; - my $width = $conf->exists('cust_pkg-display_times') ? '38%' : '56%'; - - #false laziness w/edit/REAL_cust_pkg.cgi - my( $billed_or_prepaid, $last_bill_or_renewed, $next_bill_or_prepaid_until ); - unless ( $pkg->{'part_pkg'}->is_prepaid ) { - $billed_or_prepaid = 'billed'; - $last_bill_or_renewed = 'Last bill'; - $next_bill_or_prepaid_until = 'Next bill'; - } else { - $billed_or_prepaid = 'prepaid'; - $last_bill_or_renewed = 'Renewed'; - $next_bill_or_prepaid_until = 'Prepaid until'; - } - -%> - -<% if ( $pkg->{cancel} ) { %> - +
- - <%= pkg_datestr($pkg,'cancel',$conf) %> - - - <% unless ( $pkg->{setup} ) { %> - - - - - - <% } else { %> - - - - <%= pkg_datestr($pkg, 'setup',$conf) %> - - - <% if ( $pkg->{'last_bill'} ) { %> - - - <%= pkg_datestr($pkg, 'last_bill',$conf) %> - - <% } %> - - <% if ( $pkg->{'susp'} ) { %> - - - <%= pkg_datestr($pkg, 'susp',$conf) %> - - <% } %> - - <% } %> - -<% } else { %> - - <% if ( $pkg->{susp} ) { %> - - - - <%= pkg_datestr($pkg,'susp',$conf) %> - + - - +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') +% ) +% ) +% { +% my $prev = $cgi->param('showcancelledpackages'); +% $cgi->param('showcancelledpackages', 1); + ( show +% $cgi->param('showcancelledpackages', $prev); +% } else { +% $cgi->param('showcancelledpackages', 0); + ( hide +% $cgi->param('showcancelledpackages', 1); +% } - <% } else { %> + cancelled packages ) +% } +% if ( $num_old_packages ) { +% $cgi->param('showoldpackages', 1); + ( show old packages ) +% } elsif ( $cgi->param('showoldpackages') ) { +% $cgi->param('showoldpackages', 0); + ( hide old packages ) +% } + + + + - - - <%= pkg_datestr($pkg, 'setup',$conf) %> - - - <% } %> + + - - <%= pkg_datestr($pkg, 'last_bill',$conf) %> - - <% } %> +% if ( @$packages ) { - +<% include('/elements/table-grid.html') %> +% my $bgcolor1 = '#eeeeee'; +% my $bgcolor2 = '#ffffff'; +% my $bgcolor = ''; - <% if ( $pkg->{'expire'} ) { %> - - - <%= pkg_datestr($pkg, 'expire',$conf) %> - - <% } %> + + + +% 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) %> +% } + <% include('packages/services.html', %iopt) %> - <% } else { %> - - <% unless ( $pkg->{setup} ) { %> - - <% unless ( $pkg->{'freq'} ) { %> - - - - - - - - - - <% } else { %> - - - - - - <% } %> +% } - <% } else { %> - - <% unless ( $pkg->{freq} ) { %> - - - - - - - - <%= pkg_datestr($pkg,'setup',$conf) %> - - - <% } else { %> - - - - - - - - <%= pkg_datestr($pkg, 'setup',$conf) %> - - - <% } %> - - <% } %> - - <% if ( $pkg->{'last_bill'} ) { %> - - - <%= pkg_datestr($pkg, 'last_bill',$conf) %> - - <% } %> - - <% if ( $pkg->{'next_bill'} ) { %> - - - <%= pkg_datestr($pkg, 'next_bill',$conf) %> - - <% } %> - - <% if ( $pkg->{'expire'} ) { %> - - - <%= pkg_datestr($pkg, 'expire',$conf) %> - - <% } %> - - <% if ( $pkg->{freq} ) { %> - - - - <% } %> - - <% } %> +
Cancelled 
>Never billed
Setup 
<%= $last_bill_or_renewed %> 
Suspended 
Suspended 
- <% unless ( $pkg->{setup} ) { %> +% if ( @$packages ) { -
>Never billed
+ Package reports
+ Service reports: + accounts +
Setup 
- <% if ( $pkg->{'last_bill'} ) { %> -
<%= $last_bill_or_renewed %> 
Expires 
PackageStatusLocationServices
>( <%= pkg_unsuspend_link($pkg) %> | <%= pkg_cancel_link($pkg) %> )
>Not yet billed (one-time charge)
>( <%= pkg_cancel_link($pkg) %> )
>Not yet billed (<%= $billed_or_prepaid %> <%= myfreq($pkg->{part_pkg}) %>)
>One-time charge
Billed 
>Active, <%= $billed_or_prepaid %> <%= myfreq($pkg->{part_pkg}) %>
Setup 
<%= $last_bill_or_renewed %> 
<%= $next_bill_or_prepaid_until %> 
Expires 
>( <%= pkg_suspend_link($pkg) %> | <%= pkg_cancel_link($pkg) %> )
-<% } %> +% } else { +
+% } +
- - -<% - if ($rowspan == 0) { print qq!\n!; next; } - - 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 { %> -
-<% } %> +% if ( $cgi->param('fragment') =~ /^cust_pkg(\d+)$/ ) { + +% } + +<%init> + +my( $cust_main ) = @_; +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'), +); -<% #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') @@ -315,180 +178,51 @@ sub get_packages { } else { $method = 'all_pkgs'; } - - foreach my $cust_pkg ( $cust_main->$method() ) { - - my $part_pkg = $cust_pkg->part_pkg; - - my %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; - - $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; - - 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], - }; - - #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' => [], - } ); - - push @{$svcpart->{services}}, $svc; - - } - - $pkg{svcparts} = [ values %svcparts ]; - - push @packages, \%pkg; - - } - - return \@packages; - -} - -sub svc_link { - - my ($svcpart, $svc) = (shift,shift) or return ''; - return qq!$svcpart->{svc}!; -} + my $cust_pkg_fields = + join(', ', map { "cust_pkg.$_ AS $_" } fields('cust_pkg') ); -sub svc_label_link { + my $part_pkg_fields = + join(', ', map { "part_pkg.$_ AS part_pkg_$_" } fields('part_pkg') ); - my ($svcpart, $svc) = (shift,shift) or return ''; - return qq!$svc->{label}!; + 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'; -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 @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); - my $link = qq!!. - "Provision $svc_nbsp ($num_left)"; - if ( $conf->exists('legacy_link') ) { - $link .= '
'. - qq!!. - "Link to legacy $svc_nbsp ($num_left)"; + 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; } - $link; -} -sub svc_unprovision_link { - my $svc = shift or return ''; - qq!Unprovision!; -} + 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 -# 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 = '%b'. - ' %o,'. - ' %Y'; - #$format .= ' %l:%M:%S%P %z' - $format .= ' %l'. - ':'. - '%M'. - ' %P' - if $conf->exists('cust_pkg-display_times'); - ( 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 ); } -%> +