X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_bill.pm;h=52fc9423566844889625f93e3103f7c1140cfb65;hb=3595c874f8e476e58b98b7ab6d86918d4dbb1d5c;hp=5e041ea5926eed542ce109520b551c5b79f8abc9;hpb=e1cfff0375b46aaf2b5fef7fb2f9e62d7567f41f;p=freeside.git

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 5e041ea59..52fc94235 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -443,23 +443,39 @@ first two fields (B<record_type> and B<invnum>) and the last five fields
 (B<pkg> through B<edate>) are filled in.
 
 =item invnum - invoice number
+
 =item custnum - customer number
+
 =item _date - invoice date
+
 =item charged - total invoice amount
+
 =item first - customer first name
+
 =item last - customer first name
+
 =item company - company name
+
 =item address1 - address line 1
+
 =item address2 - address line 1
+
 =item city
+
 =item state
+
 =item zip
+
 =item country
 
 =item pkg - line item description
-=item setup - line item setup fee (only or both of B<setup> and B<recur> will be defined)
-=item recur - line item recurring fee (only or both of B<setup> and B<recur> will be defined)
+
+=item setup - line item setup fee (one or both of B<setup> and B<recur> will be defined)
+
+=item recur - line item recurring fee (one or both of B<setup> and B<recur> will be defined)
+
 =item sdate - start date for recurring fee
+
 =item edate - end date for recurring fee
 
 =back
@@ -623,7 +639,7 @@ sub realtime_card {
   my @invoicing_list = grep { $_ ne 'POST' } $cust_main->invoicing_list;
   if ( $conf->exists('emailinvoiceauto')
        || ( $conf->exists('emailinvoiceonly') && ! @invoicing_list ) ) {
-    push @invoicing_list, $cust_main->default_invoicing_list;
+    push @invoicing_list, $cust_main->all_emails;
   }
   my $email = $invoicing_list[0];
 
@@ -674,7 +690,9 @@ sub realtime_card {
 
   if ( $transaction->is_success() && $action2 ) {
     my $auth = $transaction->authorization;
-    my $ordernum = $transaction->order_number;
+    my $ordernum = $transaction->can('order_number')
+                   ? $transaction->order_number
+                   : '';
 
     #warn "********* $auth ***********\n";
     #warn "********* $ordernum ***********\n";
@@ -1112,7 +1130,7 @@ sub print_text {
 
 =head1 VERSION
 
-$Id: cust_bill.pm,v 1.41 2002-09-05 16:51:49 ivan Exp $
+$Id: cust_bill.pm,v 1.44 2002-09-17 00:40:07 ivan Exp $
 
 =head1 BUGS