X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=fs_selfservice%2FFS-SelfService%2Fcgi%2Fmyaccount_menu.html;h=5cf4fe2d9be6c2c879960c8b6328659e7685d843;hb=7f43bf155bc79e3c9bd5d88e53117595963c301e;hp=f2e5e998e2cd1233ecc00e9e0fc4ffe404f4897d;hpb=673b9a458d9138523026963df6fa3b4683e09bae;p=freeside.git

diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
index f2e5e998e..5cf4fe2d9 100644
--- a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
@@ -1,8 +1,8 @@
 <%= $url = "$selfurl?session=$session_id;action="; ''; %>
 <TABLE BORDER=0><TR>
-<TD VALIGN="top" HEIGHT=384 BGCOLOR="#dddddd">
+<TD VALIGN="top" HEIGHT="100%" BGCOLOR="<%= $box_bgcolor || '#c0c0c0' %>">
 
-<TABLE CELLSPACING=0 BORDER=0>
+<TABLE CELLSPACING=0 BORDER=0 HEIGHT="100%">
 
 <%= 
 
@@ -12,17 +12,40 @@ my @menu = (
 { title=>' ' },
 
 { title=>'Purchase', size=>'+1', },
-  { title=>'Purchase additional package*', url=>'order', 'indent'=>2 },
+  { title=>'Purchase additional package',
+    url=>'customer_order_pkg', 'indent'=>2 },
 );
 
 if ( 1 ) { #XXXFIXME "enable selfservice prepay features" flag or something, eventually per-pkg or something really fancy
 
-  push @menu, (
-    { title=>'Recharge my account with a credit card',
-      url=>'make_payment', indent=>2 },
-    { title=>'Recharge my account with a prepaid card',
-      url=>'recharge_prepay', indent=>2 },
-  );
+  #XXXFIXME still a bit sloppy for multi-gateway of differing namespace
+  my $i = 0;
+  while($i < scalar(@cust_paybys)) { last if $cust_paybys[$i] =~ /^CARD/; $i++ }
+  if ( $cust_paybys[$i] =~ /^CARD/ ) {
+    push @menu, { title  => 'Recharge my account with a credit card',
+                  url    => $hide_payment_fields[$i]
+                              ? 'make_thirdparty_payment&payby_method=CC'
+                              : 'make_payment',
+                  indent => 2,
+                 }
+  }
+
+  $i = 0;
+  while($i < scalar(@cust_paybys)) { last if $cust_paybys[$i] =~ /^CHEK/; $i++ }
+  if ( $cust_paybys[$i] =~ /^CHEK/ ) {
+    push @menu, { title  => 'Recharge my account with a check',
+                  url    => $hide_payment_field[$i]
+                              ? 'make_thirdparty_payment&payby_method=ECHECK'
+                              : 'make_ach_payment',
+                  indent => 2,
+                }
+  }
+
+  push @menu, { title  => 'Recharge my account with a prepaid card',
+                url    => 'recharge_prepay',
+                indent => 2,
+              }
+    if grep(/^PREP/, @cust_paybys);
 
 }
 
@@ -30,14 +53,16 @@ push @menu, (
 
 { title=>' ' },
 
+{ title=>'View my usage', url=>'view_usage', size=>'+1', },
 { title=>'Setup my services', url=>'provision', size=>'+1', },
 
 { title=>' ' },
 
 { title=>'Change my information', size=>'+1', },
-  { title=>'Change payment information*', url=>'change_bill', indent=>2 },
-  { title=>'Change service address*',     url=>'change_ship', indent=>2 },
-  { title=>'Change password(s)*',         url=>'hmmmFIXME',   indent=>2 },
+  { 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 password(s)',          url=>'change_password', indent=>2 },
 
 { title=>' ' },
 
@@ -49,7 +74,7 @@ foreach my $item ( @menu ) {
 
   $OUT .= '<TR><TD'; 
   if ( exists $item->{'url'} && $action eq $item->{'url'} ) {
-    $OUT .= ' BGCOLOR="#eeeeee" '.
+    $OUT .= ' BGCOLOR="'. ( $body_bgcolor || '#eeeeee' ). '" '.
             ' STYLE="border-top: 1px solid black;'.
                    ' border-left: 1px solid black;'.
                    ' border-bottom: 1px solid black"';
@@ -82,8 +107,8 @@ foreach my $item ( @menu ) {
 
 %>
 
+<TR><TD STYLE="border-right: 1px solid black" HEIGHT="100%"><BR><BR><BR><BR></TD></TR>
+
 </TABLE>
 
-<A HREF="passwd.html">(tempFIXME) Change&nbsp;password(s)</A><BR><BR>
-*&nbsp;coming&nbsp;soon
 </TD>