X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2FClientAPI%2FMyAccount.pm;h=bb3ca1265db3cf8632b73bfe6642dbec19003b02;hb=368ed08e24400e9d1faf401a1e4e23ea54d2c969;hp=365a42b87a33e726abbd9cbff4e3ade1dd8a1491;hpb=17f5f41245b8e61765cbe7089d15cdc446391a03;p=freeside.git

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 365a42b87..bb3ca1265 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -876,12 +876,18 @@ sub payment_info {
   $return{$_} = $cust_main->bill_location->get($_) 
     for qw(address1 address2 city state zip);
 
+  $p->{'payment_payby'} = $payment_info->{paybys} if !$p->{'payment_payby'};
+
   # look for stored cust_payby info
   #   only if we've been given a clear payment_payby (to avoid payname conflicts)
-  if ($p->{'payment_payby'} =~ /^(CARD|CHEK)$/) {
-    my @search_payby = ($p->{'payment_payby'} eq 'CARD') ? ('CARD','DCRD') : ('CHEK','DCHK');
+  if ($p->{'payment_payby'} =~ /^(CARD|CHEK)$/ || (ref($p->{'payment_payby'}))) {
+    my @search_payby = ();
+    if ($p->{'payment_payby'} eq 'CARD') { @search_payby = ('CARD','DCRD'); }
+    elsif ($p->{'payment_payby'} eq 'CHEK') { @search_payby = ('CHEK','DCHK'); }
+    elsif (ref($p->{'payment_payby'}) eq 'ARRAY') { @search_payby = @{$payment_info->{paybys}}; }
     my ($cust_payby) = $cust_main->cust_payby(@search_payby);
     if ($cust_payby) {
+      $return{payby} = $cust_payby->payby;
       $return{payname} = $cust_payby->payname
                          || ( $cust_main->first. ' '. $cust_main->get('last') );
       $return{custpaybynum} = $cust_payby->custpaybynum;