[freeside-commits] branch FREESIDE_4_BRANCH updated. d3016d1b54fdc46a10a2dfd6b78ad65c2dc71e5e

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  d3016d1b54fdc46a10a2dfd6b78ad65c2dc71e5e (commit)
       via  662a999d1951e68cd3e9471353545adc8e12222f (commit)
      from  25a4d91b9a95b2cdc20ff440dd06f355f541249b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d3016d1b54fdc46a10a2dfd6b78ad65c2dc71e5e
Merge: 662a999 25a4d91
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Oct 24 15:24:42 2015 -0700

    Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into FREESIDE_4_BRANCH


commit 662a999d1951e68cd3e9471353545adc8e12222f
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Thu Jun 25 20:59:54 2015 -0500

    RT#23741 Multiple payment options [selfservice paytypes fix]

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 35cc829..98b87ad 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -48,6 +48,7 @@ use FS::msg_template;
 use FS::contact;
 use FS::cust_contact;
 use FS::cust_location;
+use FS::cust_payby;
 
 # for code organization
 use FS::ClientAPI::MyAccount::contact;
@@ -860,7 +861,7 @@ sub payment_info {
       'require_cvv'        => $conf->exists('selfservice-require_cvv'),
       'onfile_require_cvv' => $conf->exists('selfservice-onfile_require_cvv'),
 
-      'paytypes' => [ @FS::cust_main::paytypes ],
+      'paytypes' => [ FS::cust_payby::paytypes ],
 
       'paybys' => [ $conf->config('signup_server-payby') ],
       'cust_paybys' => \@cust_paybys,

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/ClientAPI/MyAccount.pm |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)