[freeside-commits] freeside/FS/FS cust_pay.pm,1.74.2.3,1.74.2.4

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv4254

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	cust_pay.pm 
Log Message:
fix payment receipts when payment_receipt_msgnum is unconfigured

Index: cust_pay.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pay.pm,v
retrieving revision 1.74.2.3
retrieving revision 1.74.2.4
diff -u -w -d -r1.74.2.3 -r1.74.2.4
--- cust_pay.pm	30 Jul 2010 22:20:50 -0000	1.74.2.3
+++ cust_pay.pm	24 Aug 2010 00:55:49 -0000	1.74.2.4
@@ -458,12 +458,15 @@
 
     my $error = '';
 
-    if( $conf->exists('payment_receipt_msgnum') ) {
+    if ( $conf->exists('payment_receipt_msgnum')
+         && $conf->config('payment_receipt_msgnum')
+       )
+    {
       my $msg_template = 
           FS::msg_template->by_key($conf->config('payment_receipt_msgnum'));
       $error = $msg_template->send('cust_main'=> $cust_main, 'object'=> $self);
-    }
-    elsif ( $conf->exists('payment_receipt_email') ) {
+
+    } elsif ( $conf->exists('payment_receipt_email') ) {
       my $receipt_template = new Text::Template (
         TYPE   => 'ARRAY',
         SOURCE => [ map "$_\n", $conf->config('payment_receipt_email') ],
@@ -506,8 +509,7 @@
         'body'    => [ $receipt_template->fill_in( HASH => \%fill_in ) ],
       );
 
-    } 
-    else { # no payment_receipt_msgnum or payment_receipt_email
+    } else { # no payment_receipt_msgnum or payment_receipt_email
 
       my $queue = new FS::queue {
          'paynum' => $self->paynum,