[freeside-commits] branch FREESIDE_3_BRANCH updated. 024ebf9e47096a92f7eaff8687231f5f81285330

[Jonathan Prykop]

The branch, FREESIDE_3_BRANCH has been updated
       via  024ebf9e47096a92f7eaff8687231f5f81285330 (commit)
       via  328e2e3bc40c6aef5a8bc5984f837cac2d8e95af (commit)
      from  c464d2c65c63ab05f306dad9d718e1eb49e42851 (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 024ebf9e47096a92f7eaff8687231f5f81285330
Merge: 328e2e3 c464d2c
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Wed Apr 8 15:57:00 2015 -0500

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


commit 328e2e3bc40c6aef5a8bc5984f837cac2d8e95af
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Fri Apr 3 19:36:13 2015 -0500

    RT#34201: Payment import option

diff --git a/FS/FS/payby.pm b/FS/FS/payby.pm
index 11bc184..bc709e6 100644
--- a/FS/FS/payby.pm
+++ b/FS/FS/payby.pm
@@ -261,6 +261,17 @@ sub payment_payby2longname {
   map { $_ => $hash{$_}->{longname} } $self->payment_payby;
 }
 
+=item payment_payby2payname
+
+Returns hash, keys are L</payment_payby> types, values are payby payname.
+
+=cut
+
+sub payment_payby2payname {
+  my $self = shift;
+  map { $_ => $self->payname($_) } $self->payment_payby;
+}
+
 =back
 
 =head1 BUGS
diff --git a/httemplate/misc/cust_pay-import.cgi b/httemplate/misc/cust_pay-import.cgi
index bc4ac83..897de99 100644
--- a/httemplate/misc/cust_pay-import.cgi
+++ b/httemplate/misc/cust_pay-import.cgi
@@ -87,5 +87,5 @@ Field information:
 <%init>
 my $paybatch = time2str('webbatch-%Y/%m/%d-%T'. "-$$-". rand() * 2**32, time);
 my %paybys;
-tie %paybys, 'Tie::IxHash', FS::payby->payment_payby2longname();
+tie %paybys, 'Tie::IxHash', FS::payby->payment_payby2payname();
 </%init>

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

Summary of changes:
 FS/FS/payby.pm                      |   11 +++++++++++
 httemplate/misc/cust_pay-import.cgi |    2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)