From: ivan <ivan>
Date: Tue, 29 Nov 2011 21:57:37 +0000 (+0000)
Subject: add forward and spam setting to inter.net portal, RT#13656
X-Git-Tag: freeside_2_3_1~123
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=b00a82f7b3d0c7f1a2377fb22351a274c042f52f;hp=648c3048ddb4114ad3adf5495d716e02c2ea8ee4

add forward and spam setting to inter.net portal, RT#13656
---

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 6a21da8b3..ffdc772bd 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -1560,8 +1560,6 @@ sub acct_forward_info {
 
 sub process_acct_forward {
   my $p = shift;
-  warn Dumper($p);
-
   my($context, $session, $custnum) = _custoragent_session_custnum($p);
   return { 'error' => $session } if $context eq 'error';
 
@@ -1569,7 +1567,6 @@ sub process_acct_forward {
                              { 'srcsvc' => $p->{'svcnum'} },
                              'svc_forward',
                            );
-  warn $old;
 
   if ( $p->{'dst'} eq '' ) {
     if ( $old ) {
@@ -1585,20 +1582,21 @@ sub process_acct_forward {
 
   my $error;
   if ( $old ) {
-    warn "old: $old\n";
     $new->svcnum($old->svcnum);
     my $cust_svc = $old->cust_svc;
     $new->svcpart($old->svcpart);
     $new->pkgnuym($old->pkgnum);
     $error = $new->replace($old);
   } else {
-    warn "new: $new\n";
     my $conf = new FS::Conf;
     $new->svcpart($conf->config('selfservice-svc_forward_svcpart'));
-    $new->pkgnum($old->cust_svc->pkgnum);
-    warn Dumper($new);
+
+    my $svc_acct = _customer_svc_x( $custnum, $p->{'svcnum'}, 'svc_acct' )
+      or return { 'error' => 'No service' }; #how would we even get here?
+
+    $new->pkgnum( $svc_acct->cust_svc->pkgnum );
+
     $error = $new->insert;
-    warn $error;
   }
 
   return { 'error' => $error };