[freeside-commits] branch FREESIDE_2_3_BRANCH updated. cfd239c83c9bfc0d4ff31d9560115d6e6afe1cb3

[Ivan]

The branch, FREESIDE_2_3_BRANCH has been updated
       via  cfd239c83c9bfc0d4ff31d9560115d6e6afe1cb3 (commit)
      from  e48643dfba0cacacd0350c8c416c815def4493e1 (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 cfd239c83c9bfc0d4ff31d9560115d6e6afe1cb3
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Apr 26 18:25:17 2012 -0700

    reverting bad 2.3 commit for unsuspension email, actually #16114

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 652c4d5..719189f 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1176,8 +1176,6 @@ sub unsuspend {
   
   } #if $date 
 
-  my @labels = ();
-
   foreach my $cust_svc (
     qsearch('cust_svc',{'pkgnum'=> $self->pkgnum } )
   ) {
@@ -1197,8 +1195,6 @@ sub unsuspend {
         $dbh->rollback if $oldAutoCommit;
         return $error;
       }
-      my( $label, $value ) = $cust_svc->label;
-      push @labels, "$label: $value";
     }
 
   }
@@ -1287,29 +1283,6 @@ sub unadjourn {
     return $error;
   }
 
-  if ( $conf->config('unsuspend_email_admin') ) {
- 
-    my $error = send_email(
-      'from'    => $conf->config('invoice_from', $self->cust_main->agentnum),
-                                 #invoice_from ??? well as good as any
-      'to'      => $conf->config('unsuspend_email_admin'),
-      'subject' => 'FREESIDE NOTIFICATION: Customer package unsuspended',       'body'    => [
-        "This is an automatic message from your Freeside installation\n",
-        "informing you that the following customer package has been unsuspended:\n",
-        "\n",
-        'Customer: #'. $self->custnum. ' '. $self->cust_main->name. "\n",
-        'Package : #'. $self->pkgnum. " (". $self->part_pkg->pkg_comment. ")\n",
-        ( map { "Service : $_\n" } @labels ),
-      ],
-    );
-
-    if ( $error ) {
-      warn "WARNING: can't send unsuspension admin email (unsuspending anyway): ".
-           "$error\n";
-    }
-
-  }
-
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
 
   ''; #no errors

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

Summary of changes:
 FS/FS/cust_pkg.pm |   27 ---------------------------
 1 files changed, 0 insertions(+), 27 deletions(-)