[freeside-commits] branch master updated. 053116d325050963ada4455c83b7bd1c154ce59f

Ivan ivan at 420.am
Thu May 10 20:30:18 PDT 2012


The branch, master has been updated
       via  053116d325050963ada4455c83b7bd1c154ce59f (commit)
      from  47822a049bc96a4cc0d868553f87d7c4568e868c (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 053116d325050963ada4455c83b7bd1c154ce59f
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu May 10 20:30:17 2012 -0700

    fix uncancellation w/services that have been re-provisioned, RT#17518

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 27c25da..1d4a90c 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -972,7 +972,16 @@ sub uncancel {
     my $svc_error = $svc_x->insert;
     if ( $svc_error && $options{svc_fatal} ) {
       $dbh->rollback if $oldAutoCommit;
-      return $error;
+      return $svc_error;
+    } else {
+      my $cust_svc = qsearchs('cust_svc', { 'svcnum' => $svc_x->svcnum });
+      if ( $cust_svc ) {
+        my $cs_error = $cust_svc->delete;
+        if ( $cs_error ) {
+          $dbh->rollback if $oldAutoCommit;
+          return $cs_error;
+        }
+      }
     }
     push @svc_errors, $svc_error if $svc_error;
   }
diff --git a/httemplate/misc/cancel_pkg.html b/httemplate/misc/cancel_pkg.html
index 3a6a4d1..348f0a6 100755
--- a/httemplate/misc/cancel_pkg.html
+++ b/httemplate/misc/cancel_pkg.html
@@ -44,6 +44,12 @@
       'format'  => $date_format,
   } &>
 
+  <& /elements/tr-checkbox.html,
+       'label'  => mt("Uncancel even if a service can't be re-provisioned"),
+       'field'  => 'svc_not_fatal',
+       'value'  => 'Y',
+  &>
+
 %   $date_init = 1;
 % }
 
diff --git a/httemplate/misc/process/cancel_pkg.html b/httemplate/misc/process/cancel_pkg.html
index bc3a8cd..b2d7bfa 100755
--- a/httemplate/misc/process/cancel_pkg.html
+++ b/httemplate/misc/process/cancel_pkg.html
@@ -80,11 +80,14 @@ my $last_bill =
 my $bill =
   $cgi->param('bill')      ? parse_datetime($cgi->param('bill'))      : '';
 
+my $svc_fatal = ( $cgi->param('svc_not_fatal') ne 'Y' );
+
 my $error = $cust_pkg->$method( 'reason'      => $reasonnum,
                                 'date'        => $date,
                                 'resume_date' => $resume_date,
                                 'last_bill'   => $last_bill,
                                 'bill'        => $bill,
+                                'svc_fatal'   => $svc_fatal,
                               );
 
 if ($error) {

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

Summary of changes:
 FS/FS/cust_pkg.pm                       |   11 ++++++++++-
 httemplate/misc/cancel_pkg.html         |    6 ++++++
 httemplate/misc/process/cancel_pkg.html |    3 +++
 3 files changed, 19 insertions(+), 1 deletions(-)




More information about the freeside-commits mailing list