From e67b7f4bc312c27c09ffcc235aa93b2b78af89a6 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 12 Oct 2009 06:48:43 +0000
Subject: [PATCH] fix inadvertant "unknown package" error, fallout from
 pkg-balance work, RT#6125

---
 FS/FS/ClientAPI/MyAccount.pm                          | 7 +++----
 fs_selfservice/FS-SelfService/cgi/myaccount.html      | 2 +-
 fs_selfservice/FS-SelfService/cgi/myaccount_menu.html | 6 +++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 26cd76f79..493cc3587 100644
--- 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 d6527fe76..9b54794bc 100644
--- 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 617ae3ebe..8765323fa 100644
--- 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 },
-- 
2.11.0