finish up initial work on customer view tabs (ensure links back to customer view...

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

diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
index 7768b3b..77546f3 100755 (executable)
--- a/httemplate/misc/process/link.cgi
+++ b/httemplate/misc/process/link.cgi
@@ -1,4 +1,20 @@
-<%
+%unless ($error) {
+%  #no errors, so let's view this customer.
+%  my $custnum = $new->cust_pkg->custnum;
+%  my $show = $curuser->default_customer_view =~ /^(jumbo|packages)$/
+%               ? ''
+%               : ';show=packages';
+%  my $frag = "cust_pkg$pkgnum"; #hack for IE ignoring real #fragment
+<% $cgi->redirect(popurl(3). "view/cust_main.cgi?custnum=$custnum$show;fragment=$frag#$frag" ) %>
+%} else {
+% errorpage($error);
+%}
+<%init>
+
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+die "access denied"
+  unless $curuser->access_right('View/link unlinked services');
 
 my $DEBUG = 0;
 
@@ -19,7 +35,7 @@ unless ( $svcnum ) {
     $search{$1} = $cgi->param('link_value2');
   }
 
-  my @svc_x = ( sort { ($b->cust_svc->pkgnum > 0) <=> ($a->cust_svc->pkgnum > 0)
+  my @svc_x = ( sort { ($a->cust_svc->pkgnum > 0) <=> ($b->cust_svc->pkgnum > 0)
                        or ($b->cust_svc->svcpart == $svcpart)
                             <=> ($a->cust_svc->svcpart == $svcpart)
                      }
@@ -31,14 +47,15 @@ unless ( $svcnum ) {
          "(svcpart $svcpart):\n";
     foreach my $svc_x ( @svc_x ) {
       warn "  ". $svc_x->email.
-           " (pkgnum ". $_->cust_svc->pkgnum.
-           ", svcpart ". $_->cust_svc->svcpart. ")\n";
+           " (svcnum ". $svc_x->svcnum. ",".
+           " pkgnum ".  $svc_x->cust_svc->pkgnum. ",".
+           " svcpart ". $svc_x->cust_svc->svcpart. ")\n";
     }
   }
 
   my $svc_x = $svc_x[0];
 
-  eidiot("$link_field not found!") unless $svc_x;
+  errorpage("$link_field not found!") unless $svc_x;
 
   $svcnum = $svc_x->svcnum;
 
@@ -51,25 +68,11 @@ my($error, $new);
 if ( $old->pkgnum && ! $conf->exists('legacy_link-steal') ) {
   $error = "svcnum $svcnum already linked to package ". $old->pkgnum;
 } else {
-  $new = new FS::cust_svc ({
-    'svcnum' => $svcnum,
-    'pkgnum' => $pkgnum,
-    'svcpart' => $svcpart,
-  });
+  $new = new FS::cust_svc { $old->hash };
+  $new->pkgnum($pkgnum);
+  $new->svcpart($svcpart);
 
   $error = $new->replace($old);
 }
 
-unless ($error) {
-  #no errors, so let's view this customer.
-  my $custnum = $new->cust_pkg->custnum;
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum".
-                       "#cust_pkg$pkgnum" );
-} else {
-%>
-<!-- mason kludge -->
-<%
-  idiot($error);
-}
-
-%>
+</%init>