[freeside-commits] branch master updated. 8142815f404a02df9ba3f92ad8e703a7355c5bcd

[Ivan]

The branch, master has been updated
       via  8142815f404a02df9ba3f92ad8e703a7355c5bcd (commit)
       via  957e8ac61c4d3f6f092a006f008f395a237a207d (commit)
       via  0617a36106148efd7884c2f6ccd2a41075f9e5f6 (commit)
      from  6a7acbedcaa251d104b9cdfc3875b5e5274f8a9a (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 8142815f404a02df9ba3f92ad8e703a7355c5bcd
Merge: 957e8ac 6a7acbe
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Feb 24 18:42:54 2015 -0800

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 957e8ac61c4d3f6f092a006f008f395a237a207d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Feb 24 18:42:50 2015 -0800

    multiple payment options, RT#23741

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index c3b141e..e4be849 100644
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -93,6 +93,8 @@ our $skip_fuzzyfiles = 0;
 
 our $ucfirst_nowarn = 0;
 
+#this info is in cust_payby as of 4.x
+#this and the fields themselves can be removed in 5.x
 our @encrypted_fields = ('payinfo', 'paycvv');
 sub nohistory_fields { ('payinfo', 'paycvv'); }
 

commit 0617a36106148efd7884c2f6ccd2a41075f9e5f6
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Feb 24 18:41:39 2015 -0800

    multiple payment options, RT#23741

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index a822654..2c9468b 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -161,8 +161,6 @@ sub bill {
 #      with today's date, regardless of the pretend date used to pre-generate
 #      the invoices.
 #
-#  -p: Only process customers with the specified payby (I<CARD>, I<DCRD>, I<CHEK>, I<DCHK>, I<BILL>, I<COMP>, I<LECB>)
-#
 #  -a: Only process customers with the specified agentnum
 #
 #  -v: enable debugging
diff --git a/FS/FS/cust_bill_void.pm b/FS/FS/cust_bill_void.pm
index bf147c0..b9db81b 100644
--- a/FS/FS/cust_bill_void.pm
+++ b/FS/FS/cust_bill_void.pm
@@ -278,7 +278,7 @@ sub cust_pkg {
 Class method which returns an SQL WHERE fragment to search for parameters
 specified in HASHREF.  Accepts the following parameters for 
 L<FS::cust_bill::search_sql_where>: C<_date>, C<invnum_min>, C<invnum_max>,
-C<agentnum>, C<custnum>, C<cust_classnum>, C<refnum>, C<payby>.  Also 
+C<agentnum>, C<custnum>, C<cust_classnum>, C<refnum>.  Also 
 accepts the following:
 
 =over 4
@@ -302,7 +302,7 @@ sub search_sql_where {
     map { $_ => $param->{$_} }
     grep { exists($param->{$_}) }
     qw( _date invnum_min invnum_max agentnum custnum cust_classnum 
-        refnum payby )
+        refnum )
   };
   my $search_sql = FS::cust_bill->search_sql_where($cust_bill_param);
   $search_sql =~ s/cust_bill/cust_bill_void/g;

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

Summary of changes:
 FS/FS/Cron/bill.pm      |    2 --
 FS/FS/cust_bill_void.pm |    4 ++--
 FS/FS/cust_main.pm      |    2 ++
 3 files changed, 4 insertions(+), 4 deletions(-)