From 0b07c1da9b37ce82bf505f0a860bb0693cedb264 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Sat, 28 Nov 2015 16:48:35 -0800 Subject: [PATCH] when unholding a package, optionally set it to start on the next bill date, #38921 --- httemplate/misc/process/unhold_pkg.html | 54 +++++++++++++++ httemplate/misc/unhold_pkg.html | 93 ++++++++++++++++++++++++++ httemplate/view/cust_main/packages/status.html | 22 ++++-- 3 files changed, 164 insertions(+), 5 deletions(-) create mode 100755 httemplate/misc/process/unhold_pkg.html create mode 100755 httemplate/misc/unhold_pkg.html diff --git a/httemplate/misc/process/unhold_pkg.html b/httemplate/misc/process/unhold_pkg.html new file mode 100755 index 000000000..6eec7ee8a --- /dev/null +++ b/httemplate/misc/process/unhold_pkg.html @@ -0,0 +1,54 @@ +<& /elements/header-popup.html &> + + + +<%init> + +warn Dumper +{$cgi->Vars}; # XXX + +my $curuser = $FS::CurrentUser::CurrentUser; +die "access denied" + unless $curuser->access_right('Unsuspend customer package'); + +$cgi->param('pkgnum') =~ /^(\d+)$/ + or die "illegal pkgnum"; +my $pkgnum = $1; + +my $cust_pkg = qsearchs({ + table => 'cust_pkg', + addl_from => ' JOIN cust_main USING (custnum) ', + hashref => { 'pkgnum' => $pkgnum }, + extra_sql => ' AND '. $curuser->agentnums_sql, +}) or die "Unknown pkgnum: $pkgnum"; + +my $cust_main = $cust_pkg->cust_main; + +my $error; +my $start_date; +if ( $cgi->param('when') eq 'now' ) { + # start it the next time billing runs + $start_date = ''; +} elsif ( $cgi->param('when') eq 'next_bill_date' ) { + $start_date = $cust_main->next_bill_date; +} elsif ( $cgi->param('when') eq 'date' ) { + $start_date = parse_datetime($cgi->param('start_date')); +} + +# In this process, always unsuspend the package _now_ but with a future start +# date, rather than set a resume date. (There is some semantic overlap between +# them, yes.) + +if ( $cust_pkg->setup or !$cust_pkg->susp ) { + $error = 'This package is '. $cust_pkg->status . ', not on hold.'; +} else { + $cust_pkg->set('start_date', $start_date); + $error = $cust_pkg->unsuspend; +} + +if ( $error ) { + $cgi->param('error', $error); + print $cgi->redirect($fsurl.'misc/unhold_pkg.html?', $cgi->query_string); +} + diff --git a/httemplate/misc/unhold_pkg.html b/httemplate/misc/unhold_pkg.html new file mode 100755 index 000000000..0c110b4f9 --- /dev/null +++ b/httemplate/misc/unhold_pkg.html @@ -0,0 +1,93 @@ +<& /elements/header-popup.html, mt($title) &> + +<& /elements/error.html &> + +%# use unsusp_pkg.cgi, the same target as a direct "unsuspend package" link +
+ + +
+<% emt('Start billing [_1]', $part_pkg->pkg_comment(cust_pkg => $cust_pkg)) %> + + + +
+ + + +<%init> + +my $curuser = $FS::CurrentUser::CurrentUser; +die "access denied" + unless $curuser->access_right('Unsuspend customer package'); + +my $pkgnum; +if ( $cgi->param('pkgnum') =~ /^(\d+)$/ ) { + $pkgnum = $1; +} else { + die "illegal query ". $cgi->keywords; +} + +my $conf = new FS::Conf; +my $date_format = $conf->config('date_format') || '%m/%d/%Y'; + +my $title = 'Start billing package'; + +my $cust_pkg = qsearchs({ + table => 'cust_pkg', + addl_from => ' JOIN cust_main USING (custnum) ', + hashref => { 'pkgnum' => $pkgnum }, + extra_sql => ' AND '. $curuser->agentnums_sql, +}) or die "Unknown pkgnum: $pkgnum"; + +my $next_bill_date = $cust_pkg->cust_main->next_bill_date; + +my $part_pkg = $cust_pkg->part_pkg; + +my $when = $cgi->param('when'); # on error +if (!$when) { + if ($next_bill_date) { + $when = 'next_bill_date'; + } else { + $when = 'now'; + } +} + diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html index 62e9be5c3..1a215f374 100644 --- a/httemplate/view/cust_main/packages/status.html +++ b/httemplate/view/cust_main/packages/status.html @@ -73,11 +73,11 @@ <% pkg_status_row_discount( $cust_pkg, %opt ) %> -% unless ( $cust_pkg->order_date eq $cust_pkg->get('susp') ) { #on hold -% unless ( $cust_pkg->get('setup') ) { - <% pkg_status_row_colspan( $cust_pkg, emt('Never billed'), '', %opt ) %> -% } else { +% if ( $cust_pkg->order_date ne $cust_pkg->get('susp') ) { # not on hold +% if ( $cust_pkg->get('setup') ) { <% pkg_status_row($cust_pkg, emt('Setup'), 'setup', %opt ) %> +% } else { + <% pkg_status_row_colspan( $cust_pkg, emt('Never billed'), '', %opt ) %> % } % } @@ -115,7 +115,7 @@ % } % if ( $curuser->access_right('Unsuspend customer package') ) { % if ( $cust_pkg->order_date eq $cust_pkg->get('susp') ) { #on hold - ( <% pkg_link('misc/unsusp_pkg', emt('Start billing now'), $cust_pkg) %> ) + ( <% pkg_unhold_link($cust_pkg) %> ) % } else { ( <% pkg_unsuspend_link($cust_pkg) %> ) ( <% pkg_resume_link($cust_pkg) %> ) @@ -665,6 +665,18 @@ sub pkg_resume_link { ) } +sub pkg_unhold_link { + include( '/elements/popup_link-cust_pkg.html', + 'action' => $p. 'misc/unhold_pkg.html?', + 'label' => emt('Start billing'), + 'actionlabel' => emt('Start billing'), + 'color' => '#00CC00', + 'width' => 510, + 'height' => 310, + 'cust_pkg' => shift, + ) +} + 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'), @_ ); } -- 2.11.0