X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fbrowse%2Fpart_pkg.cgi;h=d0c14da4c6ac471426fe891d274326ba13c73ac7;hb=6b28d0bd4b422d0fff32b559d0785665b1c46b27;hp=4ca78d718e112097f84abf9746eee6be7f31dde2;hpb=77977d04ed407c3a44877a83b475a3800a581361;p=freeside.git diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index 4ca78d718..d0c14da4c 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -1,6 +1,8 @@ <% include( 'elements/browse.html', 'title' => 'Package Definitions', + 'menubar' => \@menubar, 'html_init' => $html_init, + 'html_form' => $html_form, 'html_posttotal' => $html_posttotal, 'name' => 'package definitions', 'disableable' => 1, @@ -20,6 +22,9 @@ 'fields' => \@fields, 'links' => \@links, 'align' => $align, + 'link_field' => 'pkgpart', + 'html_init' => $html_init, + 'html_foot' => $html_foot, ) %> <%init> @@ -33,6 +38,7 @@ my $acl_edit_global = $curuser->access_right($edit_global); my $acl_config = $curuser->access_right('Configuration'); #to edit services #and agent types #and bulk change +my $acl_edit_bulk = $curuser->access_right('Bulk edit package definitions'); die "access denied" unless $acl_edit || $acl_edit_global; @@ -122,21 +128,26 @@ $select = " ( $count_cust_pkg AND ( cancel IS NULL OR cancel = 0 ) AND susp IS NOT NULL AND susp != 0 + AND setup IS NOT NULL AND setup != 0 ) AS num_suspended, ( $count_cust_pkg + AND ( cancel IS NULL OR cancel = 0 ) + AND susp IS NOT NULL AND susp != 0 + AND ( setup IS NULL OR setup = 0 ) + ) AS num_on_hold, + + ( $count_cust_pkg AND cancel IS NOT NULL AND cancel != 0 ) AS num_cancelled "; -my $html_init; -#unless ( $cgi->param('active') ) { - $html_init = qq! +my $html_init = qq! One or more service definitions are grouped together into a package definition and given pricing information. Customers purchase packages rather than purchase services directly.

-
+ Add a new package definition or !.include('/elements/select-part_pkg.html', 'element_name' => 'clone' ). qq! @@ -144,7 +155,6 @@ my $html_init;


!; -#} $cgi->param('dummy', 1); @@ -238,10 +248,10 @@ push @fields, sub { ], [ { data =>$money_char. - sprintf('%.2f', $part_pkg->option('setup_fee') ), + sprintf('%.2f ', $part_pkg->option('setup_fee') ), align=>'right' }, - { data => ( ( $is_recur ? ' setup' : ' one-time' ). + { data => ( ( $is_recur ? '   setup' : '   one-time' ). ( $part_pkg->option('recur_fee') == 0 && $part_pkg->setup_show_zero ? ' (printed on invoices)' @@ -254,7 +264,7 @@ push @fields, sub { [ { data=>( $is_recur - ? $money_char. sprintf('%.2f ', $part_pkg->option('recur_fee')) + ? $money_char. sprintf('%.2f', $part_pkg->option('recur_fee')) : $part_pkg->freq_pretty ), align=> ( $is_recur ? 'right' : 'center' ), @@ -262,7 +272,7 @@ push @fields, sub { }, ( $is_recur ? { data => ( $is_recur - ? $part_pkg->freq_pretty. + ? '   '. $part_pkg->freq_pretty. ( $part_pkg->option('recur_fee') == 0 && $part_pkg->recur_show_zero ? ' (printed on invoices)' @@ -274,6 +284,32 @@ push @fields, sub { : () ), ], + ( + map { my $amount = $_->amount / ($_->target_info->{multiplier} || 1); + my $label = $_->target_info->{label}; + [ + { data => "Plus $money_char". $_->price. ' '. + ( $_->action eq 'increment' ? 'per' : 'for' ). + " $amount $label", + align => 'center', #left? + colspan => 2, + }, + ]; + } + $part_pkg->part_pkg_usageprice + ), + ( map { my $dst_pkg = $_->dst_pkg; + [ + { data => 'Supplemental:  '. + '' . + $dst_pkg->pkg . '', + align=> 'center', + colspan => 2, + } + ] + } + $part_pkg->supp_part_pkg_link + ), ( map { my $dst_pkg = $_->dst_pkg; [ @@ -353,6 +389,7 @@ if ( $acl_edit_global ) { #if ( $cgi->param('active') ) { push @header, 'Customer
packages'; my %col = ( + 'on hold' => '7E0079', #purple! 'not yet billed' => '009999', #teal? cyan? 'active' => '00CC00', 'suspended' => 'FF9900', @@ -368,10 +405,11 @@ if ( $acl_edit_global ) { my $label = $_; if ( $magic eq 'active' && $part_pkg->freq == 0 ) { $magic = 'inactive'; - #$label = 'one-time charge', - $label = 'charge', + #$label = 'one-time charge'; + $label = 'charge'; } $label= 'not yet billed' if $magic eq 'not_yet_billed'; + $label= 'on hold' if $magic eq 'on_hold'; [ { @@ -396,7 +434,7 @@ if ( $acl_edit_global ) { ), }, ], - } (qw( not_yet_billed active suspended cancelled )) + } (qw( on_hold not_yet_billed active suspended cancelled )) ), ($acl_config ? [ {}, @@ -423,6 +461,10 @@ if ( $taxclasses ) { $align .= 'l'; } +# make a table of report class optionnames => the actual +my %report_optionname_name = map { 'report_option_'.$_->num, $_->name } + qsearch('part_pkg_report_option', { disabled => '' }); + push @header, 'Plan options', 'Services'; #'Service', 'Quan', 'Primary'; @@ -433,10 +475,20 @@ push @fields, if ( $part_pkg->plan ) { my %options = $part_pkg->options; - - [ map { + # gather any options that are really report options, + # convert them to their user-friendly names, + # and sort them (I think?) + my @report_options = + sort { $a cmp $b } + map { $report_optionname_name{$_} } + grep { $options{$_} + and exists($report_optionname_name{$_}) } + keys %options; + + my @rows = ( + map { [ - { 'data' => $_, + { 'data' => "$_: ", 'align' => 'right', }, { 'data' => $part_pkg->format($_,$options{$_}), @@ -445,11 +497,30 @@ push @fields, ]; } grep { $options{$_} =~ /\S/ } - grep { $_ !~ /^(setup|recur)_fee$/ } + grep { $_ !~ /^(setup|recur)_fee$/ + and $_ !~ /^report_option_\d+$/ } keys %options - ]; + ); + if ( @report_options ) { + push @rows, + [ { 'data' => 'Report classes', + 'align' => 'center', + 'style' => 'font-weight: bold', + 'colspan' => 2 + } ]; + foreach (@report_options) { + push @rows, [ + { 'data' => $_, + 'align' => 'center', + 'colspan' => 2 + } + ]; + } # foreach @report_options + } # if @report_options - } else { + return \@rows; + + } else { # should never happen... [ map { [ { 'data' => uc($_), @@ -470,6 +541,8 @@ push @fields, sub { my $part_pkg = shift; + my @part_pkg_usage = sort { $a->priority <=> $b->priority } + $part_pkg->part_pkg_usage; [ (map { @@ -512,7 +585,27 @@ push @fields, ] } $part_pkg->svc_part_pkg_link - ) + ), + ( scalar(@part_pkg_usage) ? + [ { data => 'Usage minutes', + align => 'center', + colspan => 2, + data_style => 'b', + link => $p.'browse/part_pkg_usage.html#pkgpart'. + $part_pkg->pkgpart + } ] + : () + ), + ( map { + [ { data => $_->minutes, + align => 'right' + }, + { data => $_->description, + align => 'left' + }, + ] + } @part_pkg_usage + ), ]; }; @@ -527,4 +620,25 @@ $extra_count = ( $count_extra_sql ? ' AND ' : ' WHERE ' ). $extra_count if $extra_count; my $count_query = "SELECT COUNT(*) FROM part_pkg $count_extra_sql $extra_count"; +my $html_form = ''; +my $html_foot = ''; +if ( $acl_edit_bulk ) { + # insert a checkbox column + push @header, ''; + push @fields, sub { + ''; + }; + push @links, ''; + $align .= 'c'; + $html_form = qq!
!; + $html_foot = include('/search/elements/checkbox-foot.html', + submit => 'edit report classes', # for now it's only report classes + ) . '
'; +} + +my @menubar; +# show this if there are any voip_cdr packages defined +if ( FS::part_pkg->count("plan = 'voip_cdr'") ) { + push @menubar, 'Per-package usage minutes' => $p.'browse/part_pkg_usage.html'; +}