From ivan at freeside.biz  Mon Oct 21 11:59:02 2019
From: ivan at freeside.biz (Ivan Kohler)
Date: Mon, 21 Oct 2019 11:59:02 -0700
Subject: [freeside-commits] branch master updated.
 95cffb2e514c6117fc3eb111581d387b5d0b4e77
Message-ID: <20191021185904.452971C20229@jumptail.freeside.biz>

The branch, master has been updated
       via  95cffb2e514c6117fc3eb111581d387b5d0b4e77 (commit)
      from  35ac5f08fc816cd7d79dc9a861652537061aed03 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 95cffb2e514c6117fc3eb111581d387b5d0b4e77
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Oct 21 11:57:06 2019 -0700

    4.x style

diff --git a/httemplate/search/report_cust_pkg.html b/httemplate/search/report_cust_pkg.html
index 981c54607..4e17d1f51 100755
--- a/httemplate/search/report_cust_pkg.html
+++ b/httemplate/search/report_cust_pkg.html
@@ -184,19 +184,19 @@
 
 %   }
     <TR>
-      <TD COLSPAN=2>
-        <TABLE>
-          <TR>
+
+
+
             <TD></TD>
-            <TD>From date <i>(m/d/y)</i></TD>
-            <TD>To date <i>(m/d/y)</i></TD>
-            <TD>Empty date</TD>
+            <TH ALIGN="left"><% '&nbsp;'x 10 %>From date <i>(m/d/y)</i></TH>
+            <TH ALIGN="center">To date <i>(m/d/y)</i></TH>
+            <TH>Empty date</TH>
           </TR>
 %   my $noinit = 0;
 %   foreach my $field (@date_fields) {
 
           <TR>
-            <TD ALIGN="right" VALIGN="center"><% $label{$field} %></TD>
+            <TH ALIGN="right" VALIGN="center"><% $label{$field} %></TH>
 %     foreach (qw(beginning ending)) {
             <TD>
               <& /elements/input-date-field.html, {
@@ -217,9 +217,9 @@
             </TD>
           </TR>
 %   } #foreach $field
-        </TABLE>
-      </TD>
-    </TR>
+
+
+
     
     <SCRIPT TYPE="text/javascript">
   
@@ -248,7 +248,7 @@
                 'onchange' => 'custom_changed(this);',
     &> 
 
-    <& /elements/tr-selectmultiple-part_pkg.html &> 
+    <& /elements/tr-selectmultiple-part_pkg.html, colspan=>3 &> 
 
 </TABLE>
 <BR>

-----------------------------------------------------------------------

Summary of changes:
 httemplate/search/report_cust_pkg.html | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)



From ivan at freeside.biz  Mon Oct 21 11:59:05 2019
From: ivan at freeside.biz (Ivan Kohler)
Date: Mon, 21 Oct 2019 11:59:05 -0700
Subject: [freeside-commits] branch FREESIDE_4_BRANCH updated.
 c9e7c34a838d0b8481e3baf06111cb2a4ed22a8c
Message-ID: <20191021185907.C65441C20230@jumptail.freeside.biz>

The branch, FREESIDE_4_BRANCH has been updated
       via  c9e7c34a838d0b8481e3baf06111cb2a4ed22a8c (commit)
      from  d3a5ab84183f540715c7a02964a10d065562ce41 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c9e7c34a838d0b8481e3baf06111cb2a4ed22a8c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Oct 21 11:57:09 2019 -0700

    4.x style

diff --git a/httemplate/search/report_cust_pkg.html b/httemplate/search/report_cust_pkg.html
index 981c54607..4e17d1f51 100755
--- a/httemplate/search/report_cust_pkg.html
+++ b/httemplate/search/report_cust_pkg.html
@@ -184,19 +184,19 @@
 
 %   }
     <TR>
-      <TD COLSPAN=2>
-        <TABLE>
-          <TR>
+
+
+
             <TD></TD>
-            <TD>From date <i>(m/d/y)</i></TD>
-            <TD>To date <i>(m/d/y)</i></TD>
-            <TD>Empty date</TD>
+            <TH ALIGN="left"><% '&nbsp;'x 10 %>From date <i>(m/d/y)</i></TH>
+            <TH ALIGN="center">To date <i>(m/d/y)</i></TH>
+            <TH>Empty date</TH>
           </TR>
 %   my $noinit = 0;
 %   foreach my $field (@date_fields) {
 
           <TR>
-            <TD ALIGN="right" VALIGN="center"><% $label{$field} %></TD>
+            <TH ALIGN="right" VALIGN="center"><% $label{$field} %></TH>
 %     foreach (qw(beginning ending)) {
             <TD>
               <& /elements/input-date-field.html, {
@@ -217,9 +217,9 @@
             </TD>
           </TR>
 %   } #foreach $field
-        </TABLE>
-      </TD>
-    </TR>
+
+
+
     
     <SCRIPT TYPE="text/javascript">
   
@@ -248,7 +248,7 @@
                 'onchange' => 'custom_changed(this);',
     &> 
 
-    <& /elements/tr-selectmultiple-part_pkg.html &> 
+    <& /elements/tr-selectmultiple-part_pkg.html, colspan=>3 &> 
 
 </TABLE>
 <BR>

-----------------------------------------------------------------------

Summary of changes:
 httemplate/search/report_cust_pkg.html | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)



From ivan at freeside.biz  Mon Oct 21 12:21:59 2019
From: ivan at freeside.biz (Ivan Kohler)
Date: Mon, 21 Oct 2019 12:21:59 -0700
Subject: [freeside-commits] branch master updated.
 0bd6fd8b74c3cb6a7abf01ba5974d2d9399da3ab
Message-ID: <20191021192201.BC43C1C201AC@jumptail.freeside.biz>

The branch, master has been updated
       via  0bd6fd8b74c3cb6a7abf01ba5974d2d9399da3ab (commit)
      from  95cffb2e514c6117fc3eb111581d387b5d0b4e77 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0bd6fd8b74c3cb6a7abf01ba5974d2d9399da3ab
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Oct 21 12:20:00 2019 -0700

    bulk package cancellation

diff --git a/httemplate/misc/bulk_cancel_pkg.cgi b/httemplate/misc/bulk_cancel_pkg.cgi
new file mode 100644
index 000000000..5499af19d
--- /dev/null
+++ b/httemplate/misc/bulk_cancel_pkg.cgi
@@ -0,0 +1,83 @@
+<% include('/elements/header-popup.html', "Cancel Packages") %>
+
+% if ( $cgi->param('error') ) {
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <% $cgi->param('error') %></FONT>
+  <BR><BR>
+% }
+
+<FORM NAME     = "OneTrueForm"
+      METHOD   = POST
+      ACTION   = "<% $p %>misc/process/bulk_cancel_pkg.cgi"
+      onSubmit = "document.OneTrueForm.submit.disabled=true;"
+>
+
+%# some false laziness w/search/cust_pkg.cgi
+
+<INPUT TYPE="hidden" NAME="query" VALUE="<% $cgi->keywords |h %>">
+% for my $param (
+%   qw(
+%     agentnum cust_status cust_main_salesnum salesnum custnum magic status
+%     custom pkgbatch zip reasonnum
+%     477part 477rownum date
+%     report_option
+%   ),
+%   grep { /^location_\w+$/ || /^report_option_any/ } $cgi->param
+% ) {
+  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
+% }
+%
+% for my $param (qw( censustract censustract2 ) ) {
+%   next unless grep { $_ eq $param } $cgi->param;
+  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
+% }
+%
+% for my $param (qw( pkgpart classnum refnum towernum )) {
+%   foreach my $value ($cgi->param($param)) {
+      <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $value |h %>">
+%   }
+% }
+%
+% foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end change_date cancel active )) {
+% 
+  <INPUT TYPE="hidden" NAME="<% $field %>_null" VALUE="<% $cgi->param("${field}_null") |h %>">
+  <INPUT TYPE="hidden" NAME="<% $field %>_begin" VALUE="<% $cgi->param("${field}_begin") |h %>">
+  <INPUT TYPE="hidden" NAME="<% $field %>_beginning" VALUE="<% $cgi->param("${field}_beginning") |h %>">
+  <INPUT TYPE="hidden" NAME="<% $field %>_end" VALUE="<% $cgi->param("${field}_end") |h %>">
+  <INPUT TYPE="hidden" NAME="<% $field %>_ending" VALUE="<% $cgi->param("${field}_ending") |h %>">
+% }
+
+<% ntable('#cccccc') %>
+
+%#  <& /elements/tr-input-date-field.html, {
+%#      'name'    => 'cancel_date',
+%#      'label'   => mt("Cancel package on"),
+%#      'format'  => $date_format,
+%#  } &>
+%#  <TR><TD></TD><TH>(Leave blank to cancel immediately)</TH></TR>
+
+  <& /elements/tr-select-reason.html,
+       field          => 'cancel_reasonnum',
+       reason_class   => 'C',
+  &>
+
+</TABLE>
+
+<BR>
+<INPUT TYPE="submit" ID="submit" NAME="submit" VALUE="Cancel Packages">
+
+</FORM>
+</BODY>
+</HTML>
+
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Bulk change customer packages');
+
+#use Date::Parse qw(str2time);
+#<table style="background-color: #cccccc; border-spacing: 2; width: 100%">
+
+my $conf = new FS::Conf;
+#my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
+</%init>
diff --git a/httemplate/misc/process/bulk_cancel_pkg.cgi b/httemplate/misc/process/bulk_cancel_pkg.cgi
new file mode 100644
index 000000000..def0ad283
--- /dev/null
+++ b/httemplate/misc/process/bulk_cancel_pkg.cgi
@@ -0,0 +1,104 @@
+% if ($error) {
+<% $cgi->redirect(popurl(2)."bulk_cancel_pkg.cgi?".$cgi->query_string ) %>
+% }
+<% include('/elements/popup-topreload.html', "Packages Cancelled") %>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Bulk change customer packages');
+
+my $error;
+
+if (!$error) {
+
+  my %search_hash = ();
+
+  $search_hash{'query'} = $cgi->param('query');
+
+  #scalars
+  for (qw( agentnum cust_status cust_main_salesnum salesnum custnum magic status
+         custom cust_fields pkgbatch zip reasonnum
+         477part 477rownum date 
+      )) 
+  {
+    $search_hash{$_} = $cgi->param($_) if length($cgi->param($_));
+  }
+
+  #arrays
+  for my $param (qw( pkgpart classnum refnum towernum )) {
+    $search_hash{$param} = [ $cgi->param($param) ]
+      if grep { $_ eq $param } $cgi->param;
+  }
+
+  #scalars that need to be passed if empty
+  for my $param (qw( censustract censustract2 )) {
+    $search_hash{$param} = $cgi->param($param) || ''
+      if grep { $_ eq $param } $cgi->param;
+  }
+
+  #location flags (checkboxes)
+  my @loc = grep /^\w+$/, $cgi->param('loc');
+  $search_hash{"location_$_"} = 1 foreach @loc;
+
+  my $report_option = $cgi->param('report_option');
+  $search_hash{report_option} = $report_option if $report_option;
+
+  for my $param (grep /^report_option_any/, $cgi->param) {
+    $search_hash{$param} = $cgi->param($param);
+  }
+
+  ###
+  # parse dates
+  ###
+
+  #false laziness w/report_cust_pkg.html and bulk_pkg_increment_bill.cgi
+  my %disable = (
+    'all'             => {},
+    'one-time charge' => { 'last_bill'=>1, 'bill'=>1, 'adjourn'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, },
+    'active'          => { 'susp'=>1, 'cancel'=>1 },
+    'suspended'       => { 'cancel' => 1 },
+    'cancelled'       => {},
+    ''                => {},
+  );
+
+  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') );
+
+    my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
+
+    next if $beginning == 0 && $ending == 4294967295
+       or $disable{$cgi->param('status')}->{$field};
+
+    $search_hash{$field} = [ $beginning, $ending ];
+
+  }
+
+  my $sql_query = FS::cust_pkg->search(\%search_hash);
+  $sql_query->{'select'} = 'cust_pkg.pkgnum';
+
+  ## set suspend info
+  $cgi->param('cancel_reasonnum') =~ /^(\d+)$/ or die "Illegal Reason";
+  my $cancel_reasonnum = $1;
+
+  #my $cancel_date = '';
+  #if ( $cgi->param('cancel_date') ) {
+  #  parse_datetime($cgi->param('cancel_date')) =~ /^(\d+)$/ or die "Illegal date";
+  #  $cancel_date = $1;
+  #}
+
+  foreach my $pkgnum (map { $_->pkgnum } qsearch($sql_query)) {
+    my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+
+    $error .= ($error ? ' / ' : '').
+              $cust_pkg->cancel('reason'      => $cancel_reasonnum,
+                                #'date'        => $cancel_date,
+                               );
+  }
+
+}
+
+$cgi->param("error", substr($error, 0, 512)); # arbitrary length believed
+                                              # suited for all supported
+                                              # browsers
+</%init>
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 3eb0332d2..3e0880fa5 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -286,6 +286,15 @@ my $html_init = sub {
                'height'      => 210,
              ). '<BR>' 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',
+             ). '<BR>' 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'),

-----------------------------------------------------------------------

Summary of changes:
 .../{bulk_suspend_pkg.cgi => bulk_cancel_pkg.cgi}  | 45 ++++++++--------------
 ...{bulk_unsuspend_pkg.cgi => bulk_cancel_pkg.cgi} | 23 ++++++++---
 httemplate/search/cust_pkg.cgi                     |  9 +++++
 3 files changed, 44 insertions(+), 33 deletions(-)
 copy httemplate/misc/{bulk_suspend_pkg.cgi => bulk_cancel_pkg.cgi} (68%)
 copy httemplate/misc/process/{bulk_unsuspend_pkg.cgi => bulk_cancel_pkg.cgi} (79%)



From ivan at freeside.biz  Mon Oct 21 12:22:39 2019
From: ivan at freeside.biz (Ivan Kohler)
Date: Mon, 21 Oct 2019 12:22:39 -0700
Subject: [freeside-commits] branch FREESIDE_3_BRANCH updated.
 81f7d2d735b1f1b539224ec3b90ddf6af41b648a
Message-ID: <20191021192241.8DB241C201AC@jumptail.freeside.biz>

The branch, FREESIDE_3_BRANCH has been updated
       via  81f7d2d735b1f1b539224ec3b90ddf6af41b648a (commit)
      from  e07aa68262cff985285dcc09592a339c232c1e7b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 81f7d2d735b1f1b539224ec3b90ddf6af41b648a
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Oct 21 12:20:00 2019 -0700

    bulk package cancellation

diff --git a/httemplate/misc/bulk_cancel_pkg.cgi b/httemplate/misc/bulk_cancel_pkg.cgi
new file mode 100644
index 000000000..5499af19d
--- /dev/null
+++ b/httemplate/misc/bulk_cancel_pkg.cgi
@@ -0,0 +1,83 @@
+<% include('/elements/header-popup.html', "Cancel Packages") %>
+
+% if ( $cgi->param('error') ) {
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <% $cgi->param('error') %></FONT>
+  <BR><BR>
+% }
+
+<FORM NAME     = "OneTrueForm"
+      METHOD   = POST
+      ACTION   = "<% $p %>misc/process/bulk_cancel_pkg.cgi"
+      onSubmit = "document.OneTrueForm.submit.disabled=true;"
+>
+
+%# some false laziness w/search/cust_pkg.cgi
+
+<INPUT TYPE="hidden" NAME="query" VALUE="<% $cgi->keywords |h %>">
+% for my $param (
+%   qw(
+%     agentnum cust_status cust_main_salesnum salesnum custnum magic status
+%     custom pkgbatch zip reasonnum
+%     477part 477rownum date
+%     report_option
+%   ),
+%   grep { /^location_\w+$/ || /^report_option_any/ } $cgi->param
+% ) {
+  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
+% }
+%
+% for my $param (qw( censustract censustract2 ) ) {
+%   next unless grep { $_ eq $param } $cgi->param;
+  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
+% }
+%
+% for my $param (qw( pkgpart classnum refnum towernum )) {
+%   foreach my $value ($cgi->param($param)) {
+      <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $value |h %>">
+%   }
+% }
+%
+% foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end change_date cancel active )) {
+% 
+  <INPUT TYPE="hidden" NAME="<% $field %>_null" VALUE="<% $cgi->param("${field}_null") |h %>">
+  <INPUT TYPE="hidden" NAME="<% $field %>_begin" VALUE="<% $cgi->param("${field}_begin") |h %>">
+  <INPUT TYPE="hidden" NAME="<% $field %>_beginning" VALUE="<% $cgi->param("${field}_beginning") |h %>">
+  <INPUT TYPE="hidden" NAME="<% $field %>_end" VALUE="<% $cgi->param("${field}_end") |h %>">
+  <INPUT TYPE="hidden" NAME="<% $field %>_ending" VALUE="<% $cgi->param("${field}_ending") |h %>">
+% }
+
+<% ntable('#cccccc') %>
+
+%#  <& /elements/tr-input-date-field.html, {
+%#      'name'    => 'cancel_date',
+%#      'label'   => mt("Cancel package on"),
+%#      'format'  => $date_format,
+%#  } &>
+%#  <TR><TD></TD><TH>(Leave blank to cancel immediately)</TH></TR>
+
+  <& /elements/tr-select-reason.html,
+       field          => 'cancel_reasonnum',
+       reason_class   => 'C',
+  &>
+
+</TABLE>
+
+<BR>
+<INPUT TYPE="submit" ID="submit" NAME="submit" VALUE="Cancel Packages">
+
+</FORM>
+</BODY>
+</HTML>
+
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Bulk change customer packages');
+
+#use Date::Parse qw(str2time);
+#<table style="background-color: #cccccc; border-spacing: 2; width: 100%">
+
+my $conf = new FS::Conf;
+#my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
+</%init>
diff --git a/httemplate/misc/process/bulk_cancel_pkg.cgi b/httemplate/misc/process/bulk_cancel_pkg.cgi
new file mode 100644
index 000000000..def0ad283
--- /dev/null
+++ b/httemplate/misc/process/bulk_cancel_pkg.cgi
@@ -0,0 +1,104 @@
+% if ($error) {
+<% $cgi->redirect(popurl(2)."bulk_cancel_pkg.cgi?".$cgi->query_string ) %>
+% }
+<% include('/elements/popup-topreload.html', "Packages Cancelled") %>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Bulk change customer packages');
+
+my $error;
+
+if (!$error) {
+
+  my %search_hash = ();
+
+  $search_hash{'query'} = $cgi->param('query');
+
+  #scalars
+  for (qw( agentnum cust_status cust_main_salesnum salesnum custnum magic status
+         custom cust_fields pkgbatch zip reasonnum
+         477part 477rownum date 
+      )) 
+  {
+    $search_hash{$_} = $cgi->param($_) if length($cgi->param($_));
+  }
+
+  #arrays
+  for my $param (qw( pkgpart classnum refnum towernum )) {
+    $search_hash{$param} = [ $cgi->param($param) ]
+      if grep { $_ eq $param } $cgi->param;
+  }
+
+  #scalars that need to be passed if empty
+  for my $param (qw( censustract censustract2 )) {
+    $search_hash{$param} = $cgi->param($param) || ''
+      if grep { $_ eq $param } $cgi->param;
+  }
+
+  #location flags (checkboxes)
+  my @loc = grep /^\w+$/, $cgi->param('loc');
+  $search_hash{"location_$_"} = 1 foreach @loc;
+
+  my $report_option = $cgi->param('report_option');
+  $search_hash{report_option} = $report_option if $report_option;
+
+  for my $param (grep /^report_option_any/, $cgi->param) {
+    $search_hash{$param} = $cgi->param($param);
+  }
+
+  ###
+  # parse dates
+  ###
+
+  #false laziness w/report_cust_pkg.html and bulk_pkg_increment_bill.cgi
+  my %disable = (
+    'all'             => {},
+    'one-time charge' => { 'last_bill'=>1, 'bill'=>1, 'adjourn'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, },
+    'active'          => { 'susp'=>1, 'cancel'=>1 },
+    'suspended'       => { 'cancel' => 1 },
+    'cancelled'       => {},
+    ''                => {},
+  );
+
+  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') );
+
+    my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
+
+    next if $beginning == 0 && $ending == 4294967295
+       or $disable{$cgi->param('status')}->{$field};
+
+    $search_hash{$field} = [ $beginning, $ending ];
+
+  }
+
+  my $sql_query = FS::cust_pkg->search(\%search_hash);
+  $sql_query->{'select'} = 'cust_pkg.pkgnum';
+
+  ## set suspend info
+  $cgi->param('cancel_reasonnum') =~ /^(\d+)$/ or die "Illegal Reason";
+  my $cancel_reasonnum = $1;
+
+  #my $cancel_date = '';
+  #if ( $cgi->param('cancel_date') ) {
+  #  parse_datetime($cgi->param('cancel_date')) =~ /^(\d+)$/ or die "Illegal date";
+  #  $cancel_date = $1;
+  #}
+
+  foreach my $pkgnum (map { $_->pkgnum } qsearch($sql_query)) {
+    my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+
+    $error .= ($error ? ' / ' : '').
+              $cust_pkg->cancel('reason'      => $cancel_reasonnum,
+                                #'date'        => $cancel_date,
+                               );
+  }
+
+}
+
+$cgi->param("error", substr($error, 0, 512)); # arbitrary length believed
+                                              # suited for all supported
+                                              # browsers
+</%init>
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 3eb0332d2..3e0880fa5 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -286,6 +286,15 @@ my $html_init = sub {
                'height'      => 210,
              ). '<BR>' 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',
+             ). '<BR>' 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'),

-----------------------------------------------------------------------

Summary of changes:
 .../{bulk_suspend_pkg.cgi => bulk_cancel_pkg.cgi}  | 45 ++++++++--------------
 ...{bulk_unsuspend_pkg.cgi => bulk_cancel_pkg.cgi} | 23 ++++++++---
 httemplate/search/cust_pkg.cgi                     |  9 +++++
 3 files changed, 44 insertions(+), 33 deletions(-)
 copy httemplate/misc/{bulk_suspend_pkg.cgi => bulk_cancel_pkg.cgi} (68%)
 copy httemplate/misc/process/{bulk_unsuspend_pkg.cgi => bulk_cancel_pkg.cgi} (79%)



From ivan at freeside.biz  Mon Oct 21 12:22:44 2019
From: ivan at freeside.biz (Ivan Kohler)
Date: Mon, 21 Oct 2019 12:22:44 -0700
Subject: [freeside-commits] branch FREESIDE_4_BRANCH updated.
 d624e2d6fbcf1c0bd3bf3a0c70440f1b706b2bfb
Message-ID: <20191021192246.DF4161C201AC@jumptail.freeside.biz>

The branch, FREESIDE_4_BRANCH has been updated
       via  d624e2d6fbcf1c0bd3bf3a0c70440f1b706b2bfb (commit)
      from  c9e7c34a838d0b8481e3baf06111cb2a4ed22a8c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d624e2d6fbcf1c0bd3bf3a0c70440f1b706b2bfb
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Oct 21 12:20:00 2019 -0700

    bulk package cancellation

diff --git a/httemplate/misc/bulk_cancel_pkg.cgi b/httemplate/misc/bulk_cancel_pkg.cgi
new file mode 100644
index 000000000..5499af19d
--- /dev/null
+++ b/httemplate/misc/bulk_cancel_pkg.cgi
@@ -0,0 +1,83 @@
+<% include('/elements/header-popup.html', "Cancel Packages") %>
+
+% if ( $cgi->param('error') ) {
+  <FONT SIZE="+1" COLOR="#ff0000">Error: <% $cgi->param('error') %></FONT>
+  <BR><BR>
+% }
+
+<FORM NAME     = "OneTrueForm"
+      METHOD   = POST
+      ACTION   = "<% $p %>misc/process/bulk_cancel_pkg.cgi"
+      onSubmit = "document.OneTrueForm.submit.disabled=true;"
+>
+
+%# some false laziness w/search/cust_pkg.cgi
+
+<INPUT TYPE="hidden" NAME="query" VALUE="<% $cgi->keywords |h %>">
+% for my $param (
+%   qw(
+%     agentnum cust_status cust_main_salesnum salesnum custnum magic status
+%     custom pkgbatch zip reasonnum
+%     477part 477rownum date
+%     report_option
+%   ),
+%   grep { /^location_\w+$/ || /^report_option_any/ } $cgi->param
+% ) {
+  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
+% }
+%
+% for my $param (qw( censustract censustract2 ) ) {
+%   next unless grep { $_ eq $param } $cgi->param;
+  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
+% }
+%
+% for my $param (qw( pkgpart classnum refnum towernum )) {
+%   foreach my $value ($cgi->param($param)) {
+      <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $value |h %>">
+%   }
+% }
+%
+% foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end change_date cancel active )) {
+% 
+  <INPUT TYPE="hidden" NAME="<% $field %>_null" VALUE="<% $cgi->param("${field}_null") |h %>">
+  <INPUT TYPE="hidden" NAME="<% $field %>_begin" VALUE="<% $cgi->param("${field}_begin") |h %>">
+  <INPUT TYPE="hidden" NAME="<% $field %>_beginning" VALUE="<% $cgi->param("${field}_beginning") |h %>">
+  <INPUT TYPE="hidden" NAME="<% $field %>_end" VALUE="<% $cgi->param("${field}_end") |h %>">
+  <INPUT TYPE="hidden" NAME="<% $field %>_ending" VALUE="<% $cgi->param("${field}_ending") |h %>">
+% }
+
+<% ntable('#cccccc') %>
+
+%#  <& /elements/tr-input-date-field.html, {
+%#      'name'    => 'cancel_date',
+%#      'label'   => mt("Cancel package on"),
+%#      'format'  => $date_format,
+%#  } &>
+%#  <TR><TD></TD><TH>(Leave blank to cancel immediately)</TH></TR>
+
+  <& /elements/tr-select-reason.html,
+       field          => 'cancel_reasonnum',
+       reason_class   => 'C',
+  &>
+
+</TABLE>
+
+<BR>
+<INPUT TYPE="submit" ID="submit" NAME="submit" VALUE="Cancel Packages">
+
+</FORM>
+</BODY>
+</HTML>
+
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Bulk change customer packages');
+
+#use Date::Parse qw(str2time);
+#<table style="background-color: #cccccc; border-spacing: 2; width: 100%">
+
+my $conf = new FS::Conf;
+#my $date_format = $conf->config('date_format') || '%m/%d/%Y';
+
+</%init>
diff --git a/httemplate/misc/process/bulk_cancel_pkg.cgi b/httemplate/misc/process/bulk_cancel_pkg.cgi
new file mode 100644
index 000000000..def0ad283
--- /dev/null
+++ b/httemplate/misc/process/bulk_cancel_pkg.cgi
@@ -0,0 +1,104 @@
+% if ($error) {
+<% $cgi->redirect(popurl(2)."bulk_cancel_pkg.cgi?".$cgi->query_string ) %>
+% }
+<% include('/elements/popup-topreload.html', "Packages Cancelled") %>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Bulk change customer packages');
+
+my $error;
+
+if (!$error) {
+
+  my %search_hash = ();
+
+  $search_hash{'query'} = $cgi->param('query');
+
+  #scalars
+  for (qw( agentnum cust_status cust_main_salesnum salesnum custnum magic status
+         custom cust_fields pkgbatch zip reasonnum
+         477part 477rownum date 
+      )) 
+  {
+    $search_hash{$_} = $cgi->param($_) if length($cgi->param($_));
+  }
+
+  #arrays
+  for my $param (qw( pkgpart classnum refnum towernum )) {
+    $search_hash{$param} = [ $cgi->param($param) ]
+      if grep { $_ eq $param } $cgi->param;
+  }
+
+  #scalars that need to be passed if empty
+  for my $param (qw( censustract censustract2 )) {
+    $search_hash{$param} = $cgi->param($param) || ''
+      if grep { $_ eq $param } $cgi->param;
+  }
+
+  #location flags (checkboxes)
+  my @loc = grep /^\w+$/, $cgi->param('loc');
+  $search_hash{"location_$_"} = 1 foreach @loc;
+
+  my $report_option = $cgi->param('report_option');
+  $search_hash{report_option} = $report_option if $report_option;
+
+  for my $param (grep /^report_option_any/, $cgi->param) {
+    $search_hash{$param} = $cgi->param($param);
+  }
+
+  ###
+  # parse dates
+  ###
+
+  #false laziness w/report_cust_pkg.html and bulk_pkg_increment_bill.cgi
+  my %disable = (
+    'all'             => {},
+    'one-time charge' => { 'last_bill'=>1, 'bill'=>1, 'adjourn'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, },
+    'active'          => { 'susp'=>1, 'cancel'=>1 },
+    'suspended'       => { 'cancel' => 1 },
+    'cancelled'       => {},
+    ''                => {},
+  );
+
+  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') );
+
+    my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
+
+    next if $beginning == 0 && $ending == 4294967295
+       or $disable{$cgi->param('status')}->{$field};
+
+    $search_hash{$field} = [ $beginning, $ending ];
+
+  }
+
+  my $sql_query = FS::cust_pkg->search(\%search_hash);
+  $sql_query->{'select'} = 'cust_pkg.pkgnum';
+
+  ## set suspend info
+  $cgi->param('cancel_reasonnum') =~ /^(\d+)$/ or die "Illegal Reason";
+  my $cancel_reasonnum = $1;
+
+  #my $cancel_date = '';
+  #if ( $cgi->param('cancel_date') ) {
+  #  parse_datetime($cgi->param('cancel_date')) =~ /^(\d+)$/ or die "Illegal date";
+  #  $cancel_date = $1;
+  #}
+
+  foreach my $pkgnum (map { $_->pkgnum } qsearch($sql_query)) {
+    my $cust_pkg = qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
+
+    $error .= ($error ? ' / ' : '').
+              $cust_pkg->cancel('reason'      => $cancel_reasonnum,
+                                #'date'        => $cancel_date,
+                               );
+  }
+
+}
+
+$cgi->param("error", substr($error, 0, 512)); # arbitrary length believed
+                                              # suited for all supported
+                                              # browsers
+</%init>
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 3eb0332d2..3e0880fa5 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -286,6 +286,15 @@ my $html_init = sub {
                'height'      => 210,
              ). '<BR>' 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',
+             ). '<BR>' 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'),

-----------------------------------------------------------------------

Summary of changes:
 .../{bulk_suspend_pkg.cgi => bulk_cancel_pkg.cgi}  | 45 ++++++++--------------
 ...{bulk_unsuspend_pkg.cgi => bulk_cancel_pkg.cgi} | 23 ++++++++---
 httemplate/search/cust_pkg.cgi                     |  9 +++++
 3 files changed, 44 insertions(+), 33 deletions(-)
 copy httemplate/misc/{bulk_suspend_pkg.cgi => bulk_cancel_pkg.cgi} (68%)
 copy httemplate/misc/process/{bulk_unsuspend_pkg.cgi => bulk_cancel_pkg.cgi} (79%)



From ivan at freeside.biz  Mon Oct 21 12:35:15 2019
From: ivan at freeside.biz (Ivan Kohler)
Date: Mon, 21 Oct 2019 12:35:15 -0700
Subject: [freeside-commits] branch master updated.
 79c8be3bd0c5db42794b36bf5b5dd25addba67cb
Message-ID: <20191021193518.064561C201AC@jumptail.freeside.biz>

The branch, master has been updated
       via  79c8be3bd0c5db42794b36bf5b5dd25addba67cb (commit)
      from  0bd6fd8b74c3cb6a7abf01ba5974d2d9399da3ab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 79c8be3bd0c5db42794b36bf5b5dd25addba67cb
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Oct 21 12:33:06 2019 -0700

    common element for cust_pkg search form fields

diff --git a/httemplate/misc/bulk_unsuspend_pkg.cgi b/httemplate/elements/cust_pkg-search-form_input.html
similarity index 71%
copy from httemplate/misc/bulk_unsuspend_pkg.cgi
copy to httemplate/elements/cust_pkg-search-form_input.html
index 8fbc41841..c2dbbe5c3 100644
--- a/httemplate/misc/bulk_unsuspend_pkg.cgi
+++ b/httemplate/elements/cust_pkg-search-form_input.html
@@ -1,12 +1,3 @@
-<% include('/elements/header-popup.html', "Unsuspend Packages") %>
-
-% if ( $cgi->param('error') ) {
-  <FONT SIZE="+1" COLOR="#ff0000">Error: <% $cgi->param('error') %></FONT>
-  <BR><BR>
-% }
-
-<FORM ACTION="<% $p %>misc/process/bulk_unsuspend_pkg.cgi" METHOD=POST>
-
 %# some false laziness w/search/cust_pkg.cgi
 
 <INPUT TYPE="hidden" NAME="query" VALUE="<% $cgi->keywords |h %>">
@@ -42,25 +33,9 @@
   <INPUT TYPE="hidden" NAME="<% $field %>_ending" VALUE="<% $cgi->param("${field}_ending") |h %>">
 % }
 
-<% ntable('#cccccc') %>
-
-  <TR>
-    <TD><INPUT TYPE="checkbox" NAME="confirm"></TD>
-    <TD>Confirm Unsuspend Packages</TD>
-  </TR>
-
-</TABLE>
-
-<BR>
-<INPUT TYPE="submit" VALUE="Unsuspend Packages">
-
-</FORM>
-</BODY>
-</HTML>
-
 <%init>
 
-die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Bulk change customer packages');
+my( $cgi ) = @_;
+#my( $cgi, %opt ) = @_;
 
 </%init>
diff --git a/httemplate/misc/bulk_cancel_pkg.cgi b/httemplate/misc/bulk_cancel_pkg.cgi
index 5499af19d..373ec35ba 100644
--- a/httemplate/misc/bulk_cancel_pkg.cgi
+++ b/httemplate/misc/bulk_cancel_pkg.cgi
@@ -11,40 +11,7 @@
       onSubmit = "document.OneTrueForm.submit.disabled=true;"
 >
 
-%# some false laziness w/search/cust_pkg.cgi
-
-<INPUT TYPE="hidden" NAME="query" VALUE="<% $cgi->keywords |h %>">
-% for my $param (
-%   qw(
-%     agentnum cust_status cust_main_salesnum salesnum custnum magic status
-%     custom pkgbatch zip reasonnum
-%     477part 477rownum date
-%     report_option
-%   ),
-%   grep { /^location_\w+$/ || /^report_option_any/ } $cgi->param
-% ) {
-  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
-% }
-%
-% for my $param (qw( censustract censustract2 ) ) {
-%   next unless grep { $_ eq $param } $cgi->param;
-  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
-% }
-%
-% for my $param (qw( pkgpart classnum refnum towernum )) {
-%   foreach my $value ($cgi->param($param)) {
-      <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $value |h %>">
-%   }
-% }
-%
-% foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end change_date cancel active )) {
-% 
-  <INPUT TYPE="hidden" NAME="<% $field %>_null" VALUE="<% $cgi->param("${field}_null") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_begin" VALUE="<% $cgi->param("${field}_begin") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_beginning" VALUE="<% $cgi->param("${field}_beginning") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_end" VALUE="<% $cgi->param("${field}_end") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_ending" VALUE="<% $cgi->param("${field}_ending") |h %>">
-% }
+<& /elements/cust_pkg-search-form_input.html, $cgi &>
 
 <% ntable('#cccccc') %>
 
diff --git a/httemplate/misc/bulk_change_pkg.cgi b/httemplate/misc/bulk_change_pkg.cgi
index 6ed272fb8..2c8c17914 100755
--- a/httemplate/misc/bulk_change_pkg.cgi
+++ b/httemplate/misc/bulk_change_pkg.cgi
@@ -7,40 +7,7 @@
 
 <FORM ACTION="<% $p %>misc/process/bulk_change_pkg.cgi" METHOD=POST>
 
-%# some false laziness w/search/cust_pkg.cgi
-
-<INPUT TYPE="hidden" NAME="query" VALUE="<% $cgi->keywords |h %>">
-% for my $param (
-%   qw(
-%     agentnum cust_status cust_main_salesnum salesnum custnum magic status
-%     custom pkgbatch zip
-%     477part 477rownum date
-%     report_option
-%   ),
-%   grep { /^location_\w+$/ || /^report_option_any/ } $cgi->param
-% ) {
-  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
-% }
-%
-% for my $param (qw( censustract censustract2 ) ) {
-%   next unless grep { $_ eq $param } $cgi->param;
-  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
-% }
-%
-% for my $param (qw( pkgpart classnum refnum towernum )) {
-%   foreach my $value ($cgi->param($param)) {
-      <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $value |h %>">
-%   }
-% }
-%
-% foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end change_date cancel active )) {
-% 
-  <INPUT TYPE="hidden" NAME="<% $field %>_null" VALUE="<% $cgi->param("${field}_null") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>begin" VALUE="<% $cgi->param("${field}.begin") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>beginning" VALUE="<% $cgi->param("${field}beginning") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>end" VALUE="<% $cgi->param("${field}.end") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>ending" VALUE="<% $cgi->param("${field}.ending") |h %>">
-% }
+<& /elements/cust_pkg-search-form_input.html, $cgi &>
 
 <% ntable('#cccccc') %>
 
diff --git a/httemplate/misc/bulk_suspend_pkg.cgi b/httemplate/misc/bulk_suspend_pkg.cgi
index e41ea2b1a..9b2bd62e4 100644
--- a/httemplate/misc/bulk_suspend_pkg.cgi
+++ b/httemplate/misc/bulk_suspend_pkg.cgi
@@ -7,40 +7,7 @@
 
 <FORM ACTION="<% $p %>misc/process/bulk_suspend_pkg.cgi" METHOD=POST>
 
-%# some false laziness w/search/cust_pkg.cgi
-
-<INPUT TYPE="hidden" NAME="query" VALUE="<% $cgi->keywords |h %>">
-% for my $param (
-%   qw(
-%     agentnum cust_status cust_main_salesnum salesnum custnum magic status
-%     custom pkgbatch zip reasonnum
-%     477part 477rownum date
-%     report_option
-%   ),
-%   grep { /^location_\w+$/ || /^report_option_any/ } $cgi->param
-% ) {
-  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
-% }
-%
-% for my $param (qw( censustract censustract2 ) ) {
-%   next unless grep { $_ eq $param } $cgi->param;
-  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
-% }
-%
-% for my $param (qw( pkgpart classnum refnum towernum )) {
-%   foreach my $value ($cgi->param($param)) {
-      <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $value |h %>">
-%   }
-% }
-%
-% foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end change_date cancel active )) {
-% 
-  <INPUT TYPE="hidden" NAME="<% $field %>_null" VALUE="<% $cgi->param("${field}_null") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_begin" VALUE="<% $cgi->param("${field}_begin") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_beginning" VALUE="<% $cgi->param("${field}_beginning") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_end" VALUE="<% $cgi->param("${field}_end") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_ending" VALUE="<% $cgi->param("${field}_ending") |h %>">
-% }
+<& /elements/cust_pkg-search-form_input.html, $cgi &>
 
 <% ntable('#cccccc') %>
 
@@ -91,4 +58,4 @@ my $date_format = $conf->config('date_format') || '%m/%d/%Y';
 
 my $date = time;
 
-</%init>
\ No newline at end of file
+</%init>
diff --git a/httemplate/misc/bulk_unsuspend_pkg.cgi b/httemplate/misc/bulk_unsuspend_pkg.cgi
index 8fbc41841..97c6c55e3 100644
--- a/httemplate/misc/bulk_unsuspend_pkg.cgi
+++ b/httemplate/misc/bulk_unsuspend_pkg.cgi
@@ -7,40 +7,7 @@
 
 <FORM ACTION="<% $p %>misc/process/bulk_unsuspend_pkg.cgi" METHOD=POST>
 
-%# some false laziness w/search/cust_pkg.cgi
-
-<INPUT TYPE="hidden" NAME="query" VALUE="<% $cgi->keywords |h %>">
-% for my $param (
-%   qw(
-%     agentnum cust_status cust_main_salesnum salesnum custnum magic status
-%     custom pkgbatch zip reasonnum
-%     477part 477rownum date
-%     report_option
-%   ),
-%   grep { /^location_\w+$/ || /^report_option_any/ } $cgi->param
-% ) {
-  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
-% }
-%
-% for my $param (qw( censustract censustract2 ) ) {
-%   next unless grep { $_ eq $param } $cgi->param;
-  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
-% }
-%
-% for my $param (qw( pkgpart classnum refnum towernum )) {
-%   foreach my $value ($cgi->param($param)) {
-      <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $value |h %>">
-%   }
-% }
-%
-% foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end change_date cancel active )) {
-% 
-  <INPUT TYPE="hidden" NAME="<% $field %>_null" VALUE="<% $cgi->param("${field}_null") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_begin" VALUE="<% $cgi->param("${field}_begin") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_beginning" VALUE="<% $cgi->param("${field}_beginning") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_end" VALUE="<% $cgi->param("${field}_end") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_ending" VALUE="<% $cgi->param("${field}_ending") |h %>">
-% }
+<& /elements/cust_pkg-search-form_input.html, $cgi &>
 
 <% ntable('#cccccc') %>
 

-----------------------------------------------------------------------

Summary of changes:
 .../cust_pkg-search-form_input.html}               | 29 ++---------------
 httemplate/misc/bulk_cancel_pkg.cgi                | 35 +-------------------
 httemplate/misc/bulk_change_pkg.cgi                | 35 +-------------------
 httemplate/misc/bulk_suspend_pkg.cgi               | 37 ++--------------------
 httemplate/misc/bulk_unsuspend_pkg.cgi             | 35 +-------------------
 5 files changed, 7 insertions(+), 164 deletions(-)
 copy httemplate/{misc/bulk_unsuspend_pkg.cgi => elements/cust_pkg-search-form_input.html} (71%)



From ivan at freeside.biz  Mon Oct 21 12:35:33 2019
From: ivan at freeside.biz (Ivan Kohler)
Date: Mon, 21 Oct 2019 12:35:33 -0700
Subject: [freeside-commits] branch FREESIDE_4_BRANCH updated.
 3e5eb9e6318bd6e51546b4453ed9c872f4146fa6
Message-ID: <20191021193535.3C10C1C201AC@jumptail.freeside.biz>

The branch, FREESIDE_4_BRANCH has been updated
       via  3e5eb9e6318bd6e51546b4453ed9c872f4146fa6 (commit)
      from  d624e2d6fbcf1c0bd3bf3a0c70440f1b706b2bfb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3e5eb9e6318bd6e51546b4453ed9c872f4146fa6
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Oct 21 12:33:06 2019 -0700

    common element for cust_pkg search form fields

diff --git a/httemplate/misc/bulk_unsuspend_pkg.cgi b/httemplate/elements/cust_pkg-search-form_input.html
similarity index 71%
copy from httemplate/misc/bulk_unsuspend_pkg.cgi
copy to httemplate/elements/cust_pkg-search-form_input.html
index 8fbc41841..c2dbbe5c3 100644
--- a/httemplate/misc/bulk_unsuspend_pkg.cgi
+++ b/httemplate/elements/cust_pkg-search-form_input.html
@@ -1,12 +1,3 @@
-<% include('/elements/header-popup.html', "Unsuspend Packages") %>
-
-% if ( $cgi->param('error') ) {
-  <FONT SIZE="+1" COLOR="#ff0000">Error: <% $cgi->param('error') %></FONT>
-  <BR><BR>
-% }
-
-<FORM ACTION="<% $p %>misc/process/bulk_unsuspend_pkg.cgi" METHOD=POST>
-
 %# some false laziness w/search/cust_pkg.cgi
 
 <INPUT TYPE="hidden" NAME="query" VALUE="<% $cgi->keywords |h %>">
@@ -42,25 +33,9 @@
   <INPUT TYPE="hidden" NAME="<% $field %>_ending" VALUE="<% $cgi->param("${field}_ending") |h %>">
 % }
 
-<% ntable('#cccccc') %>
-
-  <TR>
-    <TD><INPUT TYPE="checkbox" NAME="confirm"></TD>
-    <TD>Confirm Unsuspend Packages</TD>
-  </TR>
-
-</TABLE>
-
-<BR>
-<INPUT TYPE="submit" VALUE="Unsuspend Packages">
-
-</FORM>
-</BODY>
-</HTML>
-
 <%init>
 
-die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Bulk change customer packages');
+my( $cgi ) = @_;
+#my( $cgi, %opt ) = @_;
 
 </%init>
diff --git a/httemplate/misc/bulk_cancel_pkg.cgi b/httemplate/misc/bulk_cancel_pkg.cgi
index 5499af19d..373ec35ba 100644
--- a/httemplate/misc/bulk_cancel_pkg.cgi
+++ b/httemplate/misc/bulk_cancel_pkg.cgi
@@ -11,40 +11,7 @@
       onSubmit = "document.OneTrueForm.submit.disabled=true;"
 >
 
-%# some false laziness w/search/cust_pkg.cgi
-
-<INPUT TYPE="hidden" NAME="query" VALUE="<% $cgi->keywords |h %>">
-% for my $param (
-%   qw(
-%     agentnum cust_status cust_main_salesnum salesnum custnum magic status
-%     custom pkgbatch zip reasonnum
-%     477part 477rownum date
-%     report_option
-%   ),
-%   grep { /^location_\w+$/ || /^report_option_any/ } $cgi->param
-% ) {
-  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
-% }
-%
-% for my $param (qw( censustract censustract2 ) ) {
-%   next unless grep { $_ eq $param } $cgi->param;
-  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
-% }
-%
-% for my $param (qw( pkgpart classnum refnum towernum )) {
-%   foreach my $value ($cgi->param($param)) {
-      <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $value |h %>">
-%   }
-% }
-%
-% foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end change_date cancel active )) {
-% 
-  <INPUT TYPE="hidden" NAME="<% $field %>_null" VALUE="<% $cgi->param("${field}_null") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_begin" VALUE="<% $cgi->param("${field}_begin") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_beginning" VALUE="<% $cgi->param("${field}_beginning") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_end" VALUE="<% $cgi->param("${field}_end") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_ending" VALUE="<% $cgi->param("${field}_ending") |h %>">
-% }
+<& /elements/cust_pkg-search-form_input.html, $cgi &>
 
 <% ntable('#cccccc') %>
 
diff --git a/httemplate/misc/bulk_change_pkg.cgi b/httemplate/misc/bulk_change_pkg.cgi
index 6ed272fb8..2c8c17914 100755
--- a/httemplate/misc/bulk_change_pkg.cgi
+++ b/httemplate/misc/bulk_change_pkg.cgi
@@ -7,40 +7,7 @@
 
 <FORM ACTION="<% $p %>misc/process/bulk_change_pkg.cgi" METHOD=POST>
 
-%# some false laziness w/search/cust_pkg.cgi
-
-<INPUT TYPE="hidden" NAME="query" VALUE="<% $cgi->keywords |h %>">
-% for my $param (
-%   qw(
-%     agentnum cust_status cust_main_salesnum salesnum custnum magic status
-%     custom pkgbatch zip
-%     477part 477rownum date
-%     report_option
-%   ),
-%   grep { /^location_\w+$/ || /^report_option_any/ } $cgi->param
-% ) {
-  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
-% }
-%
-% for my $param (qw( censustract censustract2 ) ) {
-%   next unless grep { $_ eq $param } $cgi->param;
-  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
-% }
-%
-% for my $param (qw( pkgpart classnum refnum towernum )) {
-%   foreach my $value ($cgi->param($param)) {
-      <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $value |h %>">
-%   }
-% }
-%
-% foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end change_date cancel active )) {
-% 
-  <INPUT TYPE="hidden" NAME="<% $field %>_null" VALUE="<% $cgi->param("${field}_null") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>begin" VALUE="<% $cgi->param("${field}.begin") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>beginning" VALUE="<% $cgi->param("${field}beginning") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>end" VALUE="<% $cgi->param("${field}.end") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>ending" VALUE="<% $cgi->param("${field}.ending") |h %>">
-% }
+<& /elements/cust_pkg-search-form_input.html, $cgi &>
 
 <% ntable('#cccccc') %>
 
diff --git a/httemplate/misc/bulk_suspend_pkg.cgi b/httemplate/misc/bulk_suspend_pkg.cgi
index e41ea2b1a..9b2bd62e4 100644
--- a/httemplate/misc/bulk_suspend_pkg.cgi
+++ b/httemplate/misc/bulk_suspend_pkg.cgi
@@ -7,40 +7,7 @@
 
 <FORM ACTION="<% $p %>misc/process/bulk_suspend_pkg.cgi" METHOD=POST>
 
-%# some false laziness w/search/cust_pkg.cgi
-
-<INPUT TYPE="hidden" NAME="query" VALUE="<% $cgi->keywords |h %>">
-% for my $param (
-%   qw(
-%     agentnum cust_status cust_main_salesnum salesnum custnum magic status
-%     custom pkgbatch zip reasonnum
-%     477part 477rownum date
-%     report_option
-%   ),
-%   grep { /^location_\w+$/ || /^report_option_any/ } $cgi->param
-% ) {
-  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
-% }
-%
-% for my $param (qw( censustract censustract2 ) ) {
-%   next unless grep { $_ eq $param } $cgi->param;
-  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
-% }
-%
-% for my $param (qw( pkgpart classnum refnum towernum )) {
-%   foreach my $value ($cgi->param($param)) {
-      <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $value |h %>">
-%   }
-% }
-%
-% foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end change_date cancel active )) {
-% 
-  <INPUT TYPE="hidden" NAME="<% $field %>_null" VALUE="<% $cgi->param("${field}_null") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_begin" VALUE="<% $cgi->param("${field}_begin") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_beginning" VALUE="<% $cgi->param("${field}_beginning") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_end" VALUE="<% $cgi->param("${field}_end") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_ending" VALUE="<% $cgi->param("${field}_ending") |h %>">
-% }
+<& /elements/cust_pkg-search-form_input.html, $cgi &>
 
 <% ntable('#cccccc') %>
 
@@ -91,4 +58,4 @@ my $date_format = $conf->config('date_format') || '%m/%d/%Y';
 
 my $date = time;
 
-</%init>
\ No newline at end of file
+</%init>
diff --git a/httemplate/misc/bulk_unsuspend_pkg.cgi b/httemplate/misc/bulk_unsuspend_pkg.cgi
index 8fbc41841..97c6c55e3 100644
--- a/httemplate/misc/bulk_unsuspend_pkg.cgi
+++ b/httemplate/misc/bulk_unsuspend_pkg.cgi
@@ -7,40 +7,7 @@
 
 <FORM ACTION="<% $p %>misc/process/bulk_unsuspend_pkg.cgi" METHOD=POST>
 
-%# some false laziness w/search/cust_pkg.cgi
-
-<INPUT TYPE="hidden" NAME="query" VALUE="<% $cgi->keywords |h %>">
-% for my $param (
-%   qw(
-%     agentnum cust_status cust_main_salesnum salesnum custnum magic status
-%     custom pkgbatch zip reasonnum
-%     477part 477rownum date
-%     report_option
-%   ),
-%   grep { /^location_\w+$/ || /^report_option_any/ } $cgi->param
-% ) {
-  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
-% }
-%
-% for my $param (qw( censustract censustract2 ) ) {
-%   next unless grep { $_ eq $param } $cgi->param;
-  <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $cgi->param($param) |h %>">
-% }
-%
-% for my $param (qw( pkgpart classnum refnum towernum )) {
-%   foreach my $value ($cgi->param($param)) {
-      <INPUT TYPE="hidden" NAME="<% $param %>" VALUE="<% $value |h %>">
-%   }
-% }
-%
-% foreach my $field (qw( setup last_bill bill adjourn susp expire contract_end change_date cancel active )) {
-% 
-  <INPUT TYPE="hidden" NAME="<% $field %>_null" VALUE="<% $cgi->param("${field}_null") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_begin" VALUE="<% $cgi->param("${field}_begin") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_beginning" VALUE="<% $cgi->param("${field}_beginning") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_end" VALUE="<% $cgi->param("${field}_end") |h %>">
-  <INPUT TYPE="hidden" NAME="<% $field %>_ending" VALUE="<% $cgi->param("${field}_ending") |h %>">
-% }
+<& /elements/cust_pkg-search-form_input.html, $cgi &>
 
 <% ntable('#cccccc') %>
 

-----------------------------------------------------------------------

Summary of changes:
 .../cust_pkg-search-form_input.html}               | 29 ++---------------
 httemplate/misc/bulk_cancel_pkg.cgi                | 35 +-------------------
 httemplate/misc/bulk_change_pkg.cgi                | 35 +-------------------
 httemplate/misc/bulk_suspend_pkg.cgi               | 37 ++--------------------
 httemplate/misc/bulk_unsuspend_pkg.cgi             | 35 +-------------------
 5 files changed, 7 insertions(+), 164 deletions(-)
 copy httemplate/{misc/bulk_unsuspend_pkg.cgi => elements/cust_pkg-search-form_input.html} (71%)



From ivan at freeside.biz  Mon Oct 21 13:07:34 2019
From: ivan at freeside.biz (Ivan Kohler)
Date: Mon, 21 Oct 2019 13:07:34 -0700
Subject: [freeside-commits] branch master updated.
 5224948de7b1cbc90a2bc7f3f430bc260dd7371e
Message-ID: <20191021200740.586691C201AC@jumptail.freeside.biz>

The branch, master has been updated
       via  5224948de7b1cbc90a2bc7f3f430bc260dd7371e (commit)
      from  79c8be3bd0c5db42794b36bf5b5dd25addba67cb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5224948de7b1cbc90a2bc7f3f430bc260dd7371e
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Oct 21 13:05:38 2019 -0700

    release held packages when automatically unsuspending, RT#83847

diff --git a/FS/FS/cust_main_Mixin.pm b/FS/FS/cust_main_Mixin.pm
index b5434e516..921ef8f5e 100644
--- a/FS/FS/cust_main_Mixin.pm
+++ b/FS/FS/cust_main_Mixin.pm
@@ -836,6 +836,8 @@ sub unsuspend_balance {
     my @errors = $cust_main->unsuspend(
 	           'reason_type' => $conf->config('unsuspend_reason_type')
 	         );
+
+    push @errors, $cust_main->release_hold if $conf->exists('unsuspend-unhold');
     # side-fx with nested transactions?  upstack rolls back?
     warn "WARNING:Errors unsuspending customer ". $cust_main->custnum. ": ".
          join(' / ', @errors)

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_main_Mixin.pm | 2 ++
 1 file changed, 2 insertions(+)



From ivan at freeside.biz  Mon Oct 21 13:07:41 2019
From: ivan at freeside.biz (Ivan Kohler)
Date: Mon, 21 Oct 2019 13:07:41 -0700
Subject: [freeside-commits] branch FREESIDE_4_BRANCH updated.
 bfc7da9a45a81bdc9a8f645be91541c2492d6118
Message-ID: <20191021200743.916A91C20230@jumptail.freeside.biz>

The branch, FREESIDE_4_BRANCH has been updated
       via  bfc7da9a45a81bdc9a8f645be91541c2492d6118 (commit)
      from  3e5eb9e6318bd6e51546b4453ed9c872f4146fa6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bfc7da9a45a81bdc9a8f645be91541c2492d6118
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Oct 21 13:05:45 2019 -0700

    release held packages when automatically unsuspending, RT#83847

diff --git a/FS/FS/cust_main_Mixin.pm b/FS/FS/cust_main_Mixin.pm
index b5434e516..921ef8f5e 100644
--- a/FS/FS/cust_main_Mixin.pm
+++ b/FS/FS/cust_main_Mixin.pm
@@ -836,6 +836,8 @@ sub unsuspend_balance {
     my @errors = $cust_main->unsuspend(
 	           'reason_type' => $conf->config('unsuspend_reason_type')
 	         );
+
+    push @errors, $cust_main->release_hold if $conf->exists('unsuspend-unhold');
     # side-fx with nested transactions?  upstack rolls back?
     warn "WARNING:Errors unsuspending customer ". $cust_main->custnum. ": ".
          join(' / ', @errors)

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_main_Mixin.pm | 2 ++
 1 file changed, 2 insertions(+)



From ivan at freeside.biz  Mon Oct 21 13:07:44 2019
From: ivan at freeside.biz (Ivan Kohler)
Date: Mon, 21 Oct 2019 13:07:44 -0700
Subject: [freeside-commits] branch FREESIDE_3_BRANCH updated.
 480fbd922ae2c943c7763012a08fb5e659ab94a7
Message-ID: <20191021200746.F2F9C1C201AC@jumptail.freeside.biz>

The branch, FREESIDE_3_BRANCH has been updated
       via  480fbd922ae2c943c7763012a08fb5e659ab94a7 (commit)
      from  81f7d2d735b1f1b539224ec3b90ddf6af41b648a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 480fbd922ae2c943c7763012a08fb5e659ab94a7
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Oct 21 13:05:48 2019 -0700

    release held packages when automatically unsuspending, RT#83847

diff --git a/FS/FS/cust_main_Mixin.pm b/FS/FS/cust_main_Mixin.pm
index be57017e0..95a53420e 100644
--- a/FS/FS/cust_main_Mixin.pm
+++ b/FS/FS/cust_main_Mixin.pm
@@ -814,6 +814,8 @@ sub unsuspend_balance {
     my @errors = $cust_main->unsuspend(
 	           'reason_type' => $conf->config('unsuspend_reason_type')
 	         );
+
+    push @errors, $cust_main->release_hold if $conf->exists('unsuspend-unhold');
     # side-fx with nested transactions?  upstack rolls back?
     warn "WARNING:Errors unsuspending customer ". $cust_main->custnum. ": ".
          join(' / ', @errors)

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_main_Mixin.pm | 2 ++
 1 file changed, 2 insertions(+)



From ivan at freeside.biz  Mon Oct 21 13:21:35 2019
From: ivan at freeside.biz (Ivan Kohler)
Date: Mon, 21 Oct 2019 13:21:35 -0700
Subject: [freeside-commits] branch FREESIDE_3_BRANCH updated.
 11d3645fafe600642d2150a82c2167866659db2a
Message-ID: <20191021202137.3C8E31C201AC@jumptail.freeside.biz>

The branch, FREESIDE_3_BRANCH has been updated
       via  11d3645fafe600642d2150a82c2167866659db2a (commit)
      from  480fbd922ae2c943c7763012a08fb5e659ab94a7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 11d3645fafe600642d2150a82c2167866659db2a
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Oct 21 13:19:37 2019 -0700

    release held packages when automatically unsuspending, RT#83847

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index c5abe59f9..1dca5daf3 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2215,7 +2215,7 @@ and customer address. Include units.',
 
   {
     'key'         => 'unsuspend_reason_type',
-    'section'     => 'suspension',
+    'section'     => 'billing',
     'description' => 'If set, limits automatic unsuspension to packages which were suspended for this reason type.',
     reason_type_options('S'),
   },
@@ -2228,6 +2228,13 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'unsuspend-unhold',
+    'section'     => 'billing',
+    'description' => 'Unhold held packages when automatically unsuspending customers.  The is the default behavior when manually unsuspending and will be the default behavior in v4.',
+    'type'        => 'checkbox',
+  },
+
+  {
     'key'         => 'usernamemin',
     'section'     => 'username',
     'description' => 'Minimum username length (default 2)',
@@ -6410,7 +6417,7 @@ and customer address. Include units.',
 
   {
     'key'         => 'selfservice-db_profile',
-    'section'     => 'development',
+    'section'     => '',
     'description' => 'Enable collection and logging of database profiling information for self-service servers.  This has significant overhead, do not leave enabled in production beyond that necessary to collect profiling data.',
     'type'        => 'checkbox',
   },

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Conf.pm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)



From ivan at freeside.biz  Mon Oct 21 13:22:00 2019
From: ivan at freeside.biz (Ivan Kohler)
Date: Mon, 21 Oct 2019 13:22:00 -0700
Subject: [freeside-commits] branch master updated.
 3d9bb75680d19cb00307e57f4df2ac1c3514cd85
Message-ID: <20191021202202.638561C201AC@jumptail.freeside.biz>

The branch, master has been updated
       via  3d9bb75680d19cb00307e57f4df2ac1c3514cd85 (commit)
      from  5224948de7b1cbc90a2bc7f3f430bc260dd7371e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3d9bb75680d19cb00307e57f4df2ac1c3514cd85
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Oct 21 13:20:04 2019 -0700

    release held packages when automatically unsuspending, RT#83847

diff --git a/FS/FS/cust_main_Mixin.pm b/FS/FS/cust_main_Mixin.pm
index 921ef8f5e..ba6fda146 100644
--- a/FS/FS/cust_main_Mixin.pm
+++ b/FS/FS/cust_main_Mixin.pm
@@ -837,7 +837,7 @@ sub unsuspend_balance {
 	           'reason_type' => $conf->config('unsuspend_reason_type')
 	         );
 
-    push @errors, $cust_main->release_hold if $conf->exists('unsuspend-unhold');
+    push @errors, $cust_main->release_hold;
     # side-fx with nested transactions?  upstack rolls back?
     warn "WARNING:Errors unsuspending customer ". $cust_main->custnum. ": ".
          join(' / ', @errors)

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_main_Mixin.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



From ivan at freeside.biz  Mon Oct 21 13:22:03 2019
From: ivan at freeside.biz (Ivan Kohler)
Date: Mon, 21 Oct 2019 13:22:03 -0700
Subject: [freeside-commits] branch FREESIDE_4_BRANCH updated.
 23c155d0e96cd65a5e678a018254c9399eaccb9b
Message-ID: <20191021202205.D0ACE1C201A7@jumptail.freeside.biz>

The branch, FREESIDE_4_BRANCH has been updated
       via  23c155d0e96cd65a5e678a018254c9399eaccb9b (commit)
      from  bfc7da9a45a81bdc9a8f645be91541c2492d6118 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 23c155d0e96cd65a5e678a018254c9399eaccb9b
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Oct 21 13:20:07 2019 -0700

    release held packages when automatically unsuspending, RT#83847

diff --git a/FS/FS/cust_main_Mixin.pm b/FS/FS/cust_main_Mixin.pm
index 921ef8f5e..ba6fda146 100644
--- a/FS/FS/cust_main_Mixin.pm
+++ b/FS/FS/cust_main_Mixin.pm
@@ -837,7 +837,7 @@ sub unsuspend_balance {
 	           'reason_type' => $conf->config('unsuspend_reason_type')
 	         );
 
-    push @errors, $cust_main->release_hold if $conf->exists('unsuspend-unhold');
+    push @errors, $cust_main->release_hold;
     # side-fx with nested transactions?  upstack rolls back?
     warn "WARNING:Errors unsuspending customer ". $cust_main->custnum. ": ".
          join(' / ', @errors)

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_main_Mixin.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



From ivan at freeside.biz  Thu Oct 24 19:57:33 2019
From: ivan at freeside.biz (Ivan Kohler)
Date: Thu, 24 Oct 2019 19:57:33 -0700
Subject: [freeside-commits] branch master updated.
 ffc8927ad1df5a565256bdb47210006afa4b2f78
Message-ID: <20191025025736.142531C2020C@jumptail.freeside.biz>

The branch, master has been updated
       via  ffc8927ad1df5a565256bdb47210006afa4b2f78 (commit)
      from  3d9bb75680d19cb00307e57f4df2ac1c3514cd85 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ffc8927ad1df5a565256bdb47210006afa4b2f78
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Oct 24 19:55:37 2019 -0700

    suspend event option to skip packages with a start_date, RT#83847

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 57d598a74..9e305c72a 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2075,8 +2075,14 @@ Returns a list: an empty list on success or a list of errors.
 =cut
 
 sub suspend {
-  my $self = shift;
-  grep { $_->suspend(@_) } $self->unsuspended_pkgs;
+  my($self, %opt) = @_;
+
+  my @pkgs = $self->unsuspended_pkgs;
+
+  @pkgs = grep { ! $_->get('start_date') } @pkgs
+    if $opt{skip_future_startdate};
+
+  grep { $_->suspend(%opt) } @pkgs;
 }
 
 =item suspend_if_pkgpart HASHREF | PKGPART [ , PKGPART ... ]
diff --git a/FS/FS/part_event/Action/suspend.pm b/FS/FS/part_event/Action/suspend.pm
index 84a710158..6a8483680 100644
--- a/FS/FS/part_event/Action/suspend.pm
+++ b/FS/FS/part_event/Action/suspend.pm
@@ -7,14 +7,21 @@ sub description { 'Suspend all of this customer\'s packages'; }
 
 sub option_fields {
   ( 
-    'reasonnum'    => { 'label'        => 'Reason',
-                        'type'         => 'select-reason',
-                        'reason_class' => 'S',
-                      },
-    'suspend_bill' => { 'label' => 'Continue recurring billing while suspended',
-                        'type'  => 'checkbox',
-                        'value' => 'Y',
-                      },
+    'reasonnum'    => {
+      'label'        => 'Reason',
+      'type'         => 'select-reason',
+      'reason_class' => 'S',
+    },
+    'suspend_bill' => {
+      'label'        => 'Continue recurring billing while suspended',
+      'type'         => 'checkbox',
+      'value'        => 'Y',
+    },
+    'skip_future_startdate' => {
+      'label'        => "Don't suspend packages with a future start date",
+      'type'         => 'checkbox',
+      'value'        => 'Y',
+    },
   );
 }
 
@@ -26,8 +33,10 @@ sub do_action {
   my $cust_main = $self->cust_main($cust_object);
 
   my @err = $cust_main->suspend(
-    'reason'  => $self->option('reasonnum'),
-    'options' => { 'suspend_bill' => $self->option('suspend_bill') },
+    'skip_future_startdate' => $self->option('skip_future_startdate'),
+    'reason'                => $self->option('reasonnum'),
+    'options'               => { 'suspend_bill' => $self->option('suspend_bill')
+                               },
   );
 
   die join(' / ', @err) if scalar(@err);

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_main.pm                 | 10 ++++++++--
 FS/FS/part_event/Action/suspend.pm | 29 +++++++++++++++++++----------
 2 files changed, 27 insertions(+), 12 deletions(-)



From ivan at freeside.biz  Thu Oct 24 19:57:37 2019
From: ivan at freeside.biz (Ivan Kohler)
Date: Thu, 24 Oct 2019 19:57:37 -0700
Subject: [freeside-commits] branch FREESIDE_4_BRANCH updated.
 4d0392a07d82ee1e0002218410d47b7021d30977
Message-ID: <20191025025739.8EFA11C203BC@jumptail.freeside.biz>

The branch, FREESIDE_4_BRANCH has been updated
       via  4d0392a07d82ee1e0002218410d47b7021d30977 (commit)
      from  23c155d0e96cd65a5e678a018254c9399eaccb9b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4d0392a07d82ee1e0002218410d47b7021d30977
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Oct 24 19:55:40 2019 -0700

    suspend event option to skip packages with a start_date, RT#83847

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 49760a190..801aa8cde 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2304,8 +2304,14 @@ Returns a list: an empty list on success or a list of errors.
 =cut
 
 sub suspend {
-  my $self = shift;
-  grep { $_->suspend(@_) } $self->unsuspended_pkgs;
+  my($self, %opt) = @_;
+
+  my @pkgs = $self->unsuspended_pkgs;
+
+  @pkgs = grep { ! $_->get('start_date') } @pkgs
+    if $opt{skip_future_startdate};
+
+  grep { $_->suspend(%opt) } @pkgs;
 }
 
 =item suspend_if_pkgpart HASHREF | PKGPART [ , PKGPART ... ]
diff --git a/FS/FS/part_event/Action/suspend.pm b/FS/FS/part_event/Action/suspend.pm
index 84a710158..6a8483680 100644
--- a/FS/FS/part_event/Action/suspend.pm
+++ b/FS/FS/part_event/Action/suspend.pm
@@ -7,14 +7,21 @@ sub description { 'Suspend all of this customer\'s packages'; }
 
 sub option_fields {
   ( 
-    'reasonnum'    => { 'label'        => 'Reason',
-                        'type'         => 'select-reason',
-                        'reason_class' => 'S',
-                      },
-    'suspend_bill' => { 'label' => 'Continue recurring billing while suspended',
-                        'type'  => 'checkbox',
-                        'value' => 'Y',
-                      },
+    'reasonnum'    => {
+      'label'        => 'Reason',
+      'type'         => 'select-reason',
+      'reason_class' => 'S',
+    },
+    'suspend_bill' => {
+      'label'        => 'Continue recurring billing while suspended',
+      'type'         => 'checkbox',
+      'value'        => 'Y',
+    },
+    'skip_future_startdate' => {
+      'label'        => "Don't suspend packages with a future start date",
+      'type'         => 'checkbox',
+      'value'        => 'Y',
+    },
   );
 }
 
@@ -26,8 +33,10 @@ sub do_action {
   my $cust_main = $self->cust_main($cust_object);
 
   my @err = $cust_main->suspend(
-    'reason'  => $self->option('reasonnum'),
-    'options' => { 'suspend_bill' => $self->option('suspend_bill') },
+    'skip_future_startdate' => $self->option('skip_future_startdate'),
+    'reason'                => $self->option('reasonnum'),
+    'options'               => { 'suspend_bill' => $self->option('suspend_bill')
+                               },
   );
 
   die join(' / ', @err) if scalar(@err);

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_main.pm                 | 10 ++++++++--
 FS/FS/part_event/Action/suspend.pm | 29 +++++++++++++++++++----------
 2 files changed, 27 insertions(+), 12 deletions(-)



From ivan at freeside.biz  Thu Oct 24 19:57:40 2019
From: ivan at freeside.biz (Ivan Kohler)
Date: Thu, 24 Oct 2019 19:57:40 -0700
Subject: [freeside-commits] branch FREESIDE_3_BRANCH updated.
 fcb68930c8ae99dd835b5d4899b055d7ea38a1d6
Message-ID: <20191025025742.EBDB41C201AC@jumptail.freeside.biz>

The branch, FREESIDE_3_BRANCH has been updated
       via  fcb68930c8ae99dd835b5d4899b055d7ea38a1d6 (commit)
      from  11d3645fafe600642d2150a82c2167866659db2a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fcb68930c8ae99dd835b5d4899b055d7ea38a1d6
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Oct 24 19:55:44 2019 -0700

    suspend event option to skip packages with a start_date, RT#83847

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 2a3a753c0..5ba851de7 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -2329,8 +2329,14 @@ Returns a list: an empty list on success or a list of errors.
 =cut
 
 sub suspend {
-  my $self = shift;
-  grep { $_->suspend(@_) } $self->unsuspended_pkgs;
+  my($self, %opt) = @_;
+
+  my @pkgs = $self->unsuspended_pkgs;
+
+  @pkgs = grep { ! $_->get('start_date') } @pkgs
+    if $opt{skip_future_startdate};
+
+  grep { $_->suspend(%opt) } @pkgs;
 }
 
 =item suspend_if_pkgpart HASHREF | PKGPART [ , PKGPART ... ]
diff --git a/FS/FS/part_event/Action/suspend.pm b/FS/FS/part_event/Action/suspend.pm
index 84a710158..6a8483680 100644
--- a/FS/FS/part_event/Action/suspend.pm
+++ b/FS/FS/part_event/Action/suspend.pm
@@ -7,14 +7,21 @@ sub description { 'Suspend all of this customer\'s packages'; }
 
 sub option_fields {
   ( 
-    'reasonnum'    => { 'label'        => 'Reason',
-                        'type'         => 'select-reason',
-                        'reason_class' => 'S',
-                      },
-    'suspend_bill' => { 'label' => 'Continue recurring billing while suspended',
-                        'type'  => 'checkbox',
-                        'value' => 'Y',
-                      },
+    'reasonnum'    => {
+      'label'        => 'Reason',
+      'type'         => 'select-reason',
+      'reason_class' => 'S',
+    },
+    'suspend_bill' => {
+      'label'        => 'Continue recurring billing while suspended',
+      'type'         => 'checkbox',
+      'value'        => 'Y',
+    },
+    'skip_future_startdate' => {
+      'label'        => "Don't suspend packages with a future start date",
+      'type'         => 'checkbox',
+      'value'        => 'Y',
+    },
   );
 }
 
@@ -26,8 +33,10 @@ sub do_action {
   my $cust_main = $self->cust_main($cust_object);
 
   my @err = $cust_main->suspend(
-    'reason'  => $self->option('reasonnum'),
-    'options' => { 'suspend_bill' => $self->option('suspend_bill') },
+    'skip_future_startdate' => $self->option('skip_future_startdate'),
+    'reason'                => $self->option('reasonnum'),
+    'options'               => { 'suspend_bill' => $self->option('suspend_bill')
+                               },
   );
 
   die join(' / ', @err) if scalar(@err);

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_main.pm                 | 10 ++++++++--
 FS/FS/part_event/Action/suspend.pm | 29 +++++++++++++++++++----------
 2 files changed, 27 insertions(+), 12 deletions(-)