X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=c19196136b89543309212502bc894a1fa05bdd13;hb=5166db343d41a430e89e51682274d6c572ee59ee;hp=7b5b15692edeea3efaf5630665fcb32cb839c218;hpb=ceaa9e6ca4222595c1795c4bbde8d1c9609045e7;p=freeside.git diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html index 7b5b15692..c19196136 100755 --- a/httemplate/view/cust_main/packages.html +++ b/httemplate/view/cust_main/packages.html @@ -3,7 +3,6 @@ td.package { vertical-align: top; border-width: 0; border-style: solid; - border-color: #bbbbff; } table.package { border: none; @@ -11,13 +10,77 @@ table.package { 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; +} + +.hiddenrows td { + text-align: center; +} + +.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 $s = 0; +% # activate rolldown buttons for hidden package blocks + +% unless ( $opt{no_links} ) { + +% my $s = 0; % if ( $curuser->access_right('Qualify service') ) { <% $s++ ? ' | ' : '' %> @@ -33,24 +96,36 @@ table.package { % && $conf->config('payby-default') ne 'HIDE' % ) { <% $s++ ? ' | ' : '' %> - <& one_time_charge_link.html, $cust_main &> + <& /elements/one_time_charge_link.html, 'custnum'=>$cust_main->custnum &> +% } + +% if ( $curuser->access_right('Bulk move customer services') ) { + <% $s++ ? ' | ' : '' %> + + <& /elements/popup_link-cust_main.html, + 'label' => emt('Move services between packages'), + 'action' => "${p}edit/bulk-cust_svc-pkgnum.html", + 'cust_main' => $cust_main, + 'actionlabel' => emt('Move services'), + 'width' => 968, #763, + 'height' => 575, + &> + % } % if ( $curuser->access_right('Bulk change customer packages') ) { <% $s++ ? ' | ' : '' %> - <% mt('Bulk order and cancel packages') |h %> (<% mt('preserves services') |h %>) + <% mt('Bulk order and cancel packages') |h %> % }

+% } # unless $opt{no_links} + + +% unless ( $opt{no_links} ) { + + +% } # unless $opt{no_links} +
-% 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') @@ -79,6 +154,9 @@ table.package { % } <% mt('Package reports') |h %> % if ( $curuser->access_right('Qualify service') ) { @@ -89,39 +167,41 @@ table.package { <% mt('accounts') |h %>
<% mt('Usage reports:') |h %> <% mt('CDRs') |h %> +% if ( $curuser->access_right('Usage: RADIUS sessions') +% and $cust_main->num_usage_pkgs > 0 ) { + | + <& /elements/popup_link-cust_main.html, + 'label' => emt('Data usage'), + 'action' => "${p}search/report_sqlradius_usage-custnum.html", + 'cust_main' => $cust_main, + 'actionlabel' => emt('Data usage report'), + 'width' => 480, + 'height' => 345, + &> +% }
-% 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, - &> -
-% } + +% $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 ( $cgi->param('fragment') =~ /^cust_pkg(\d+)$/ ) { - -% } <%init> @@ -131,78 +211,124 @@ my $conf = new FS::Conf; my $curuser = $FS::CurrentUser::CurrentUser; -my( $packages, $num_old_packages ) = get_packages($cust_main, $conf); - +my $countrydefault = scalar($conf->config('countrydefault')) || 'US'; -my $show_location = $conf->exists('cust_pkg-always_show_location') - || (grep $_->locationnum ne $cust_main->ship_locationnum, @$packages); +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; +} -my $countrydefault = scalar($conf->config('countrydefault')) || 'US'; -#subroutines - -sub get_packages { - my $cust_main = shift or return undef; - my $conf = shift; - - 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 %change_to_from; # target pkgnum => current cust_pkg, for future changes +my %changed_from; # old pkgnum => new cust_pkg, for past changes + +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; } + if ( $cust_pkg->change_pkgnum ) { + $changed_from{$cust_pkg->change_pkgnum} = $cust_pkg; + } +} - my $cust_pkg_fields = - join(', ', map { "cust_pkg.$_ AS $_" } fields('cust_pkg') ); +# filter out hidden package changes +if ( keys %change_to_from or keys %changed_from ) { + my @displayable_packages; + foreach my $cust_pkg (@packages) { - my $part_pkg_fields = - join(', ', map { "part_pkg.$_ AS part_pkg_$_" } fields('part_pkg') ); + if ( exists( $change_to_from{$cust_pkg->pkgnum} ) ) { - my $group_by = - join(', ', map "cust_pkg.$_", fields('cust_pkg') ). ', '. - join(', ', map "part_pkg.$_", fields('part_pkg') ); + # $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); - my $num_svcs = '( SELECT COUNT(*) FROM cust_svc '. - ' WHERE cust_svc.pkgnum = cust_pkg.pkgnum ) AS num_svcs'; + } elsif ( exists( $changed_from{$cust_pkg->pkgnum} ) ) { - 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); + # $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); - 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; - } + } else { + push @displayable_packages, $cust_pkg; + } - 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 - - 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; } + @packages = @displayable_packages; +} + +# filter all cancelled packages if the user wants +if ( $hide_cancelled ) { + @packages = grep { !$_->get('cancel') } @packages; +} + +# filter out 'old' packages +my $num_old_packages = scalar(@packages); + +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 + + 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; +} + +$num_old_packages -= scalar(@packages); - $num_old_packages -= scalar(@packages); - - # don't include supplemental packages in this list; they'll be found from - # their main packages - @packages = grep !$_->main_pkgnum, @packages; +# 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; - ( \@packages, $num_old_packages ); +foreach my $cust_pkg ( @packages ) { + $cust_pkg->{'_cust_pkg_discount_active'} = + [ $cust_pkg->cust_pkg_discount_active ]; }