diff options
Diffstat (limited to 'httemplate')
20 files changed, 500 insertions, 131 deletions
diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi index 89f16158f..7e67c833a 100755 --- a/httemplate/edit/part_pkg.cgi +++ b/httemplate/edit/part_pkg.cgi @@ -13,7 +13,8 @@ 'html_bottom' => $html_bottom, 'body_etc' => 'onLoad="agent_changed(document.edit_topform.agentnum); - aux_planchanged(document.edit_topform.plan)"', + aux_planchanged(document.edit_topform.plan); + hide_supp_pkgs()"', 'begin_callback' => $begin_callback, 'end_callback' => $end_callback, @@ -61,10 +62,11 @@ 'discountnum' => 'Offer discounts for longer terms', 'bill_dst_pkgpart' => 'Include line item(s) from package', 'svc_dst_pkgpart' => 'Include services of package', - 'supp_dst_pkgpart' => 'Include complete package', + 'supp_dst_pkgpart' => 'When ordering package, also order', 'report_option' => 'Report classes', 'fcc_ds0s' => 'Voice-grade equivalents', 'fcc_voip_class' => 'Category', + 'delay_start' => 'Default delay (days)', }, 'fields' => [ @@ -199,6 +201,16 @@ { field=>'setup_cost', type=>'money', }, { field=>'recur_cost', type=>'money', }, + ( $conf->exists('part_pkg-delay_start') + ? ( { type => 'tablebreak-tr-title', + value => 'Delayed start', + }, + { field => 'delay_start', + type => 'text', size => 6 }, + ) + : () + ), + { type => 'columnnext' }, { field => 'agent_type', @@ -264,19 +276,6 @@ }, { 'type' => 'tablebreak-tr-title', - 'value' => 'Supplemental packages', - 'colspan' => '4', - }, - { 'field' => 'supp_dst_pkgpart', - 'type' => 'select-part_pkg', - 'm2_label' => 'Include complete package', - 'm2m_method' => 'supp_part_pkg_link', - 'm2m_dstcol' => 'dst_pkgpart', - 'm2_error_callback' => - &{$m2_error_callback_maker}('supp'), - }, - - { 'type' => 'tablebreak-tr-title', 'value' => 'Pricing add-ons', 'colspan' => 4, }, @@ -319,6 +318,22 @@ &{$m2_error_callback_maker}('svc'), }, + { 'type' => 'tablebreak-tr-title', + 'value' => 'Supplemental packages', + 'colspan' => '4', + 'include_opt_callback' => sub { + 'id' => 'show_supp_pkgs', + }, + }, + { 'field' => 'supp_dst_pkgpart', + 'type' => 'select-part_pkg', + 'm2_label' => 'When ordering package, also order', + 'm2m_method' => 'supp_part_pkg_link', + 'm2m_dstcol' => 'dst_pkgpart', + 'm2_error_callback' => + &{$m2_error_callback_maker}('supp'), + }, + { type => 'tablebreak-tr-title', value => 'Price plan options', }, @@ -782,6 +797,34 @@ my $javascript = <<'END'; } + // some magic to make "supplemental packages" less obvious + var supp_pkg_rows = []; + function show_supp_pkgs_click() { + supp_pkg_rows[0].style.display = ''; + this.onclick = ''; + this.style.backgroundColor = ''; + this.style.border = ''; + this.style.padding = ''; + } + + function hide_supp_pkgs() { + var all_selects = document.getElementsByTagName('select'); + for (var i=0; i < all_selects.length; i++) { + if ( all_selects[i].id.match(/^supp_dst_pkgpart/) ) { + supp_pkg_rows.push( all_selects[i].parentNode.parentNode ); + } + } + if ( supp_pkg_rows.length == 1 ) { + // there are none configured, so hide the row to create a new one + supp_pkg_rows[0].style.display = 'none'; + var button = document.getElementById('show_supp_pkgs'); + button.onclick = show_supp_pkgs_click; + button.style.backgroundColor = '#cccccc'; + button.style.border = '1px solid #7e0079'; + button.style.padding = '1px'; + } + } + END my $warning = diff --git a/httemplate/edit/process/change-cust_pkg.html b/httemplate/edit/process/change-cust_pkg.html index c893f13a2..9d06d8e1a 100644 --- a/httemplate/edit/process/change-cust_pkg.html +++ b/httemplate/edit/process/change-cust_pkg.html @@ -40,8 +40,35 @@ if ( $cgi->param('locationnum') == -1 ) { $change{'cust_location'} = $cust_location; } -my $pkg_or_error = $cust_pkg->change( \%change ); +my $error; +if ( $cgi->param('delay') ) { + my $date = parse_datetime($cgi->param('start_date')); + if (!$date) { + $error = "Invalid change date '".$cgi->param('start_date')."'."; + } elsif ( $date < time ) { + $error = "Change date ".$cgi->param('start_date')." is in the past."; + } else { + # schedule the change + $change{'start_date'} = $date; + $error = $cust_pkg->change_later(\%change); + } +} else { + # special case: if there's a package change scheduled, and it matches + # the parameters the user requested this time, then change to the existing + # future package. + if ( $cust_pkg->change_to_pkgnum ) { + my $change_to = FS::cust_pkg->by_key($cust_pkg->change_to_pkgnum); + if ( $change_to->pkgpart == $change{'pkgpart'} and + $change_to->locationnum == $change{'locationnum'} ) { -my $error = ref($pkg_or_error) ? '' : $pkg_or_error; + %change = ( 'cust_pkg' => $change_to ); + + } + } + + # do a package change right now + my $pkg_or_error = $cust_pkg->change( \%change ); + $error = ref($pkg_or_error) ? '' : $pkg_or_error; +} </%init> diff --git a/httemplate/elements/order_pkg.js b/httemplate/elements/order_pkg.js index 1069a0ee4..762b2ddde 100644 --- a/httemplate/elements/order_pkg.js +++ b/httemplate/elements/order_pkg.js @@ -4,9 +4,15 @@ function pkg_changed () { if ( form.pkgpart.selectedIndex > 0 ) { + var opt = form.pkgpart.options[form.pkgpart.selectedIndex]; + var date_button = document.getElementById('start_date_button'); + var date_button_disabled = document.getElementById('start_date_button_disabled'); + var date_text = document.getElementById('start_date_text'); + + form.submitButton.disabled = false; if ( discountnum ) { - if ( form.pkgpart.options[form.pkgpart.selectedIndex].getAttribute('data-can_discount') == 1 ) { + if ( opt.getAttribute('data-can_discount') == 1 ) { form.discountnum.disabled = false; discountnum_changed(form.discountnum); } else { @@ -15,14 +21,17 @@ function pkg_changed () { } } - if ( form.pkgpart.options[form.pkgpart.selectedIndex].getAttribute('data-can_start_date') == 1 ) { - form.start_date_text.disabled = false; - form.start_date.style.backgroundColor = '#ffffff'; - form.start_date_button.style.display = ''; + form.start_date_text.value = opt.getAttribute('data-start_date'); + if ( opt.getAttribute('data-can_start_date') == 1 ) { + date_text.style.backgroundColor = '#ffffff'; + date_text.disabled = false; + date_button.style.display = ''; + date_button_disabled.style.display = 'none'; } else { - form.start_date_text.disabled = true; - form.start_date.style.backgroundColor = '#dddddd'; - form.start_date_button.style.display = 'none'; + date_text.style.backgroundColor = '#dddddd'; + date_text.disabled = true; + date_button.style.display = 'none'; + date_button_disabled.style.display = ''; } } else { diff --git a/httemplate/elements/select-part_pkg.html b/httemplate/elements/select-part_pkg.html index 439c4b53e..9d41b07dc 100644 --- a/httemplate/elements/select-part_pkg.html +++ b/httemplate/elements/select-part_pkg.html @@ -23,7 +23,6 @@ Example: 'empty_label' => 'Select package', #should this be the default? 'label_callback' => sub { shift->pkg_comment }, 'hashref' => \%hash, - 'extra_option_attributes' => [ 'can_discount', 'can_start_date' ], %opt, ) %> diff --git a/httemplate/elements/tr-justtitle.html b/httemplate/elements/tr-justtitle.html index e9eda8b18..b87f7e128 100644 --- a/httemplate/elements/tr-justtitle.html +++ b/httemplate/elements/tr-justtitle.html @@ -1,5 +1,5 @@ <TR> - <TH CLASS="background" COLSPAN=<% $opt{colspan} || 2 %> ALIGN="left"> + <TH CLASS="background" COLSPAN=<% $opt{colspan} || 2 %> ALIGN="left" <%$id%>> <FONT SIZE="+1"><% $opt{value} %></FONT> </TH> </TR> @@ -7,5 +7,6 @@ <%init> my %opt = @_; +my $id = 'ID="'.$opt{id}.'"' if $opt{id}; </%init> diff --git a/httemplate/elements/tr-select-cust-part_pkg.html b/httemplate/elements/tr-select-cust-part_pkg.html index 848ab0a4b..488f04a13 100644 --- a/httemplate/elements/tr-select-cust-part_pkg.html +++ b/httemplate/elements/tr-select-cust-part_pkg.html @@ -7,10 +7,11 @@ <SCRIPT TYPE="text/javascript"> - function part_pkg_opt(what, value, text, can_discount, can_start_date) { + function part_pkg_opt(what, value, text, can_discount, can_start_date, start_date) { var optionName = new Option(text, value, false, false); optionName.setAttribute('data-can_discount', can_discount); optionName.setAttribute('data-can_start_date', can_start_date); + optionName.setAttribute('data-start_date', start_date || ''); var length = what.length; what.options[length] = optionName; } @@ -19,7 +20,7 @@ what.form.pkgpart.disabled = 'disabled'; //disable part_pkg dropdown var submitButton = what.form.submitButton; // || what.form.submit; - if ( submitButton ) { + if ( submitButton && <% $opt{'curr_value'} ? 0 : 1 %> ) { submitButton.disabled = true; //disable the submit button } var discountnum = what.form.discountnum; @@ -38,16 +39,21 @@ // add the new packages opt(what.form.pkgpart, '', 'Select package'); var packagesArray = eval('(' + part_pkg + ')' ); - for ( var s = 0; s < packagesArray.length; s=s+4 ) { + for ( var s = 0; s < packagesArray.length; s=s+5 ) { + //surely this should be some kind of JSON structure var packagesLabel = packagesArray[s+1]; var can_discount = packagesArray[s+2]; var can_start_date = packagesArray[s+3]; + var start_date = packagesArray[s+4]; part_pkg_opt( - what.form.pkgpart, packagesArray[s], packagesLabel, can_discount, can_start_date + what.form.pkgpart, packagesArray[s], packagesLabel, can_discount, can_start_date, start_date ); } what.form.pkgpart.disabled = ''; //re-enable part_pkg dropdown +% if ( $opt{'curr_value'} ) { + what.form.pkgpart.value = <% $opt{'curr_value'} %>; +% } } @@ -58,6 +64,10 @@ ); } + window.onload = function() { + classnum_changed(document.getElementById('classnum')); + } + </SCRIPT> <TR> diff --git a/httemplate/graph/cust_bill_pkg.cgi b/httemplate/graph/cust_bill_pkg.cgi index 91bedf3fe..96404a438 100644 --- a/httemplate/graph/cust_bill_pkg.cgi +++ b/httemplate/graph/cust_bill_pkg.cgi @@ -83,35 +83,67 @@ $bottom_link .= "cust_classnum=$_;" foreach @cust_classnums; #false lazinessish w/FS::cust_pkg::search_sql (previously search/cust_pkg.cgi) my $classnum = 0; -my @pkg_class = (); +my (@classnums, @classnames); my $all_class = ''; -if ( $cgi->param('classnum') eq 'all' ) { - $all_class = 'ALL'; - @pkg_class = (''); + +my ($class_table, $name_col, $value_col, $class_param); + +if ( $cgi->param('mode') eq 'report' ) { + $class_param = 'report_optionnum'; # CGI param name, also used in the report engine + $class_table = 'part_pkg_report_option'; # table containing classes + $name_col = 'name'; # the column of that table containing the label + $value_col = 'num'; # the column containing the class number +} else { + $class_param = 'classnum'; + $class_table = 'pkg_class'; + $name_col = 'classname'; + $value_col = 'classnum'; } -elsif ( $cgi->param('classnum') =~ /^(\d*)$/ ) { + +if ( $cgi->param($class_param) eq 'all' ) { # all, aggregated + $all_class = 'ALL'; + @classnums = (''); + @classnames = (''); +} elsif ( $cgi->param($class_param) =~ /^(\d*)$/ ) { + $classnum = $1; if ( $classnum ) { #a specific class + my $class = qsearchs($class_table, { $value_col => $classnum }) + or die "$class_table #$classnum not found"; - @pkg_class = ( qsearchs('pkg_class', { 'classnum' => $classnum } ) ); - die "classnum $classnum not found!" unless $pkg_class[0]; - $title .= ' '.$pkg_class[0]->classname.' '; - $bottom_link .= "classnum=$classnum;"; + $title .= ' '.$class->get($name_col); + $bottom_link .= "$class_param=$classnum;"; - } elsif ( $classnum eq '' ) { #the empty class + @classnums = ($classnum); + @classnames = ($class->get($name_col)); - $title .= 'Empty class '; - @pkg_class = ( '(empty class)' ); - $bottom_link .= "classnum=0;"; + } elsif ( $classnum eq '0' ) { #the empty class - } elsif ( $classnum eq '0' ) { #all classes + $title .= ' Empty class '; + @classnums = ( '' ); + @classnames = ( '(empty class)' ); + $bottom_link .= "$class_param=0;"; - @pkg_class = qsearch('pkg_class', {} ); # { 'disabled' => '' } ); - push @pkg_class, '(empty class)'; + } elsif ( $classnum eq '' ) { #all, breakdown + my @classes = qsearch($class_table, {}); + @classnames = map { $_->get($name_col) } @classes; + @classnums = map { $_->get($value_col) } @classes; + + push @classnames, '(empty class)'; + push @classnums, '0'; + + if ( $cgi->param('mode') eq 'report' ) { + # In theory, a package can belong to any subset of the report classes, + # so the report groups should be all the _subsets_, but for now we're + # handling the simple case where each package belongs to one report + # class. Packages with multiple classes will go into one bin at the + # end. + push @classnames, '(multiple classes)'; + push @classnums, 'multiple'; + } } -} -#eslaf +} #eslaf my $hue = 0; #my $hue_increment = 170; @@ -163,7 +195,9 @@ foreach my $agent ( $all_agent || $sel_agent || qsearch('agent', { 'disabled' => qsearch('part_referral', { 'disabled' => '' } ) ) { - foreach my $pkg_class ( @pkg_class ) { + for (my $i = 0; $i < scalar @classnums; $i++) { + my $row_classnum = $classnums[$i]; + my $row_classname = $classnames[$i]; foreach my $component ( @components ) { push @items, 'cust_bill_pkg'; @@ -171,16 +205,11 @@ foreach my $agent ( $all_agent || $sel_agent || qsearch('agent', { 'disabled' => push @labels, ( $all_agent || $sel_agent ? '' : $agent->agent.' ' ). ( $all_part_referral || $sel_part_referral ? '' : $part_referral->referral.' ' ). - ( $classnum eq '0' - ? ( ref($pkg_class) ? $pkg_class->classname : $pkg_class ) - : '' - ). - ' '.$charge_labels{$component}; + $row_classname . ' ' . $charge_labels{$component}; - my $row_classnum = ref($pkg_class) ? $pkg_class->classnum : 0; my $row_agentnum = $all_agent || $agent->agentnum; my $row_refnum = $all_part_referral || $part_referral->refnum; - push @params, [ ($all_class ? () : ('classnum' => $row_classnum) ), + push @params, [ ($all_class ? () : ($class_param => $row_classnum) ), ($all_agent ? () : ('agentnum' => $row_agentnum) ), ($all_part_referral ? () : ('refnum' => $row_refnum) ), 'use_override' => $use_override, @@ -193,7 +222,7 @@ foreach my $agent ( $all_agent || $sel_agent || qsearch('agent', { 'disabled' => ($all_agent ? '' : "agentnum=$row_agentnum;"). ($all_part_referral ? '' : "refnum=$row_refnum;"). (join('',map {"cust_classnum=$_;"} @cust_classnums)). - ($all_class ? '' : "classnum=$row_classnum;"). + ($all_class ? '' : "$class_param=$row_classnum;"). "distribute=$distribute;". "use_override=$use_override;charges=$component;"; @@ -205,7 +234,7 @@ foreach my $agent ( $all_agent || $sel_agent || qsearch('agent', { 'disabled' => push @no_graph, 0; } #foreach $component - } #foreach $pkg_class + } #foreach $row_classnum } #foreach $part_referral if ( $cgi->param('agent_totals') and !$all_agent ) { @@ -226,11 +255,10 @@ foreach my $agent ( $all_agent || $sel_agent || qsearch('agent', { 'disabled' => "charges=$component"; # Also apply any refnum/classnum filters - if ( !$all_class and scalar(@pkg_class) == 1 ) { + if ( !$all_class and scalar(@classnums) == 1 ) { # then a specific class has been chosen, but it may be the empty class - my $row_classnum = ref($pkg_class[0]) ? $pkg_class[0]->classnum : 0; - push @row_params, 'classnum' => $row_classnum; - $row_link .= ";classnum=$row_classnum"; + push @row_params, $class_param => $classnums[0]; + $row_link .= ";$class_param=".$classnums[0]; } if ( $sel_part_referral ) { push @row_params, 'refnum' => $sel_part_referral->refnum; diff --git a/httemplate/graph/report_cust_bill_pkg.html b/httemplate/graph/report_cust_bill_pkg.html index 251e7d36e..d3d8e664d 100644 --- a/httemplate/graph/report_cust_bill_pkg.html +++ b/httemplate/graph/report_cust_bill_pkg.html @@ -23,6 +23,27 @@ function enable_agent_totals(obj) { ) ); } + +function mode_changed() { + var options = document.getElementsByName('mode'); + var mode; + for(var i=0; i < options.length; i++) { + if (options[i].checked) { + mode = options[i].value; + } + } + + var div_pkg = document.getElementById('pkg_class'); + var div_report = document.getElementById('report_class'); + if (mode == 'pkg') { + div_pkg.style.display = ''; + div_report.style.display = 'none'; + } else if (mode == 'report') { + div_pkg.style.display = 'none'; + div_report.style.display = ''; + } +} +window.onload = mode_changed; </SCRIPT> <& /elements/tr-select-agent.html, @@ -49,13 +70,40 @@ function enable_agent_totals(obj) { 'onchange' => 'enable_agent_totals' &> -<& /elements/tr-select-pkg_class.html, - 'field' => 'classnum', - 'pre_options' => [ 'all' => 'all (aggregate)', - '0' => 'all (breakdown)' ], - 'empty_label' => '(empty class)', - 'onchange' => 'enable_agent_totals', -&> +<TR> + <TD ALIGN="right"> + <INPUT TYPE="radio" NAME="mode" VALUE="pkg" onchange="mode_changed('pkg')" CHECKED> + <% emt('Package class') %> + <BR> + <INPUT TYPE="radio" NAME="mode" VALUE="report" onchange="mode_changed('report')"> + <% emt('Report class') %> + </TD> + <TD> + <DIV ID="pkg_class"> + <& /elements/select-pkg_class.html, + 'field' => 'classnum', + 'pre_options' => [ 'all' => 'all (aggregate)', + '' => 'all (breakdown)', + '0' => '(empty class)' ], + 'disable_empty' => 1, + 'onchange' => 'enable_agent_totals', + &> + </DIV> + <DIV ID="report_class" STYLE="display: none"> + <& /elements/select-table.html, + 'field' => 'report_optionnum', + 'table' => 'part_pkg_report_option', + 'name_col' => 'name', + 'value_col' => 'num', + 'pre_options' => [ 'all' => 'all (aggregate)', + '' => 'all (breakdown)', + '0' => '(empty class)' ], + 'disable_empty' => 1, + 'onchange' => 'enable_agent_totals', + &> + </DIV> + </TD> +</TR> <!-- <TR> diff --git a/httemplate/misc/change_pkg.cgi b/httemplate/misc/change_pkg.cgi index 03e336cba..7425fbfaf 100755 --- a/httemplate/misc/change_pkg.cgi +++ b/httemplate/misc/change_pkg.cgi @@ -1,7 +1,6 @@ -<& /elements/header-popup.html, mt("Change Package") &> +<& /elements/header-popup.html, mt($title) &> <SCRIPT TYPE="text/javascript" SRC="../elements/order_pkg.js"></SCRIPT> - <& /elements/error.html &> <FORM NAME="OrderPkgForm" ACTION="<% $p %>edit/process/change-cust_pkg.html" METHOD=POST> @@ -30,6 +29,21 @@ </TABLE> +<TABLE> + <TR> + <TD> Apply this change: </TD> + <TD> <INPUT TYPE="radio" NAME="delay" VALUE="0" \ + <% !$cgi->param('delay') ? 'CHECKED' : '' %>> now </TD> + <TD> <INPUT TYPE="radio" NAME="delay" VALUE="1" \ + <% $cgi->param('delay') ? 'CHECKED' : '' %>> in the future + <& /elements/input-date-field.html, { + 'name' => 'start_date', + 'value' => ($cgi->param('start_date') || $cust_main->next_bill_date), + } &> + </TD> + </TR> +</TABLE> + <& /elements/standardize_locations.html, 'form' => "OrderPkgForm", 'callback' => 'document.OrderPkgForm.submit();', @@ -74,4 +88,15 @@ my $cust_main = $cust_pkg->cust_main my $part_pkg = $cust_pkg->part_pkg; +my $title = "Change Package"; + +# if there's already a package change ordered, preload it +if ( $cust_pkg->change_to_pkgnum ) { + my $change_to = FS::cust_pkg->by_key($cust_pkg->change_to_pkgnum); + $cgi->param('delay', 1); + foreach(qw( start_date pkgpart locationnum )) { + $cgi->param($_, $change_to->get($_)); + } + $title = "Edit Scheduled Package Change"; +} </%init> diff --git a/httemplate/misc/change_pkg_now.cgi b/httemplate/misc/change_pkg_now.cgi new file mode 100644 index 000000000..73ee74020 --- /dev/null +++ b/httemplate/misc/change_pkg_now.cgi @@ -0,0 +1,22 @@ +%if ( $error ) { +% errorpage($error); +%} else { +<% $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum')) %> +%} +<%init> + +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('Change customer package'); + +#untaint pkgnum +my ($query) = $cgi->keywords; +$query =~ /^(\d+)$/ || die "Illegal pkgnum"; +my $pkgnum = $1; + +my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum}); +my $change_to = FS::cust_pkg->by_key($cust_pkg->change_to_pkgnum); + +my $err_or_pkg = $cust_pkg->change({ 'cust_pkg' => $change_to }); +my $error = $err_or_pkg unless ref($err_or_pkg); + +</%init> diff --git a/httemplate/misc/cust-part_pkg.cgi b/httemplate/misc/cust-part_pkg.cgi index 43b92297e..7aebda40c 100644 --- a/httemplate/misc/cust-part_pkg.cgi +++ b/httemplate/misc/cust-part_pkg.cgi @@ -5,8 +5,9 @@ my( $custnum, $prospectnum, $classnum ) = $cgi->param('arg'); my $agent; +my $cust_main; if ( $custnum ) { - my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } ) + $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } ) or die 'unknown custnum'; $agent = $cust_main->agent; } else { @@ -31,12 +32,18 @@ my @part_pkg = qsearch({ 'order_by' => 'ORDER BY pkg', }); -my @return = map { warn $_->can_start_date; +my $date_format = FS::Conf->new->config('date_format') || '%m/%d/%Y'; + +my @return = map { + my $start_date = $_->default_start_date($cust_main); + $start_date = time2str($date_format, $start_date) + if $start_date; ( $_->pkgpart, $_->pkg_comment, $_->can_discount, $_->can_start_date, - ); + $start_date, + ) } #sort { $a->pkg_comment cmp $b->pkg_comment } @part_pkg; diff --git a/httemplate/misc/do_not_change_pkg.cgi b/httemplate/misc/do_not_change_pkg.cgi new file mode 100644 index 000000000..c164c5c15 --- /dev/null +++ b/httemplate/misc/do_not_change_pkg.cgi @@ -0,0 +1,20 @@ +%if ( $error ) { +% errorpage($error); +%} else { +<% $cgi->redirect(popurl(2). "view/cust_main.cgi?".$cust_pkg->getfield('custnum')) %> +%} +<%init> + +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('Change customer package'); + +#untaint pkgnum +my ($query) = $cgi->keywords; +$query =~ /^(\d+)$/ || die "Illegal pkgnum"; +my $pkgnum = $1; + +my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum}); + +my $error = $cust_pkg->abort_change; + +</%init> diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html index 39734427e..a257e53e3 100644 --- a/httemplate/misc/order_pkg.html +++ b/httemplate/misc/order_pkg.html @@ -54,9 +54,12 @@ <& /elements/input-date-field.html,{ 'name' => 'start_date', 'format' => $date_format, - 'value' => $start_date, + 'value' => '', 'noinit' => 1, } &> + <IMG SRC = "<%$fsurl%>images/calendar-disabled.png" + ID = "start_date_button_disabled" + STYLE = "display:none"> <FONT SIZE=-1>(<% mt('leave blank to start immediately') |h %>)</FONT> </TD> </TR> @@ -213,11 +216,6 @@ if ( $cgi->param('quantity') =~ /^\s*(\d+)\s*$/ ) { } my $format = $date_format. ' %T %z (%Z)'; #false laziness w/REAL_cust_pkg.cgi? -my $start_date = ''; -if( ! $conf->exists('order_pkg-no_start_date') && $cust_main ) { - $start_date = $cust_main->next_bill_date; - $start_date = $start_date ? time2str($format, $start_date) : ''; -} my $svcpart = scalar($cgi->param('svcpart')); diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi index 7d9172aca..bf73d74bd 100644 --- a/httemplate/search/cust_bill_pkg.cgi +++ b/httemplate/search/cust_bill_pkg.cgi @@ -131,6 +131,10 @@ Filtering parameters: - classnum: Filter on package class. +- report_optionnum: Filter on package report class. Can be a single report + class number, a comma-separated list, the word "multiple", or an empty + string (for "no report class"). + - use_override: Apply "classnum" and "taxclass" filtering based on the override (bundle) pkgpart, rather than always using the true pkgpart. @@ -331,6 +335,14 @@ if ( $cgi->param('nottax') ) { push @where, "COALESCE($part_pkg.classnum, 0) = $1"; } + if ( $cgi->param('report_optionnum') =~ /^(\w+)$/ ) { + # code reuse FTW + my $num = $1; + push @where, + FS::Report::Table->with_report_option( $1, $cgi->param('use_override') ) + ; + } + # taxclass if ( $cgi->param('taxclassNULL') ) { # a little different from 'taxclass' in that it applies to the diff --git a/httemplate/search/customer_accounting_summary.html b/httemplate/search/customer_accounting_summary.html index b48ff21e3..c9cfa4088 100644 --- a/httemplate/search/customer_accounting_summary.html +++ b/httemplate/search/customer_accounting_summary.html @@ -121,10 +121,7 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Financial reports'); my ($agentnum,$sel_agent); -if ( $cgi->param('agentnum') eq 'all' ) { - $agentnum = 0; -} -elsif ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { +if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { $agentnum = $1; $sel_agent = qsearchs('agent', { 'agentnum' => $agentnum } ); die "agentnum $agentnum not found!" unless $sel_agent; @@ -177,10 +174,6 @@ my $query = FS::cust_main::Search->search(\%search_hash); my @custs = qsearch($query); foreach my $cust_main ( @custs ) { - # XXX should do this in the qsearch - next unless ($status eq '' || $status eq $cust_main->status); - next unless ($agentnum == 0 || $cust_main->agentnum eq $agentnum); - next unless ($refnum == 0 || $cust_main->refnum eq $refnum); push @custnames, $cust_main->name; diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html index e32fe4c03..566ab2943 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; @@ -199,11 +198,30 @@ sub get_packages { } ); my $num_old_packages = scalar(@packages); + my %change_to_from; # target pkgnum => current cust_pkg, for future 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 ( keys %change_to_from ) { + my @not_future_packages; + foreach my $cust_pkg (@packages) { + if ( exists( $change_to_from{$cust_pkg->pkgnum} ) ) { + 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); + } else { + push @not_future_packages, $cust_pkg; + } + } + @packages = @not_future_packages; } unless ( $cgi->param('showoldpackages') ) { @@ -225,6 +243,7 @@ sub get_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 ); diff --git a/httemplate/view/cust_main/packages/location.html b/httemplate/view/cust_main/packages/location.html index ab961b79e..01cbc0ffb 100644 --- a/httemplate/view/cust_main/packages/location.html +++ b/httemplate/view/cust_main/packages/location.html @@ -1,6 +1,11 @@ -% if ( $default ) { - <DIV STYLE="font-style: italic; font-size: small"> -% } +% if ( $cust_pkg->change_from_pkg +% and $cust_pkg->change_from_pkg->locationnum == $cust_pkg->locationnum ) +% { +% # don't show the location +% } else { +% if ( $default ) { + <DIV STYLE="font-style: italic; font-size: small"> +% } <% $loc->location_label( 'join_string' => '<BR>', 'double_space' => ' ', @@ -22,25 +27,25 @@ </FONT> % } -% if ( $default ) { - </DIV> -% } +% if ( $default ) { + </DIV> +% } -% if ( ! $cust_pkg->get('cancel') +% if ( ! $cust_pkg->get('cancel') % && $FS::CurrentUser::CurrentUser->access_right('Change customer package') -% ) -% { +% ) +% { <BR> <FONT SIZE=-1> -% unless ( $opt{no_links} ) { +% unless ( $opt{no_links} or $opt{'change_from'} ) { ( <%pkg_change_location_link($cust_pkg)%> ) -% } -% if ( $cust_pkg->locationnum && ! $opt{no_links} ) { +% } +% if ( $cust_pkg->locationnum && ! $opt{no_links} ) { ( <%edit_location_link($cust_pkg->locationnum)%> ) -% } +% } </FONT> -% } - +% } +% } <%init> my $conf = new FS::Conf; diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html index 7aad9a44e..596a47391 100644 --- a/httemplate/view/cust_main/packages/package.html +++ b/httemplate/view/cust_main/packages/package.html @@ -1,5 +1,4 @@ -<TD CLASS="inv package" BGCOLOR="<% $bgcolor %>" VALIGN="top" - STYLE="border-left-width: <% $supplemental * 30 %>px"> +<TD CLASS="inv package" BGCOLOR="<% $bgcolor %>" VALIGN="top" <%$style%>> <TABLE CLASS="inv package"> <TR> <TD COLSPAN=2> @@ -30,7 +29,11 @@ % unless ( $cust_pkg->get('cancel') || $opt{no_links} ) { % -% if ( $supplemental or $part_pkg->freq eq '0' ) { +% if ( $change_from ) { +% # This is the target package for a future change. +% # Nothing you can do with it besides modify/cancel the +% # future change, and that's on the current package. +% } elsif ( $supplemental or $part_pkg->freq eq '0' ) { % # Supplemental packages can't be changed independently. % # One-time charges don't need to be changed. % # For both of those, we only show "Add comments", @@ -185,6 +188,7 @@ % ) % { <TR> +% # yeah, I guess we'll let you do this on a future change package % if ( FS::Conf->new->exists('invoice-unitprice') ) { <TD><FONT SIZE="-1"> ( <% pkg_change_quantity_link($cust_pkg) %> ) @@ -233,7 +237,21 @@ my $countrydefault = $opt{'countrydefault'} || 'US'; my $statedefault = $opt{'statedefault'} || ($countrydefault eq 'US' ? 'CA' : ''); +# put a marker on the left edge of this column +# if this package is somehow special my $supplemental = $opt{'supplemental'} || 0; +my $change_from = $opt{'change_from'} || 0; +my $style = ''; +if ( $supplemental or $change_from ) { + $style = 'border-left-width: '.($supplemental + $change_from)*30 . 'px; '. + 'border-color: '; + if ( $supplemental ) { + $style .= '#bbbbff'; + } elsif ( $change_from ) { + $style .= '#bbffbb'; + } + $style = qq!STYLE="$style"!; +} $cust_pkg->pkgnum =~ /^(\d+)$/; my $pkgnum = $1; @@ -263,7 +281,7 @@ sub pkg_change_link { 'actionlabel' => emt('Change'), 'cust_pkg' => $cust_pkg, 'width' => 763, - 'height' => 380, + 'height' => 480, ); } diff --git a/httemplate/view/cust_main/packages/section.html b/httemplate/view/cust_main/packages/section.html index 82d06203b..0383fe892 100755 --- a/httemplate/view/cust_main/packages/section.html +++ b/httemplate/view/cust_main/packages/section.html @@ -36,6 +36,10 @@ <& services.html, %iopt &> </TR> % $row++; +% # show the change target, if there is one +% if ( $cust_pkg->change_to_pkg ) { + <& .packagerow, $cust_pkg->change_to_pkg, %iopt, 'change_from' => 1 &> +% } % # include supplemental packages if any % $iopt{'supplemental'} = ($iopt{'supplemental'} || 0) + 1; % foreach my $supp_pkg ($cust_pkg->supplemental_pkgs) { diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html index ed360cca4..6894a4e02 100644 --- a/httemplate/view/cust_main/packages/status.html +++ b/httemplate/view/cust_main/packages/status.html @@ -76,18 +76,29 @@ <% pkg_status_row_if( $cust_pkg, emt('Next bill'), 'bill', %opt, curuser=>$curuser ) %> % } <% pkg_status_row_if( $cust_pkg, emt('Will resume'), 'resume', %opt, curuser=>$curuser ) %> - <% pkg_status_row_if( $cust_pkg, emt('Expires'), 'expire', %opt, curuser=>$curuser ) %> + <% pkg_status_row_expire($cust_pkg, %opt, curuser=>$curuser) %> <% pkg_status_row_if( $cust_pkg, emt('Contract ends'), 'contract_end', %opt ) %> -% if ( !$supplemental && ! $opt{no_links} ) { +% if ( !$supplemental && ! $opt{no_links} && !$change_from ) { <TR> <TD COLSPAN=<%$opt{colspan}%>> <FONT SIZE=-1> +% if ( $cust_pkg->change_to_pkgnum ) { +% # then you can modify the package change +% if ( $curuser->access_right('Change customer package') ) { + ( <% pkg_change_now_link($cust_pkg) %> ) + ( <% pkg_change_later_link($cust_pkg) %> ) + ( <% pkg_unchange_link($cust_pkg) %> ) + <BR> +% } +% } % if ( $curuser->access_right('Unsuspend customer package') ) { ( <% pkg_unsuspend_link($cust_pkg) %> ) ( <% pkg_resume_link($cust_pkg) %> ) % } -% if ( $curuser->access_right('Cancel customer package immediately') ) { +% if ( !$cust_pkg->change_to_pkgnum and +% $curuser->access_right('Cancel customer package immediately') +% ) { ( <% pkg_cancel_link($cust_pkg) %> ) % } </FONT> @@ -97,9 +108,17 @@ % % } else { #status: active % -% unless ( $cust_pkg->get('setup') ) { #not setup +% if ( $change_from ) { # future change +% + <% pkg_status_row_colspan( $cust_pkg, emt('Waiting for package change'), '', %opt ) %> + <% pkg_status_row( $cust_pkg, + emt('Will be activated on'), + 'start_date', + %opt ) %> % -% unless ( $part_pkg->freq ) { +% } elsif ( ! $cust_pkg->get('setup') ) { # not setup +% +% unless ( $part_pkg->freq ) { # one-time charge <% pkg_status_row_colspan( $cust_pkg, emt('Not yet billed (one-time charge)'), '', %opt ) %> @@ -193,7 +212,7 @@ % } % -% } +% } % % if ( $opt{'cust_pkg-show_autosuspend'} ) { % my $autosuspend = pkg_autosuspend_time( $cust_pkg ); @@ -207,7 +226,7 @@ <% pkg_status_row_if($cust_pkg, emt('Automatic suspension delayed until'), 'dundate', %opt) %> <% pkg_status_row_if( $cust_pkg, emt('Will suspend on'), 'adjourn', %opt, curuser=>$curuser ) %> <% pkg_status_row_if( $cust_pkg, emt('Will resume on'), 'resume', %opt, curuser=>$curuser ) %> - <% pkg_status_row_if( $cust_pkg, emt('Expires'), 'expire', %opt, curuser=>$curuser ) %> + <% pkg_status_row_expire($cust_pkg, %opt, curuser=>$curuser) %> <% pkg_status_row_if( $cust_pkg, emt('Contract ends'), 'contract_end', %opt ) %> % if ( $part_pkg->freq and !$supplemental && ! $opt{no_links} ) { @@ -215,21 +234,41 @@ <TR> <TD COLSPAN=<%$opt{colspan}%>> <FONT SIZE=-1> -% if ( $curuser->access_right('Suspend customer package') ) { - ( <% pkg_suspend_link($cust_pkg) %> ) -% } -% if ( $curuser->access_right('Suspend customer package later') ) { - ( <% pkg_adjourn_link($cust_pkg) %> ) -% } -% if ( $curuser->access_right('Delay suspension events') ) { - ( <% pkg_delay_link($cust_pkg) %> ) -% } +% # action links +% if ( $change_from ) { +% # nothing +% } elsif ( $cust_pkg->change_to_pkgnum ) { +% # then you can modify the package change +% if ( $curuser->access_right('Change customer package') ) { + ( <% pkg_change_now_link($cust_pkg) %> ) + ( <% pkg_change_later_link($cust_pkg) %> ) + ( <% pkg_unchange_link($cust_pkg) %> ) + <BR> +% } +% } + +% # suspension actions--always available +% if ( $curuser->access_right('Suspend customer package') ) { + ( <% pkg_suspend_link($cust_pkg) %> ) +% } +% if ( $curuser->access_right('Suspend customer package later') ) { + ( <% pkg_adjourn_link($cust_pkg) %> ) +% } +% if ( $curuser->access_right('Delay suspension events') ) { + ( <% pkg_delay_link($cust_pkg) %> ) +% } +% +% if ( $change_from or $cust_pkg->change_to_pkgnum ) { +% # you can't cancel the package while in this state +% } else { # the normal case: links to cancel the package + <BR> % if ( $curuser->access_right('Cancel customer package immediately') ) { ( <% pkg_cancel_link($cust_pkg) %> ) -% } +% } % if ( $curuser->access_right('Cancel customer package later') ) { ( <% pkg_expire_link($cust_pkg) %> ) % } +% } <FONT> </TD> @@ -251,6 +290,7 @@ my $part_pkg = $opt{'part_pkg'}; my $curuser = $FS::CurrentUser::CurrentUser; my $width = $opt{'cust_pkg-display_times'} ? '38%' : '56%'; my $supplemental = $opt{'supplemental'}; +my $change_from = $opt{'change_from'}; $opt{colspan} = $opt{'cust_pkg-display_times'} ? 8 : 4; @@ -330,14 +370,41 @@ sub pkg_status_row_if { $opt{curuser}->access_right('Suspend customer package later') ); - $title = '<FONT SIZE=-1>( '. pkg_unexpire_link($cust_pkg). ' ) </FONT>'. $title - if ( $field eq 'expire' && - $opt{curuser}->access_right('Cancel customer package later') - ); - $cust_pkg->get($field) ? pkg_status_row($cust_pkg, $title, $field, %opt) : ''; } +sub pkg_status_row_expire { + my $cust_pkg = shift; + my %opt = @_; + return unless $cust_pkg->get('expire'); + + my $title; + + if ( $cust_pkg->get('change_to_pkg') ) { + if ( $cust_pkg->change_to_pkg->pkgpart != $cust_pkg->pkgpart ) { + $title = mt('Will change to <b>[_1]</b> on', + $cust_pkg->change_to_pkg->part_pkg->pkg); + } elsif ( $cust_pkg->change_to_pkg->locationnum != $cust_pkg->locationnum ) + { + $title = mt('Will <b>change location</b> on'); + } else { + # FS::cust_pkg->change_later should have prevented this, but + # just so that we can display _something_ + $title = '<font color="#ff0000">Unknown package change</font>'; + } + + } else { + + $title = emt('Expires'); + if ( $opt{curuser}->access_right('Cancel customer package later')) { + $title = '<FONT SIZE=-1>( '. pkg_unexpire_link($cust_pkg). ' ) </FONT>'. $title; + } + + } + + pkg_status_row( $cust_pkg, $title, 'expire', %opt ); +} + sub pkg_status_row_changed { my( $cust_pkg, %opt ) = @_; @@ -538,6 +605,8 @@ sub pkg_resume_link { sub pkg_unsuspend_link { pkg_link('misc/unsusp_pkg', emt('Unsuspend now'), @_ ); } sub pkg_unadjourn_link { pkg_link('misc/unadjourn_pkg', emt('Abort'), @_ ); } sub pkg_unexpire_link { pkg_link('misc/unexpire_pkg', emt('Abort'), @_ ); } +sub pkg_unchange_link { pkg_link('misc/do_not_change_pkg', emt('Abort change'), @_ ); } +sub pkg_change_now_link { pkg_link('misc/change_pkg_now', emt('Change now'), @_ ); } sub pkg_cancel_link { include( '/elements/popup_link-cust_pkg.html', @@ -569,6 +638,18 @@ sub pkg_expire_link { ) } +sub pkg_change_later_link { + my $cust_pkg = shift; + include( '/elements/popup_link-cust_pkg.html', + 'action' => $p . 'misc/change_pkg.cgi?', + 'label' => emt('Reschedule'), + 'actionlabel' => emt('Edit scheduled change for'), + 'cust_pkg' => $cust_pkg, + 'width' => 763, + 'height' => 480, + ) +} + sub svc_recharge_link { include( '/elements/popup_link-cust_svc.html', 'action' => $p. 'misc/recharge_svc.html', |