X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=0dc65a7885a1624a064378497697e8e8c98cc7cf;hb=929783d1045757abbe5c84ff2439547b0f8eca23;hp=ece1b62bbef1f5947868b2e280a26d385e1e674f;hpb=0186436eb38e70da0a015e49dab67cec5f1a3467;p=freeside.git diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html index ece1b62bb..0dc65a788 100755 --- a/httemplate/view/cust_main/packages.html +++ b/httemplate/view/cust_main/packages.html @@ -1,494 +1,372 @@ -<% - my( $cust_main ) = @_; - my $conf = new FS::Conf; - - my $packages = get_packages($cust_main, $conf); -%> - +td.package { + vertical-align: top; + border-width: 0; + border-style: solid; +} +table.package { + border: none; + padding: 0; + border-spacing: 0; + width: 100%; +} +table.usage { + border: 1px solid black; + margin: auto; + width: 60%; + border-spacing: 0px; +} +.shared > * { + background-color: #ffffaa; +} +.row0 { background-color: #eeeeee; } +.row1 { background-color: #ffffff; } + +table.hiddenrows { + width: 80%; + margin-left: 100px; + border: 1px solid #7E0079; + background-color: #cccccc; +} -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; - } +.hiddenrows td { + text-align: center; +} - #this should use cust_pkg->status and cust_pkg->statuscolor eventually +.rolldown_button { + min-width: 80px; + margin-left: 100px; + min-height: 20px; + background-color: #efefef; + border: 1px solid #7e0079; + z-index: 1; + text-align: center; +} - 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'; +% # activate rolldown buttons for hidden package blocks + -%> - -<% 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) %> - - - <% unless ( $pkg->{setup} ) { %> - - - - - - <% } else { %> - - - - <%= pkg_datestr($pkg, 'setup',$conf) %> - - - <% } %> - - <% if ( $pkg->{'last_bill'} ) { %> - - - <%= pkg_datestr($pkg, 'last_bill',$conf) %> - - <% } %> - - - - <% if ( $pkg->{'expire'} ) { %> - - - <%= pkg_datestr($pkg, 'expire',$conf) %> - - <% } %> - - - - - - <% } 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->{freq} ) { %> - - - - <% } %> + - <% } %> +% my $pager = include('/elements/pager.html', +% offset => $offset, +% num_rows => scalar(@packages), +% total => $num_pkgs, +% maxrecords => $maxrecords, +% ); +% if ( $num_pkgs > $maxrecords ) { + + + +% } -<% } %> + +
Cancelled 
>Never billed
Setup 
<%= $last_bill_or_renewed %> 
Suspended 
Suspended 
>Never billed
Setup 
<%= $last_bill_or_renewed %> 
Expires 
>( <%= 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 
+ +% my $br = 0; + +% if ( $total_pkgs > $maxrecords ) { + +% if ( 1 ) { #FS::pkg_class->num_pkg_class ) { + <% $br++ ? ' | ' : '' %> + Class: <& /elements/select-cust-pkg_class.html, + curr_value => scalar($cgi->param('classnum')), + onchange => 'classnum_changed(this);', + pre_options => [ '-1' => 'all', + '0' => '(none)', + ], + &> +% } + + <% $br++ ? ' | ' : '' %> + Status: <& /elements/select-cust_pkg-status.html, + curr_value => scalar($cgi->param('status')), + onchange => 'status_changed(this);', + &> + +% if ( 1 ) { #$cust_main->num_cust_location ) { + <% $br++ ? ' | ' : '' %> + Location: <& /elements/select-cust_location.html, + cust_main => $cust_main, + curr_value => scalar($cgi->param('locationnum')), + addnew => 0, + onchange => 'locationnum_changed(this);', + pre_options => [ '-1' => 'all', ], + &> +% } + + + +% } + +% if ( $cust_main->num_cancelled_pkgs ) { + <% $br++ ? ' | ' : '' %> +% 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 %> +% } + +<% $br++ ? ' | ' : '' %> +% if ( $cgi->param('showoldpackages') ) { +% $cgi->param('showoldpackages', 0); + <% mt('hide old packages') |h %> +% $cgi->param('showoldpackages', 1); +% } else { +% $cgi->param('showoldpackages', 1); + <% mt('show old packages') |h %> +% $cgi->param('showoldpackages', 0); +% } + +
>( <%= pkg_suspend_link($pkg) %> | <%= pkg_cancel_link($pkg) %> )
+ <% $pager %> +
+ +% $opt{cust_main} = $cust_main; +% $opt{packages} = \@packages; +% $opt{cust_location_cache} = {}; +% if ( $conf->exists('cust_pkg-group_by_location') ) { + <& locations.html, %opt &> +% } else { # in this format, put all packages in one section + <& /elements/table-grid.html &> + <& packages/section.html, %opt &> +
+% } + +
- - -<% - 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 -%> +% if ( $num_pkgs > $maxrecords ) { + + + <% $pager %> + + +% } -<% } else { %> -
-<% } %> - -<% -#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') - && ! $cgi->param('showcancelledpackages') ) - ) - { - $method = 'ncancelled_pkgs'; - } 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; +<%init> - } +my $cust_main = shift; +my %opt = @_; +my $conf = new FS::Conf; - $pkg{svcparts} = [ values %svcparts ]; +my $curuser = $FS::CurrentUser::CurrentUser; - push @packages, \%pkg; - - } - - return \@packages; +my $countrydefault = scalar($conf->config('countrydefault')) || 'US'; +my $hide_cancelled = 0; +if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me + || ( $conf->exists('hidecancelledpackages') + && ! $cgi->param('showcancelledpackages') ) + ) +{ + $hide_cancelled = 1; } -sub svc_link { - - my ($svcpart, $svc) = (shift,shift) or return ''; - return qq!$svcpart->{svc}!; - -} - -sub svc_label_link { - - my ($svcpart, $svc) = (shift,shift) or return ''; - return qq!$svc->{label}!; - +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') ), + 'setup_option.optionvalue AS part_pkg__setup_fee', + 'recur_option.optionvalue AS part_pkg__recur_fee', + ); + +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 $addl_from = ' + LEFT JOIN part_pkg USING ( pkgpart ) + LEFT JOIN cust_pkg AS chgto ON ( chgto.change_to_pkgnum = cust_pkg.pkgnum ) + LEFT JOIN cust_pkg AS chgfrom ON ( chgfrom.change_pkgnum = cust_pkg.pkgnum ) +'; + +my $extra_sql = + ' AND cust_pkg.main_pkgnum IS NULL '. # supplemental package of something else + ' AND chgto.pkgnum IS NULL '. # ordered, not-yet-active change target + ' AND chgfrom.pkgnum IS NULL '; # canceled package changed into another + +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 + + $extra_sql .= " AND ( + ( part_pkg.freq = '0' + AND ( cust_pkg.setup IS NULL OR cust_pkg.setup > $then ) + ) + OR ( part_pkg.freq != '0' + AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel > $then ) + ) + OR EXISTS ( SELECT 1 FROM cust_svc WHERE cust_svc.pkgnum = cust_pkg.pkgnum ) + )"; } -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}"; +if ( $cgi->param('classnum') =~ /^(\d+)$/ ) { + my $classnum = $1; + if ( $classnum == 0 ) { + $extra_sql .= " AND part_pkg.classnum IS NULL "; } else { - $url = "${p}edit/$svcpart->{svcdb}.cgi?$pkgnum_svcpart"; + $extra_sql .= " AND part_pkg.classnum = $classnum "; } +} - my $link = qq!!. - "Provision $svc_nbsp ($num_left)"; - if ( $conf->exists('legacy_link') ) { - $link .= '
'. - qq!!. - "Link to legacy $svc_nbsp ($num_left)"; - } - $link; +if ( $cgi->param('status') =~ /^([\w ]+)$/ ) { + my $status = $1; + $extra_sql .= ' AND '. FS::cust_pkg->status_sql. " = '$status' "; } -sub svc_unprovision_link { - my $svc = shift or return ''; - qq!Unprovision!; +if ( $cgi->param('locationnum') =~ /^(\d+)$/ ) { + my $locationnum = $1; + $extra_sql .= " AND cust_pkg.locationnum = $locationnum "; } -# 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 $total_pkgs = $cust_main->all_pkgs; + +my $method = $hide_cancelled ? 'ncancelled_pkgs' : 'all_pkgs'; +my $num_pkgs = $cust_main->$method({ + 'addl_from' => $addl_from, + 'extra_sql' => $extra_sql, +}); + +my $maxrecords = $conf->config('cust_main-packages-num_per_page') || 10; +my $offset = $cgi->param('offset') =~ /^(\d+)$/ ? $1 : 0; +$cgi->delete('offset'); + +my @packages = $cust_main->$method( { + 'select' => "$cust_pkg_fields, $part_pkg_fields, $num_svcs", + 'addl_from' => $addl_from. " + LEFT JOIN part_pkg_option AS setup_option + ON ( cust_pkg.pkgpart = setup_option.pkgpart + AND setup_option.optionname = 'setup_fee' ) + LEFT JOIN part_pkg_option AS recur_option + ON ( cust_pkg.pkgpart = recur_option.pkgpart + AND recur_option.optionname = 'recur_fee' ) + ", + 'extra_sql' => $extra_sql, + 'order_by' => "ORDER BY pkgnum ASC LIMIT $maxrecords OFFSET $offset", +} ); + +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; + + #arrayref of supplementals + $cust_pkg->set('_supplemental', [ + qsearch('cust_pkg', { main_pkgnum=>$cust_pkg->pkgnum }) + ] ); + + #for future changes + if ( $cust_pkg->change_to_pkgnum ) { + my $change_to = + qsearchs('cust_pkg', { pkgnum=>$cust_pkg->change_to_pkgnum }); + $cust_pkg->set('change_to_pkg', $change_to); + $change_to->set('change_from_pkg', $cust_pkg); } -} -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; -} + #for past changes + setfrom($cust_pkg); -sub pkg_change_link { - my $pkg = shift or return ''; - return qq!!. - qq!Change package!; -} + $cust_pkg->{'_cust_pkg_discount_active'} = + [ $cust_pkg->cust_pkg_discount_active ]; -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 setfrom { + my $cust_pkg = shift; -sub pkg_cancel_link { - my $pkg = shift or return ''; - qq!!. - qq!Cancel now | !. - qq!Cancel later!; -} + if ( $cust_pkg->change_pkgnum ) { + my $changed_from = + qsearchs('cust_pkg', { pkgnum=>$cust_pkg->change_pkgnum }); + $cust_pkg->set('changed_from_pkg', $changed_from); + $changed_from->set('changed_to_pkg', $cust_pkg); -sub pkg_dates_link { - my $pkg = shift or return ''; - qq!Edit dates!; -} + setfrom($changed_from); + + } -sub pkg_customize_link { - my $pkg = shift or return ''; - my $custnum = shift; - qq!Customize!; } -%> +