From 54638c01852123edd816e1c6e50b3690f88fb7e3 Mon Sep 17 00:00:00 2001 From: Christopher Burger Date: Tue, 30 Oct 2018 11:07:15 -0400 Subject: RT# 79902 - fixed so change payment information link will still work when upgraded from V3 to V4 and restores functionality in V3 --- FS/FS/ClientAPI/MyAccount.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'FS/FS/ClientAPI/MyAccount.pm') diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm index dbecb9b..d4fa159 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; -- cgit v1.1