link by username now only links to same svcpart

[freeside.git] / httemplate / misc / process / link.cgi

diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
index 80a5de8..5d80ade 100755 (executable)
--- a/httemplate/misc/process/link.cgi
+++ b/httemplate/misc/process/link.cgi
@@ -1,4 +1,3 @@
-<!-- $Id: link.cgi,v 1.3 2002-01-30 14:18:09 ivan Exp $ -->
 <%
 
 $cgi->param('pkgnum') =~ /^(\d+)$/;
@@ -9,16 +8,20 @@ $cgi->param('svcnum') =~ /^(\d*)$/;
 my $svcnum = $1;
 
 unless ( $svcnum ) {
-  my($part_svc) = qsearchs('part_svc',{'svcpart'=>$svcpart});
-  my($svcdb) = $part_svc->getfield('svcdb');
-  $cgi->param('link_field') =~ /^(\w+)$/; my($link_field)=$1;
-  my($svc_acct)=qsearchs($svcdb,{$link_field => $cgi->param('link_value') });
-  eidiot("$link_field not found!") unless $svc_acct;
-  $svcnum=$svc_acct->svcnum;
+  my $part_svc = qsearchs('part_svc',{'svcpart'=>$svcpart});
+  my $svcdb = $part_svc->getfield('svcdb');
+  $cgi->param('link_field') =~ /^(\w+)$/;
+  my $link_field = $1;
+  my $svc_x = ( grep { $_->cust_svc->svcpart == $svcpart } 
+                  qsearch( $svcdb, { $link_field => $cgi->param('link_value') })
+              )[0];
+  eidiot("$link_field not found!") unless $svc_x;
+  $svcnum = $svc_x->svcnum;
 }
 
 my $old = qsearchs('cust_svc',{'svcnum'=>$svcnum});
 die "svcnum not found!" unless $old;
+#die "svcnum $svcnum already linked to package ". $old->pkgnum if $old->pkgnum;
 my $new = new FS::cust_svc ({
   'svcnum' => $svcnum,
   'pkgnum' => $pkgnum,
@@ -31,6 +34,9 @@ unless ($error) {
   #no errors, so let's view this customer.
   print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?$pkgnum");
 } else {
+%>
+<!-- mason kludge -->
+<%
   idiot($error);
 }