fix inadvertant "unknown package" error, fallout from pkg-balance work, RT#6125

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 26cd76f..493cc35 100644 (file)
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -222,10 +222,9 @@ sub access_info {
   ];
 
   return { %$info,
-           'custnum'    => $custnum,
-           'pkgnum'     => $session->{'pkgnum'},
-           'svcnum'     => $session->{'svcnum'},
-           'nonprimary' => $session->{'nonprimary'},
+           'custnum'       => $custnum,
+           'access_pkgnum' => $session->{'pkgnum'},
+           'svcnum'        => $session->{'svcnum'},
          };
 }
 

diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount.html b/fs_selfservice/FS-SelfService/cgi/myaccount.html
index d6527fe..9b54794 100644 (file)
--- a/fs_selfservice/FS-SelfService/cgi/myaccount.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount.html
@@ -4,7 +4,7 @@
 Hello <%= $name %>!<BR><BR>
 <%= $small_custview %>
 <BR>
-<%= if ( $pkgnum ) {
+<%= if ( $access_pkgnum ) {
       $OUT .= qq!Balance: <B>\$$balance</B><BR><BR>!;
     }
     '';

diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
index 617ae3e..8765323 100644 (file)
--- a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
@@ -13,7 +13,7 @@ my @menu = (
   { title=>'Purchase', size=>'+1', },
 );
 
-unless ( $pkgnum ) {
+unless ( $access_pkgnum ) {
   push @menu,
     { title=>'Purchase additional package',
       url=>'customer_order_pkg', 'indent'=>2 };
@@ -57,7 +57,7 @@ push @menu,
   { title=>'View my usage', url=>'view_usage', size=>'+1', },
 ;
 
-unless ( $pkgnum ) {
+unless ( $access_pkgnum ) {
   push @menu,
     { title=>'Setup my services', url=>'provision', size=>'+1', },
   ;
@@ -69,7 +69,7 @@ push @menu,
 push @menu,
   { title=>'Change my information', size=>'+1', };
 
-unless ( $pkgnum ) {
+unless ( $access_pkgnum ) {
   push @menu,
     { title=>'Change billing address',      url=>'change_bill',     indent=>2 },
     { title=>'Change service address',      url=>'change_ship',     indent=>2 },