X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=3e4332d71a9592f7dbdee74dcc4a098d9103be61;hb=98f6d91ec7eaa907204afbfeb90ede1e3bff656d;hp=32e0ee1fc36b4ecd76700822187d6307e68af96e;hpb=2c757d7db4cb6a7b9655de13206fcc84fb7ce61f;p=freeside.git diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html index 32e0ee1fc..4903e185b 100755 --- a/httemplate/view/cust_main/packages.html +++ b/httemplate/view/cust_main/packages.html @@ -1,494 +1,282 @@ -<% - my( $cust_main ) = @_; - my $conf = new FS::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; +% # activate rolldown buttons for hidden package blocks + +
PackageStatusServices
+ + -%> - -<% if ( $pkg->{cancel} ) { %> + - - <%= pkg_datestr($pkg,'cancel',$conf) %> +
+ +% 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 %> ) +% } + +
Cancelled  + +% $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 &> +
+% } + + - <% unless ( $pkg->{setup} ) { %> - - - >Never billed - - - <% } else { %> - - - Setup  - <%= pkg_datestr($pkg, 'setup',$conf) %> - - - <% if ( $pkg->{'last_bill'} ) { %> - - <%= $last_bill_or_renewed %>  - <%= pkg_datestr($pkg, 'last_bill',$conf) %> - - <% } %> - - <% if ( $pkg->{'susp'} ) { %> - - Suspended  - <%= pkg_datestr($pkg, 'susp',$conf) %> - - <% } %> - - <% } %> - -<% } else { %> - - <% if ( $pkg->{susp} ) { %> - - - Suspended  - <%= pkg_datestr($pkg,'susp',$conf) %> - - - <% unless ( $pkg->{setup} ) { %> - - - >Never billed - - - <% } else { %> - - - Setup  - <%= pkg_datestr($pkg, 'setup',$conf) %> - - - <% } %> - - <% if ( $pkg->{'last_bill'} ) { %> - - <%= $last_bill_or_renewed %>  - <%= pkg_datestr($pkg, 'last_bill',$conf) %> - - <% } %> - - - - <% if ( $pkg->{'expire'} ) { %> - - Expires  - <%= pkg_datestr($pkg, 'expire',$conf) %> - - <% } %> - - - >( <%= pkg_unsuspend_link($pkg) %> | <%= pkg_cancel_link($pkg) %> ) - - - <% } else { %> - - <% unless ( $pkg->{setup} ) { %> - - <% unless ( $pkg->{'freq'} ) { %> - - - >Not yet billed (one-time charge) - - - - >( <%= pkg_cancel_link($pkg) %> ) - - - <% } else { %> - - - >Not yet billed (<%= $billed_or_prepaid %> <%= myfreq($pkg->{part_pkg}) %>) - - - <% } %> - - <% } else { %> - - <% unless ( $pkg->{freq} ) { %> - - - >One-time charge - - - - Billed  - <%= pkg_datestr($pkg,'setup',$conf) %> - - - <% } else { %> - - - >Active, <%= $billed_or_prepaid %> <%= myfreq($pkg->{part_pkg}) %> - - - - Setup  - <%= pkg_datestr($pkg, 'setup',$conf) %> - - - <% } %> - - <% } %> - - <% if ( $pkg->{'last_bill'} ) { %> - - <%= $last_bill_or_renewed %>  - <%= pkg_datestr($pkg, 'last_bill',$conf) %> - - <% } %> - - <% if ( $pkg->{'next_bill'} ) { %> - - <%= $next_bill_or_prepaid_until %>  - <%= pkg_datestr($pkg, 'next_bill',$conf) %> - - <% } %> - - <% if ( $pkg->{'expire'} ) { %> - - Expires  - <%= pkg_datestr($pkg, 'expire',$conf) %> - - <% } %> + +<%init> - <% if ( $pkg->{freq} ) { %> - - >( <%= 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 $countrydefault = scalar($conf->config('countrydefault')) || 'US'; - - - -<% - 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!; - } - } +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; } -#end display packages -%> - -<% } 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'; +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'; + +# don't exclude cancelled packages at this stage +my @packages = $cust_main->all_pkgs( { + 'select' => "$cust_pkg_fields, $part_pkg_fields, $num_svcs", + 'addl_from' => qq{ + LEFT JOIN part_pkg USING ( pkgpart ) + 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' ) + }, +} ); + +my $is_anything_hidden = 0; # optimization + +my %change_to_from; # target pkgnum => current cust_pkg, for future changes +my %changed_from; # old pkgnum => new cust_pkg, for past changes +my %supplementals_of; # main pkgnum => arrayref of supplementals + +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; + if ( $cust_pkg->change_to_pkgnum ) { + $change_to_from{$cust_pkg->change_to_pkgnum} = $cust_pkg; + $is_anything_hidden = 1; + } + if ( $cust_pkg->change_pkgnum ) { + $changed_from{$cust_pkg->change_pkgnum} = $cust_pkg; + $is_anything_hidden = 1; + } + if ( $cust_pkg->main_pkgnum ) { + $supplementals_of{$cust_pkg->main_pkgnum} ||= []; + push @{ $supplementals_of{$cust_pkg->main_pkgnum} }, $cust_pkg; + $is_anything_hidden = 1; } - - 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; +} - } +# filter out hidden package changes +if ( $is_anything_hidden ) { + my @displayable_packages; + foreach my $cust_pkg (@packages) { - $pkg{svcparts} = [ values %svcparts ]; + # if this package has any supplemental packages, it should remember them + $cust_pkg->set('_supplemental', $supplementals_of{$cust_pkg->pkgnum}); - push @packages, \%pkg; - - } - - return \@packages; + if ( $cust_pkg->main_pkgnum ) { -} + # it's a supplemental package of something else, and shouldn't be on the + # root list -sub svc_link { + } elsif ( exists( $change_to_from{$cust_pkg->pkgnum} ) ) { - my ($svcpart, $svc) = (shift,shift) or return ''; - return qq!$svcpart->{svc}!; + # $cust_pkg is an ordered, not-yet-active package change target + my $change_from = $change_to_from{ $cust_pkg->pkgnum }; + $cust_pkg->set('change_from_pkg', $change_from); + $change_from->set('change_to_pkg', $cust_pkg); -} + } elsif ( exists( $changed_from{$cust_pkg->pkgnum} ) ) { -sub svc_label_link { + # $cust_pkg is a canceled package changed into another packge + # hide it under the destination package's history + my $changed_to = $changed_from{$cust_pkg->pkgnum}; + $cust_pkg->set('changed_to_pkg', $changed_to); + $changed_to->set('changed_from_pkg', $cust_pkg); - my ($svcpart, $svc) = (shift,shift) or return ''; - return qq!$svc->{label}!; + } else { -} + push @displayable_packages, $cust_pkg; -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!; + @packages = @displayable_packages; } -# 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}); - } +# filter all cancelled packages if the user wants +if ( $hide_cancelled ) { + @packages = grep { !$_->get('cancel') } @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; -} +# filter out 'old' packages +my $num_old_packages = scalar(@packages); -sub pkg_change_link { - my $pkg = shift or return ''; - return qq!!. - qq!Change package!; -} +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 pkg_suspend_link { - my $pkg = shift or return ''; - return qq!Suspend!; -} + my %hide = ( 'cancelled' => 'cancel', + 'one-time charge' => 'setup', + ); -sub pkg_unsuspend_link { - my $pkg = shift or return ''; - return qq!Unsuspend!; + @packages = + grep { !exists($hide{$_->status}) or $_->get($hide{$_->status}) > $then + or $_->num_svcs #don't hide packages w/services + } + @packages; } -sub pkg_cancel_link { - my $pkg = shift or return ''; - qq!!. - qq!Cancel now | !. - qq!Cancel later!; -} +$num_old_packages -= scalar(@packages); -sub pkg_dates_link { - my $pkg = shift or return ''; - qq!Edit dates!; -} +# don't include supplemental packages in this list; they'll be found from +# their main packages +# (as will change-target packages) +####@packages = grep !$_->main_pkgnum, @packages; -sub pkg_customize_link { - my $pkg = shift or return ''; - my $custnum = shift; - qq!Customize!; +foreach my $cust_pkg ( @packages ) { + $cust_pkg->{'_cust_pkg_discount_active'} = + [ $cust_pkg->cust_pkg_discount_active ]; } -%> +