X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fbrowse%2Fpart_pkg.cgi;h=e3d9de13acac5c42f72c3f0f5bb3dc06b24d7fba;hb=330f2110dfa35f690533c8baf25e2609a8b6d4a6;hp=45fa8f216e2851a58adc62466a188dfe780ecf23;hpb=6eae00a74907ad88924641a9079c59b55102fb5f;p=freeside.git diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index 45fa8f216..e3d9de13a 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -1,61 +1,134 @@ <% include( 'elements/browse.html', - 'title' => 'Package Definitions', - 'html_init' => $html_init, - 'name' => 'package definitions', - 'disableable' => 1, - 'disabled_statuspos' => 3, - 'agent_virt' => 1, - 'agent_null_right' => 'Edit global package definitions', - 'agent_pos' => 5, - 'query' => { 'select' => $select, - 'table' => 'part_pkg', - 'hashref' => {}, - 'order_by' => "ORDER BY $orderby", - }, - 'count_query' => $count_query, - 'header' => \@header, - 'fields' => \@fields, - 'links' => \@links, - 'align' => $align, + 'title' => 'Package Definitions', + 'html_init' => $html_init, + 'html_posttotal' => $html_posttotal, + 'name' => 'package definitions', + 'disableable' => 1, + 'disabled_statuspos' => 4, + 'agent_virt' => 1, + 'agent_null_right' => [ $edit, $edit_global ], + 'agent_null_right_link' => $edit_global, + 'agent_pos' => 6, + 'query' => { 'select' => $select, + 'table' => 'part_pkg', + 'hashref' => \%hash, + 'extra_sql' => $extra_sql, + 'order_by' => "ORDER BY $orderby" + }, + 'count_query' => $count_query, + 'header' => \@header, + 'fields' => \@fields, + 'links' => \@links, + 'align' => $align, ) %> <%init> +my $curuser = $FS::CurrentUser::CurrentUser; + +my $edit = 'Edit package definitions'; +my $edit_global = 'Edit global package definitions'; +my $acl_edit = $curuser->access_right($edit); +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 + die "access denied" - unless $FS::CurrentUser::CurrentUser->access_right('Edit package definitions') - || $FS::CurrentUser::CurrentUser->access_right('Edit global package definitions'); + unless $acl_edit || $acl_edit_global; + +my $conf = new FS::Conf; +my $taxclasses = $conf->exists('enable_taxclasses'); +my $money_char = $conf->config('money_char') || '$'; my $select = '*'; my $orderby = 'pkgpart'; -if ( $cgi->param('active') ) { +my %hash = (); +my $extra_count = ''; +my $family_pkgpart; +if ( $cgi->param('active') ) { $orderby = 'num_active DESC'; } - $select = " - *, +my @where = (); + +#if ( $cgi->param('activeONLY') ) { +# push @where, ' WHERE num_active > 0 '; #XXX doesn't affect count... +#} + +if ( $cgi->param('recurring') ) { + $hash{'freq'} = { op=>'!=', value=>'0' }; + $extra_count = " freq != '0' "; +} + +my $classnum = ''; +if ( $cgi->param('classnum') =~ /^(\d+)$/ ) { + $classnum = $1; + push @where, $classnum ? "classnum = $classnum" + : "classnum IS NULL"; +} +$cgi->delete('classnum'); + +if ( $cgi->param('missing_recur_fee') ) { + push @where, "0 = ( SELECT COUNT(*) FROM part_pkg_option + WHERE optionname = 'recur_fee' + AND part_pkg_option.pkgpart = part_pkg.pkgpart + AND CAST( optionvalue AS NUMERIC ) > 0 + )"; +} - ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart - AND ( cancel IS NULL OR cancel = 0 ) - AND ( susp IS NULL OR susp = 0 ) - ) AS num_active, +if ( $cgi->param('family') =~ /^(\d+)$/ ) { + $family_pkgpart = $1; + push @where, "family_pkgpart = $1"; + # Hiding disabled or one-time charges and limiting by classnum aren't + # very useful in this mode, so all links should still refer back to the + # non-family-limited display. + $cgi->param('showdisabled', 1); + $cgi->delete('family'); +} - ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart - AND ( cancel IS NULL OR cancel = 0 ) - AND susp IS NOT NULL AND susp != 0 - ) AS num_suspended, +push @where, FS::part_pkg->curuser_pkgs_sql + unless $acl_edit_global; - ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart - AND cancel IS NOT NULL AND cancel != 0 - ) AS num_cancelled +my $extra_sql = scalar(@where) + ? ( scalar(keys %hash) ? ' AND ' : ' WHERE ' ). + join( 'AND ', @where) + : ''; - "; +my $agentnums_sql = $curuser->agentnums_sql( 'table'=>'cust_main' ); +my $count_cust_pkg = " + SELECT COUNT(*) FROM cust_pkg LEFT JOIN cust_main USING ( custnum ) + WHERE cust_pkg.pkgpart = part_pkg.pkgpart + AND $agentnums_sql +"; -#} +$select = " -my $conf = new FS::Conf; -my $taxclasses = $conf->exists('enable_taxclasses'); -my $money_char = $conf->config('money_char') || '$'; + *, + + ( $count_cust_pkg + AND ( setup IS NULL OR setup = 0 ) + AND ( cancel IS NULL OR cancel = 0 ) + AND ( susp IS NULL OR susp = 0 ) + ) AS num_not_yet_billed, + + ( $count_cust_pkg + AND setup IS NOT NULL AND setup != 0 + AND ( cancel IS NULL OR cancel = 0 ) + AND ( susp IS NULL OR susp = 0 ) + ) AS num_active, + + ( $count_cust_pkg + AND ( cancel IS NULL OR cancel = 0 ) + AND susp IS NOT NULL AND susp != 0 + ) AS num_suspended, + + ( $count_cust_pkg + AND cancel IS NOT NULL AND cancel != 0 + ) AS num_cancelled + +"; my $html_init; #unless ( $cgi->param('active') ) { @@ -63,19 +136,60 @@ my $html_init; 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! + +


!; #} +$cgi->param('dummy', 1); + +my $filter_change = + qq(\n\n"; + +#restore this so pagination works +$cgi->param('classnum', $classnum) if length($classnum); + +#should hide this if there aren't any classes +my $html_posttotal = + "$filter_change\n
( show class: ". + include('/elements/select-pkg_class.html', + #'curr_value' => $classnum, + 'value' => $classnum, #insist on 0 :/ + 'onchange' => 'filter_change()', + 'pre_options' => [ '-1' => 'all', + '0' => '(none)', ], + 'disable_empty' => 1, + ). + ' )'; + +my $recur_toggle = $cgi->param('recurring') ? 'show' : 'hide'; +$cgi->param('recurring', $cgi->param('recurring') ^ 1 ); + +$html_posttotal .= + '( '. "$recur_toggle one-time charges )"; + +$cgi->param('recurring', $cgi->param('recurring') ^ 1 ); #put it back + # ------ my $link = [ $p.'edit/part_pkg.cgi?', 'pkgpart' ]; -my @header = ( '#', 'Package', 'Comment' ); -my @fields = ( 'pkgpart', 'pkg', 'comment' ); -my $align = 'rll'; -my @links = ( $link, $link, '' ); +my @header = ( '#', 'Package', 'Comment', 'Custom' ); +my @fields = ( 'pkgpart', 'pkg', 'comment', + sub{ ''.$_[0]->custom.'' } + ); +my $align = 'rllc'; +my @links = ( $link, $link, '', '' ); unless ( 0 ) { #already showing only one class or something? push @header, 'Class'; @@ -83,6 +197,12 @@ unless ( 0 ) { #already showing only one class or something? $align .= 'l'; } +if ( $conf->exists('pkg-addon_classnum') ) { + push @header, "Add'l order class"; + push @fields, sub { shift->addon_classname || '(none)'; }; + $align .= 'l'; +} + tie my %plans, 'Tie::IxHash', %{ FS::part_pkg::plan_info() }; tie my %plan_labels, 'Tie::IxHash', @@ -95,8 +215,21 @@ push @fields, sub { my $part_pkg = shift; (my $plan = $plan_labels{$part_pkg->plan} ) =~ s/ / /g; my $is_recur = ( $part_pkg->freq ne '0' ); + my @discounts = sort { $a->months <=> $b->months } + map { $_->discount } + $part_pkg->part_pkg_discount; [ + ( !$family_pkgpart && + $part_pkg->pkgpart == $part_pkg->family_pkgpart ? () : [ + { + 'align'=> 'center', + 'colspan' => 2, + 'size' => '-1', + 'data' => 'Show all versions', + 'link' => $p.'browse/part_pkg.cgi?family='.$part_pkg->family_pkgpart, + } + ] ), [ { data =>$plan, align=>'center', @@ -108,20 +241,34 @@ push @fields, sub { 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)' + : '' + ) + ), align=>'left', }, ], [ - { data=>( $is_recur - ? $money_char.sprintf('%.2f ', $part_pkg->option('recur_fee') ) - : $part_pkg->freq_pretty - ), + { data=>( + $is_recur + ? $money_char. sprintf('%.2f ', $part_pkg->option('recur_fee')) + : $part_pkg->freq_pretty + ), align=> ( $is_recur ? 'right' : 'center' ), colspan=> ( $is_recur ? 1 : 2 ), }, ( $is_recur - ? { data => ( $is_recur ? $part_pkg->freq_pretty : '' ), + ? { data => ( $is_recur + ? $part_pkg->freq_pretty. + ( $part_pkg->option('recur_fee') == 0 + && $part_pkg->recur_show_zero + ? ' (printed on invoices)' + : '' + ) + : '' ), align=>'left', } : () @@ -138,6 +285,28 @@ push @fields, sub { } $part_pkg->bill_part_pkg_link ), + ( scalar(@discounts) + ? [ + { data => 'Discounts', + align=>'center', #? + colspan=>2, + } + ] + : () + ), + ( scalar(@discounts) + ? map { + [ + { data => $_->months. ':', + align => 'right', + }, + { data => $_->amount ? '$'. $_->amount : $_->percent. '%' + } + ] + } + @discounts + : () + ), ]; # $plan_labels{$part_pkg->plan}.'
'. @@ -149,9 +318,42 @@ push @fields, sub { # $part_pkg->freq_pretty; #.'
' }; +### +# Agent goes here if displayed +### + +#agent type +if ( $acl_edit_global ) { + #really we just want a count, but this is fine unless someone has tons + my @all_agent_types = map {$_->typenum} qsearch('agent_type',{}); + if ( scalar(@all_agent_types) > 1 ) { + push @header, 'Agent types'; + my $typelink = $p. 'edit/agent_type.cgi?'; + push @fields, sub { my $part_pkg = shift; + [ + map { my $agent_type = $_->agent_type; + [ + { 'data' => $agent_type->atype, #escape? + 'align' => 'left', + 'link' => ( $acl_config + ? $typelink. + $agent_type->typenum + : '' + ), + }, + ]; + } + $part_pkg->type_pkgs + ]; + }; + $align .= 'l'; + } +} + #if ( $cgi->param('active') ) { push @header, 'Customer
packages'; my %col = ( + 'not yet billed' => '009999', #teal? cyan? 'active' => '00CC00', 'suspended' => 'FF9900', 'cancelled' => 'FF0000', @@ -160,8 +362,8 @@ push @fields, sub { ); my $cust_pkg_link = $p. 'search/cust_pkg.cgi?pkgpart='; push @fields, sub { my $part_pkg = shift; - [ - map { + [ + map( { my $magic = $_; my $label = $_; if ( $magic eq 'active' && $part_pkg->freq == 0 ) { @@ -169,6 +371,7 @@ push @fields, sub { #$label = 'one-time charge', $label = 'charge', } + $label= 'not yet billed' if $magic eq 'not_yet_billed'; [ { @@ -193,8 +396,24 @@ push @fields, sub { ), }, ], - } (qw( active suspended cancelled )) - ]; }; + } (qw( not_yet_billed active suspended cancelled )) + ), + ($acl_config ? + [ {}, + { 'data' => '[ '. + include('/elements/popup_link.html', + 'label' => 'change', + 'action' => "${p}edit/bulk-cust_pkg.html?". + 'pkgpart='.$part_pkg->pkgpart, + 'actionlabel' => 'Change Packages', + 'width' => 569, + 'height' => 210, + ).' ]', + 'align' => 'left', + } + ] : () ), + ]; + }; $align .= 'r'; #} @@ -217,7 +436,7 @@ push @fields, [ map { [ - { 'data' => $_, + { 'data' => "$_: ", 'align' => 'right', }, { 'data' => $part_pkg->format($_,$options{$_}), @@ -270,15 +489,18 @@ push @fields, { 'data' => $svc, 'align' => 'left', - 'link' => $p. 'edit/part_svc.cgi?'. - $part_svc->svcpart, + 'link' => ( $acl_config + ? $p. 'edit/part_svc.cgi?'. + $part_svc->svcpart + : '' + ), }, ]; } sort { $b->primary_svc =~ /^Y/i <=> $a->primary_svc =~ /^Y/i } - $part_pkg->pkg_svc + $part_pkg->pkg_svc('disable_linked'=>1) ), ( map { my $dst_pkg = $_->dst_pkg; @@ -299,9 +521,10 @@ $align .= 'lrl'; #rr'; # -------- -my $count_query = 'SELECT COUNT(*) FROM part_pkg WHERE '. - $FS::CurrentUser::CurrentUser->agentnums_sql( - 'null_right' => 'Edit global package definitions', - ); +my $count_extra_sql = $extra_sql; +$count_extra_sql =~ s/^\s*AND /WHERE /i; +$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";