remove everything that links to package view also, closes: Bug#569

diff --git a/httemplate/edit/process/REAL_cust_pkg.cgi b/httemplate/edit/process/REAL_cust_pkg.cgi
index 7f5c5e4..3d697dd 100755 (executable)
--- a/httemplate/edit/process/REAL_cust_pkg.cgi
+++ b/httemplate/edit/process/REAL_cust_pkg.cgi
@@ -16,7 +16,9 @@ if ( $error ) {
   $cgi->param('error', $error);
   print $cgi->redirect(popurl(2). "REAL_cust_pkg.cgi?". $cgi->query_string );
 } else { 
-  print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?". $pkgnum);
+  my $custnum = $new->custnum;
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum".
+                       "#cust_pkg$pkgnum" );
 }
 
 %>

diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index a8f5b14..fd9e594 100644 (file)
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -17,7 +17,8 @@ if ($error) {
 <%
   eidiot($error);
 } else {
-  print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?". $cust_pkg[0]->pkgnum );
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum".
+                       "#cust_pkg". $cust_pkg[0]->pkgnum );
 }
 
 %>

diff --git a/httemplate/misc/cancel-unaudited.cgi b/httemplate/misc/cancel-unaudited.cgi
index 11cde96..43e439b 100755 (executable)
--- a/httemplate/misc/cancel-unaudited.cgi
+++ b/httemplate/misc/cancel-unaudited.cgi
@@ -12,10 +12,13 @@ my $svcnum = $1;
 
 my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
 die "Unknown svcnum!" unless $cust_svc;
-&eidiot(qq!This account has already been audited.  Cancel the 
-    <A HREF="!. popurl(2). qq!view/cust_pkg.cgi?! . $cust_svc->getfield('pkgnum') .
-    qq!pkgnum"> package</A> instead.!) 
-  if $cust_svc->pkgnum ne '' && $cust_svc->pkgnum ne '0';
+my $cust_pkg = $cust_svc->cust_pkg;
+if ( $cust_pkg ) {
+  &eidiot( 'This account has already been audited.  Cancel the '.
+           qq!<A HREF="${p}view/cust_main.cgi?!. $cust_pkg->custnum.
+           '#cust_pkg'. $cust_pkg->pkgnum. '">'.
+           'package</A> instead.');
+}
 
 my $error = $cust_svc->cancel;
 

diff --git a/httemplate/misc/process/link.cgi b/httemplate/misc/process/link.cgi
index 5d80ade..8b71b89 100755 (executable)
--- a/httemplate/misc/process/link.cgi
+++ b/httemplate/misc/process/link.cgi
@@ -32,7 +32,9 @@ my $error = $new->replace($old);
 
 unless ($error) {
   #no errors, so let's view this customer.
-  print $cgi->redirect(popurl(3). "view/cust_pkg.cgi?$pkgnum");
+  my $custnum = $new->cust_pkg->custnum;
+  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum"
+                       "#cust_pkg$pkgnum" );
 } else {
 %>
 <!-- mason kludge -->

diff --git a/httemplate/misc/unprovision.cgi b/httemplate/misc/unprovision.cgi
index 8f2a7d1..3c92a4e 100755 (executable)
--- a/httemplate/misc/unprovision.cgi
+++ b/httemplate/misc/unprovision.cgi
@@ -12,10 +12,6 @@ my $svcnum = $1;
 
 my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
 die "Unknown svcnum!" unless $cust_svc;
-#&eidiot(qq!This account has already been audited.  Cancel the 
-#    <A HREF="!. popurl(2). qq!view/cust_pkg.cgi?! . $cust_svc->getfield('pkgnum') .
-#    qq!pkgnum"> package</A> instead.!) 
-#  if $cust_svc->pkgnum ne '' && $cust_svc->pkgnum ne '0';
 
 my $custnum = $cust_svc->cust_pkg->custnum;
 

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 50d367e..69a78d6 100755 (executable)
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -435,7 +435,7 @@ END
 
       my $pkg = $part_pkg->pkg;
       my $comment = $part_pkg->comment;
-      my $pkgview = $p. 'view/cust_pkg.cgi?'. $pkgnum;
+      my $pkgview = "${p}view/cust_main.cgi?$custnum#cust_pkg$pkgnum";
       my @cust_svc = @{shift @lol_cust_svc};
       #my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
       my $rowspan = scalar(@cust_svc) || 1;

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 45420f4..6d26317 100755 (executable)
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -175,8 +175,8 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
 }
 
 if ( scalar(@cust_pkg) == 1 ) {
-  my($pkgnum)=$cust_pkg[0]->pkgnum;
-  print $cgi->redirect(popurl(2). "view/cust_pkg.cgi?$pkgnum");
+  print $cgi->redirect("${p}view/cust_main.cgi?". $cust_pkg[0]->custnum.
+                       "#cust_pkg". $cust_pkg[0]->pkgnum );
   #exit;
 } elsif ( scalar(@cust_pkg) == 0 ) { #error
 %>
@@ -300,7 +300,7 @@ END
     my $rowspan = scalar(@cust_svc) || 1;
     my $p = popurl(2);
     print $n1, <<END;
-      <TD ROWSPAN=$rowspan><A HREF="${p}view/cust_pkg.cgi?$pkgnum"><FONT SIZE=-1>$pkgnum - $pkg</FONT></A></TD>
+      <TD ROWSPAN=$rowspan><A HREF="${p}view/cust_main.cgi?$custnum#cust_pkg$pkgnum"><FONT SIZE=-1>$pkgnum - $pkg</FONT></A></TD>
       <TD ROWSPAN=$rowspan>$setup</TD>
 END
 

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index 6057017..cc36006 100755 (executable)
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -3,7 +3,6 @@
 
 my $conf = new FS::Conf;
 
-#false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so
 my %uiview = ();
 my %uiadd = ();
 foreach my $part_svc ( qsearch('part_svc',{}) ) {
@@ -401,7 +400,7 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
 <!--pkgnum: <%=$pkg->{pkgnum}%>-->
 <TR>
   <TD ROWSPAN=<%=$rowspan%>>
-    <%=$pkg->{pkgnum}%>:
+    <A NAME="cust_pkg<%=$pkg->{pkgnum}%>"><%=$pkg->{pkgnum}%></A>:
     <%=$pkg->{pkg}%> - <%=$pkg->{comment}%><BR>
 <% unless ($pkg->{cancel}) { %>
     (&nbsp;<%=pkg_change_link($pkg)%>&nbsp;)
@@ -990,11 +989,6 @@ sub pkg_datestr {
   $strip;
 }
 
-#sub pkg_details_link {
-#  my $pkg = shift or return '';
-#  return qq!<a href="${p}view/cust_pkg.cgi?$pkg->{pkgnum}">Details</a>!;
-#}
-
 sub pkg_change_link {
   my $pkg = shift or return '';
   return qq!<a href="${p}misc/change_pkg.cgi?$pkg->{pkgnum}">Change&nbsp;package</a>!;

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 58591fc..14d2745 100755 (executable)
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -45,8 +45,7 @@ function areyousure(href) {
 
 <%= header('Account View', menubar(
   ( ( $pkgnum || $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )
     : ( "Cancel this (unaudited) account" =>
           "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')" )

diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index a4ec756..ae23386 100644 (file)
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -41,8 +41,7 @@ my (
 
 <%=header('Broadband Service View', menubar(
   ( ( $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )                                                                       
     : ( "Cancel this (unaudited) website" =>
           "${p}misc/cancel-unaudited.cgi?$svcnum" )

diff --git a/httemplate/view/svc_domain.cgi b/httemplate/view/svc_domain.cgi
index fd017de..e4b16d9 100755 (executable)
--- a/httemplate/view/svc_domain.cgi
+++ b/httemplate/view/svc_domain.cgi
@@ -34,8 +34,7 @@ my $domain = $svc_domain->domain;
 
 <%= header('Domain View', menubar(
   ( ( $pkgnum || $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )
     : ( "Cancel this (unaudited) domain" =>
           "${p}misc/cancel-unaudited.cgi?$svcnum" )

diff --git a/httemplate/view/svc_external.cgi b/httemplate/view/svc_external.cgi
index e5c977f..59cc357 100644 (file)
--- a/httemplate/view/svc_external.cgi
+++ b/httemplate/view/svc_external.cgi
@@ -24,8 +24,7 @@ if ($pkgnum) {
 
 <%= header('External Service View', menubar(
   ( ( $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )                                                                       
     : ( "Cancel this (unaudited) external service" =>
           "${p}misc/cancel-unaudited.cgi?$svcnum" )

diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index 6509724..52360bc 100755 (executable)
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -25,8 +25,7 @@ my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
 
 print header('Mail Forward View', menubar(
   ( ( $pkgnum || $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )
     : ( "Cancel this (unaudited) mail forward" =>
           "${p}misc/cancel-unaudited.cgi?$svcnum" )

diff --git a/httemplate/view/svc_www.cgi b/httemplate/view/svc_www.cgi
index 7a716b4..2980f84 100644 (file)
--- a/httemplate/view/svc_www.cgi
+++ b/httemplate/view/svc_www.cgi
@@ -32,8 +32,7 @@ my $www = $domain_record->zone;
 
 print header('Website View', menubar(
   ( ( $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+    ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
       )                                                                       
     : ( "Cancel this (unaudited) website" =>
           "${p}misc/cancel-unaudited.cgi?$svcnum" )