X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pkg.cgi;h=3e0880fa562ba7e4410c366cc0ef6d8c92846403;hp=8187f773541c8209b0be769e9444bf87de65bf8e;hb=0bd6fd8b74c3cb6a7abf01ba5974d2d9399da3ab;hpb=d8299144d2175f1695adafe29e9549bd9b158e2f diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi index 8187f7735..3e0880fa5 100755 --- a/httemplate/search/cust_pkg.cgi +++ b/httemplate/search/cust_pkg.cgi @@ -4,11 +4,14 @@ 'name' => 'packages', 'query' => $sql_query, 'count_query' => $count_query, + 'html_init_data' => $search_string, 'header' => [ emt('#'), emt('Quan.'), emt('Package'), emt('Class'), emt('Status'), + emt('Sales Person'), + emt('Ordered by'), emt('Setup'), emt('Base Recur'), emt('Freq.'), @@ -20,6 +23,7 @@ emt('Susp. delay'), emt('Expire'), emt('Contract end'), + emt('Changed'), emt('Cancel'), emt('Reason'), FS::UI::Web::cust_header( @@ -33,19 +37,21 @@ sub { $_[0]->pkg; }, 'classname', sub { ucfirst(shift->status); }, + 'salesperson', + 'otaker', sub { sprintf( $money_char.'%.2f', shift->part_pkg->option('setup_fee'), ); }, sub { my $c = shift; sprintf( $money_char.'%.2f', - $c->part_pkg->base_recur($c) + $c->base_recur ); }, sub { FS::part_pkg::freq_pretty(shift); }, ( map { time_or_blank($_) } - qw( setup last_bill bill adjourn susp dundate expire contract_end cancel ) ), + qw( setup last_bill bill adjourn susp dundate expire contract_end change_date cancel ) ), sub { my $self = shift; my $return = ''; @@ -94,13 +100,16 @@ '', '', '', + '', + '', + '', FS::UI::Web::cust_colors(), '', ], - 'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '', '', '', '', '', + 'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', FS::UI::Web::cust_styles() ], 'size' => [ '', '', '', '', '-1' ], - 'align' => 'rrlccrrlrrrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r', + 'align' => 'rrlccccrrlrrrrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r', 'links' => [ $link, $link, @@ -119,6 +128,9 @@ '', '', '', + '', # link to changed-from package? + '', + '', '', ( map { $_ ne 'Cust. Status' ? $clink : '' } FS::UI::Web::cust_header( @@ -139,26 +151,48 @@ my $conf = new FS::Conf; my $money_char = $conf->config('money_char') || '$'; my %search_hash = (); +my $search_string; #some false laziness w/misc/bulk_change_pkg.cgi $search_hash{'query'} = $cgi->keywords; #scalars -for (qw( agentnum custnum magic status classnum custom cust_fields pkgbatch )) { - $search_hash{$_} = $cgi->param($_) if $cgi->param($_); +for (qw( agentnum cust_status cust_main_salesnum salesnum custnum magic status + reasonnum custom cust_fields pkgbatch zip + 477part 477rownum date + )) +{ + $search_hash{$_} = $cgi->param($_) if length($cgi->param($_)); + $search_string .= '&'.$_.'='.$cgi->param($_) if length($cgi->param($_)); } -$search_hash{'pkgpart'} = [ $cgi->param('pkgpart') ]; +#arrays +for my $param (qw( pkgpart classnum refnum towernum )) { + $search_hash{$param} = [ $cgi->param($param) ] + if grep { $_ eq $param } $cgi->param; + $search_string .= '&'.$param.'='.$cgi->param($param) if grep { $_ eq $param } $cgi->param; +} -for my $param ( qw(censustract) ) { +#scalars that need to be passed if empty +for my $param (qw( censustract censustract2 )) { $search_hash{$param} = $cgi->param($param) || '' - if ( grep { /$param/ } $cgi->param ); + if grep { $_ eq $param } $cgi->param; + $search_string .= '&'.$param.'='.$cgi->param($param) if grep { $_ eq $param } $cgi->param; } -my @report_option = $cgi->param('report_option') - if $cgi->param('report_option'); -$search_hash{report_option} = join(',', @report_option) if @report_option; +#location flags (checkboxes) +my @loc = grep /^\w+$/, $cgi->param('loc'); +$search_hash{"location_$_"} = 1 foreach @loc; +$search_string .= '&location_'.$_.'=1' foreach @loc; + +my $report_option = $cgi->param('report_option'); +$search_hash{report_option} = $report_option if $report_option; +$search_string .= '&report_option='.$report_option if $report_option; + +for my $param (grep /^report_option_any/, $cgi->param) { + $search_hash{$param} = $cgi->param($param); +} ### # parse dates @@ -174,7 +208,10 @@ my %disable = ( '' => {}, ); -foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end cancel active )) { +foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end change_date cancel active )) { + + $search_hash{$field.'_null'} = scalar( $cgi->param($field.'_null') ); + $search_string .= '&'.$field.'_null='.scalar( $cgi->param($field.'_null') ); my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field); @@ -182,6 +219,7 @@ foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end can or $disable{$cgi->param('status')}->{$field}; $search_hash{$field} = [ $beginning, $ending ]; + $search_string .= '&'.$field.'_begin='.$beginning.'&'.$field.'_end='.$ending; } @@ -232,6 +270,31 @@ my $html_init = sub { 'height' => 210, ). '
'; + $text .= include( '/elements/popup_link.html', + 'label' => emt('Suspend these packages'), + 'action' => "${p}misc/bulk_suspend_pkg.cgi?$query", + 'actionlabel' => emt('Suspend Packages'), + 'width' => 569, + 'height' => 210, + ). '
' if $search_hash{status} eq 'active'; + + $text .= include( '/elements/popup_link.html', + 'label' => emt('Unsuspend these packages'), + 'action' => "${p}misc/bulk_unsuspend_pkg.cgi?$query", + 'actionlabel' => emt('Unsuspend Packages'), + 'width' => 569, + 'height' => 210, + ). '
' if $search_hash{status} eq 'suspended'; + + $text .= include( '/elements/popup_link.html', + 'label' => emt('Cancel these packages'), + 'action' => "${p}misc/bulk_cancel_pkg.cgi?$query", + 'actionlabel' => emt('Cancel Packages'), + 'width' => 569, + 'height' => 210, + 'color' => '#ff0000', + ). '
' unless $search_hash{status} eq 'cancelled'; + if ( $curuser->access_right('Edit customer package dates') ) { $text .= include( '/elements/popup_link.html', 'label' => emt('Increment next bill date'), @@ -244,7 +307,7 @@ my $html_init = sub { $text .= include( '/elements/email-link.html', 'search_hash' => \%search_hash, 'table' => 'cust_pkg', - ); + ). '

'; } return $text; }; @@ -283,11 +346,14 @@ my $process_svc_labels = sub { foreach ( map { [ $_->label ] } @{ $part_svc->cust_pkg_svc } ) { push @out, [ { 'data' => $_->[0]. ':', - 'align'=> 'right', }, + 'align'=> 'right', + }, + { 'data' => $_->[1], 'align'=> 'left', - 'link' => $p. 'view/' . - $_->[2]. '.cgi?'. $_->[3], }, + 'link' => $p. 'view/cust_svc.cgi?' . $_->[3], + }, + ]; } }