summaryrefslogtreecommitdiff
path: root/FS/FS/ClientAPI
diff options
context:
space:
mode:
authorChristopher Burger <burgerc@freeside.biz>2018-11-21 07:46:31 -0500
committerChristopher Burger <burgerc@freeside.biz>2018-11-21 07:46:31 -0500
commitafb1c3d32628a6778c56fd3ff356dfaaa6ac0c58 (patch)
tree1dcb95e983e9dae22f10fb4cafc3af62380457e2 /FS/FS/ClientAPI
parent69df93bdea1c7692de8c7d11a9bee04dbd9e1ff9 (diff)
Revert "RT# 79902 - fixed so change payment information link will still work when upgraded from V3 to V4 and restores functionality in V3"
This reverts commit 3fc05ed5adb6cbfcd6aee27b2ae199cf95cd4224.
Diffstat (limited to 'FS/FS/ClientAPI')
-rw-r--r--FS/FS/ClientAPI/MyAccount.pm10
1 files changed, 2 insertions, 8 deletions
diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index bb3ca12..365a42b 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -876,18 +876,12 @@ 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)$/ || (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}}; }
+ if ($p->{'payment_payby'} =~ /^(CARD|CHEK)$/) {
+ my @search_payby = ($p->{'payment_payby'} eq 'CARD') ? ('CARD','DCRD') : ('CHEK','DCHK');
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;