[freeside-commits] branch master updated. 6d47b55c98b1a8e145a4b63579e148241c65b6ed

[Ivan]

The branch, master has been updated
       via  6d47b55c98b1a8e145a4b63579e148241c65b6ed (commit)
       via  878072579607ed3e01c9f430d8b259626483aaec (commit)
       via  7a8867ad490e465c138859e9d8b3eb81b9b587c9 (commit)
      from  e679fff4ed72a972cc650a394814e6869719f98b (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 6d47b55c98b1a8e145a4b63579e148241c65b6ed
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Nov 2 17:11:59 2014 -0800

    add cust_pay insert noemail flag, RT#23357, github #32

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 80a1e3e..87fad02 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -190,7 +190,13 @@ If the additional field discount_term is defined then a prepayment discount
 is taken for that length of time.  It is an error for the customer to owe
 after this payment is made.
 
-A hash of optional arguments may be passed.  Currently "manual" is supported.
+A hash of optional arguments may be passed.  The following arguments are
+supported:
+
+=over 4
+
+=item manual
+
 If true, a payment receipt is sent instead of a statement when
 'payment_receipt_email' configuration option is set.
 
@@ -203,6 +209,13 @@ payment is created directly from the web interface, from a user-initiated
 realtime payment, or from a third-party payment via self-service.  It should
 be I<false> when creating a payment from a billing event or from a batch.
 
+=item noemail
+
+Don't send an email receipt.  (Note: does not currently work when
+payment_receipt-trigger is set to something other than default / cust_bill)
+
+=back
+
 =cut
 
 sub insert {
@@ -379,6 +392,7 @@ sub insert {
   if ( $trigger eq 'cust_pay' ) {
     my $error = $self->send_receipt(
       'manual'    => $options{'manual'},
+      'noemail'   => $options{'noemail'},
       'cust_bill' => $cust_bill,
       'cust_main' => $cust_main,
     );
@@ -581,6 +595,12 @@ will be assumed.
 
 Customer (FS::cust_main) object (for efficiency).
 
+=item noemail
+
+Don't send an email receipt.
+
+=cut
+
 =back
 
 =cut
@@ -687,7 +707,8 @@ sub send_receipt {
 
     }
 
-  } elsif ( ! $cust_main->invoice_noemail ) { #not manual
+  #not manual and no noemail flag (here or on the customer)
+  } elsif ( ! $opt->{'noemail'} && ! $cust_main->invoice_noemail ) {
 
     my $queue = new FS::queue {
        'job'     => 'FS::cust_bill::queueable_email',

commit 878072579607ed3e01c9f430d8b259626483aaec
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Nov 2 16:21:09 2014 -0800

    add index on cust_payu_pending.invnum, RT#23357, githum #32

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index e5f9c05..ce58dbf 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -2292,7 +2292,9 @@ sub tables_hashref {
       ],
       'primary_key'  => 'paypendingnum',
       'unique'       => [ [ 'payunique' ] ],
-      'index'        => [ [ 'custnum' ], [ 'status' ], ['paynum'], ['void_paynum'], ['jobnum'], ],
+      'index'        => [ [ 'custnum' ], [ 'status' ],
+                          ['paynum'], ['void_paynum'], ['jobnum'], ['invnum'],
+                        ],
       'foreign_keys' => [
                           { columns    => [ 'custnum' ],
                             table      => 'cust_main',

commit 7a8867ad490e465c138859e9d8b3eb81b9b587c9
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Nov 2 16:08:51 2014 -0800

    add indices on cust_pay_pending.paynum .void_paynum and .jobnum, RT#23357, github pull request #31

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 53e78de..e5f9c05 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -2292,7 +2292,7 @@ sub tables_hashref {
       ],
       'primary_key'  => 'paypendingnum',
       'unique'       => [ [ 'payunique' ] ],
-      'index'        => [ [ 'custnum' ], [ 'status' ], ],
+      'index'        => [ [ 'custnum' ], [ 'status' ], ['paynum'], ['void_paynum'], ['jobnum'], ],
       'foreign_keys' => [
                           { columns    => [ 'custnum' ],
                             table      => 'cust_main',

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

Summary of changes:
 FS/FS/Schema.pm   |    4 +++-
 FS/FS/cust_pay.pm |   25 +++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)