X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=fs_selfservice%2FFS-SelfService%2Fcgi%2Fmyaccount_menu.html;h=71f50701007094bca5a28e86b2ef09fbdcc389e9;hb=71fa02dc2a93a81c522b82a62833840614359b8e;hp=4a31b125892bd6f6180635297b0d995e7d42e00f;hpb=f3e0ac2b009c4edd5692cb587ff709dac2223ebe;p=freeside.git
diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
index 4a31b1258..71f507010 100644
--- a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
+++ b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html
@@ -1,4 +1,4 @@
-<%= $url = "$selfurl?session=$session_id;action="; ''; %>
+<%= $url = "$selfurl?action="; ''; %>
@@ -7,7 +7,7 @@
<%=
if ( $menu_top_image ) {
- $OUT .= ' |
|
';
+ $OUT .= ' |
';
}
my @menu = (
@@ -23,37 +23,44 @@ unless ( $access_pkgnum ) {
url=>'customer_order_pkg', 'indent'=>2 };
}
+my %payby_mode;
+@payby_mode{@cust_paybys} = @hide_payment_fields;
+# $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
- #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] && $cust_paybys[$i] =~ /^CARD/ ) {
+ if ( exists( $payby_mode{CARD} ) ) {
push @menu, { title => 'Recharge my account with a credit card',
- url => $hide_payment_fields[$i]
+ url => $payby_mode{CARD}
? '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] && $cust_paybys[$i] =~ /^CHEK/ ) {
+ if ( exists( $payby_mode{CHEK} ) ) {
push @menu, { title => 'Recharge my account with a check',
- url => $hide_payment_fields[$i]
+ url => $payby_mode{CHEK}
? '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);
+ if ( exists( $payby_mode{PREPAY} ) ) {
+ push @menu, { title => 'Recharge my account with a prepaid card',
+ url => 'recharge_prepay',
+ indent => 2,
+ }
+ }
+ if ( exists( $payby_mode{PPAL} ) ) {
+ push @menu, { title => 'Recharge my account with PayPal',
+ url => 'make_thirdparty_payment&payby_method=PAYPAL',
+ indent => 2,
+ }
+ }
}
push @menu,
@@ -99,11 +106,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'} ) {
@@ -144,7 +151,7 @@ foreach my $item ( @menu ) {
}
if ( $menu_bottom_image ) {
- $OUT .= ' |
';
+ $OUT .= ' |
';
} else {
$OUT .= '
|
';
}