X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=fs_selfservice%2FFS-SelfService%2Fcgi%2Fmyaccount_menu.html;h=1bc35e34ccb5ce9ccd3db98976191d1223d0ae16;hb=b71b1576c68bc40ad26592b354feace37a029f0e;hp=7d1a5f79352adf53604e8a0f3506b4fd9e29003a;hpb=3d0a1bb06b895c5be6e3f0517d355442a6b1e125;p=freeside.git

diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
index 7d1a5f793..1bc35e34c 100644
--- a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
@@ -7,7 +7,7 @@
 <%= 
 
 if ( $menu_top_image ) {
-  $OUT .= '<TR><TD STYLE="padding:0px"><IMG SRC="image.cgi?menu_top_image"></TD></TR>';
+  $OUT .= '<TR><TD STYLE="padding:0px"><IMG SRC="image.cgi?name=menu_top_image;agentnum='. $agentnum. '"></TD></TR>';
 }
 
 my @menu = (
@@ -28,7 +28,7 @@ my %payby_mode;
 # $payby_mode{FOO} is true if FOO is thirdparty, false if it's B::OP,
 # nonexistent if it's not supported
 
-if ( $balance > 0 ) { #XXXFIXME "enable selfservice prepay features" flag or something, eventually per-pkg or something really fancy
+if ( $enable_payment_without_balance || (($balance || 0) > 0) ) { #eventually per-pkg or something really fancy
 
   if ( exists( $payby_mode{CARD} ) ) {
     push @menu, { title  => 'Recharge my account with a credit card',
@@ -48,7 +48,7 @@ if ( $balance > 0 ) { #XXXFIXME "enable selfservice prepay features" flag or som
                 }
   }
 
-  if ( exists( $payby_mode{PREP} ) ) {
+  if ( exists( $payby_mode{PREPAY} ) ) {
     push @menu, { title  => 'Recharge my account with a prepaid card',
                   url    => 'recharge_prepay',
                   indent => 2,
@@ -64,8 +64,18 @@ if ( $balance > 0 ) { #XXXFIXME "enable selfservice prepay features" flag or som
 }
 
 push @menu,
-  { title=>' ' },
-  { title=>'View my usage', url=>'view_usage', size=>'+1', },
+  { title=>' ' };
+
+push @menu,
+  { title=>'View payment history', url=>'history', size=>'+1' },
+;
+
+unless( $hide_usage ){
+  push @menu,
+    { title=>'View my usage', url=>'view_usage', size=>'+1', }
+}
+
+push @menu,
   { title=>'Create a ticket', url=>'tktcreate', size=>'+1', },
 ;
 
@@ -83,9 +93,10 @@ push @menu,
 
 unless ( $access_pkgnum ) {
   push @menu,
-    { title=>'Change billing address',      url=>'change_bill',     indent=>2 },
-    { title=>'Change service address',      url=>'change_ship',     indent=>2 },
-    { title=>'Change payment information',  url=>'change_pay',      indent=>2 },
+    { title=>'Change billing address',          url=>'change_bill',           indent=>2 },
+    { title=>'Change service address',          url=>'change_ship',           indent=>2 },
+    { title=>'Change credit card information',  url=>'change_creditcard_pay', indent=>2 },
+    { title=>'Change check information',        url=>'change_check_pay',      indent=>2 },
   ;
 }
 
@@ -106,11 +117,11 @@ foreach my $item ( @menu ) {
   if ( $menu_body_image ) {
     if ( exists $item->{'url'} && $action eq $item->{'url'} ) {
       $OUT .= #' BGCOLOR="'. ( $body_bgcolor || '#eeeeee' ). '" '.
-              ' STYLE="background: url(image.cgi?menu_body_image) 0 bottom; '.
+              ' STYLE="background: url(image.cgi?name=menu_body_image;agentnum='. $agentnum. ') 0 bottom; '.
               '        color:#3366CC"; '. #XXX config
               ' " ';
     } else {
-      $OUT .= ' STYLE="background: url(image.cgi?menu_body_image) 0 bottom" ';
+      $OUT .= ' STYLE="background: url(image.cgi?name=menu_body_imagei;agentnum='. $agentnum. ') 0 bottom" ';
     }
   } else {
     if ( exists $item->{'url'} && $action eq $item->{'url'} ) {
@@ -151,7 +162,7 @@ foreach my $item ( @menu ) {
 }
 
 if ( $menu_bottom_image ) {
-  $OUT .= '<TR><TD STYLE="padding:0px"><IMG SRC="image.cgi?menu_bottom_image"></TD></TR>';
+  $OUT .= '<TR><TD STYLE="padding:0px"><IMG SRC="image.cgi?name=menu_bottom_image;agentnum='. $agentnum. '"></TD></TR>';
 } else {
   $OUT .= '<TR><TD STYLE="border-right: 1px solid black" HEIGHT="100%"><BR><BR><BR><BR></TD></TR>';
 }