[freeside-commits] branch master updated. 2745cc5da9e4ef3ce98f71740b3f692de28540d7

Ivan ivan at 420.am
Sun Apr 27 15:38:46 PDT 2014


The branch, master has been updated
       via  2745cc5da9e4ef3ce98f71740b3f692de28540d7 (commit)
      from  a7d8494c57376bfc493fbaa234b250cc86a79a94 (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 2745cc5da9e4ef3ce98f71740b3f692de28540d7
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Apr 27 15:38:45 2014 -0700

    invoice # in payment receipts, RT#26083

diff --git a/FS/FS/cust_bill_pay_pkg.pm b/FS/FS/cust_bill_pay_pkg.pm
index 0a17469..efd5138 100644
--- a/FS/FS/cust_bill_pay_pkg.pm
+++ b/FS/FS/cust_bill_pay_pkg.pm
@@ -97,7 +97,11 @@ sub insert {
 
   #payment receipt
   my $conf = new FS::Conf;
-  my $trigger = $conf->config('payment_receipt-trigger') || 'cust_pay';
+  my $trigger =
+    $conf->config('payment_receipt-trigger',
+                    $self->cust_bill_pay->cust_bill->cust_main->agentnum,
+                 )
+    || 'cust_pay';
   if ( $trigger eq 'cust_bill_pay_pkg' ) {
     my $error = $self->send_receipt(
       'manual'    => $options{'manual'},
diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index a65520f..ca681e6 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -610,6 +610,9 @@ sub send_receipt {
     my $msgnum = $conf->config('payment_receipt_msgnum', $cust_main->agentnum);
     if ( $msgnum ) {
 
+      my %substitutions = ();
+      $substitutions{invnum} = $opt->{cust_bill}->invnum if $opt->{cust_bill};
+
       my $queue = new FS::queue {
         'job'     => 'FS::Misc::process_send_email',
         'paynum'  => $self->paynum,
@@ -617,9 +620,10 @@ sub send_receipt {
       };
       $error = $queue->insert(
         FS::msg_template->by_key($msgnum)->prepare(
-          'cust_main'   => $cust_main,
-          'object'      => $self,
-          'from_config' => 'payment_receipt_from',
+          'cust_main'     => $cust_main,
+          'object'        => $self,
+          'from_config'   => 'payment_receipt_from',
+          'substitutions' => \%substitutions,
         ),
         'msgtype' => 'receipt', # override msg_template's default
       );

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

Summary of changes:
 FS/FS/cust_bill_pay_pkg.pm |    6 +++++-
 FS/FS/cust_pay.pm          |   10 +++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)




More information about the freeside-commits mailing list