projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
cust_main.pm
diff --git
a/FS/FS/cust_main.pm
b/FS/FS/cust_main.pm
index
747776b
..
ec5f4ff
100644
(file)
--- a/
FS/FS/cust_main.pm
+++ b/
FS/FS/cust_main.pm
@@
-20,17
+20,16
@@
use base qw( FS::cust_main::Packages
require 5.006;
use strict;
use Carp;
require 5.006;
use strict;
use Carp;
-use Try::Tiny;
use Scalar::Util qw( blessed );
use Scalar::Util qw( blessed );
-use List::Util qw(min);
-use Tie::IxHash;
-use File::Temp; #qw( tempfile );
-use Data::Dumper;
use Time::Local qw(timelocal);
use Time::Local qw(timelocal);
+use Data::Dumper;
+use Tie::IxHash;
use Date::Format;
#use Date::Manip;
use Date::Format;
#use Date::Manip;
-use
Email::Address
;
+use
File::Temp; #qw( tempfile )
;
use Business::CreditCard 0.28;
use Business::CreditCard 0.28;
+use List::Util qw(min);
+use Try::Tiny;
use FS::UID qw( dbh driver_name );
use FS::Record qw( qsearchs qsearch dbdef regexp_sql );
use FS::Cursor;
use FS::UID qw( dbh driver_name );
use FS::Record qw( qsearchs qsearch dbdef regexp_sql );
use FS::Cursor;
@@
-3061,9
+3060,8
@@
sub contact_list_email {
my @emails;
foreach my $contact (@contacts) {
foreach my $contact_email ($contact->contact_email) {
my @emails;
foreach my $contact (@contacts) {
foreach my $contact_email ($contact->contact_email) {
- push @emails, Email::Address->new( $contact->firstlast,
- $contact_email->emailaddress
- )->format;
+ push @emails,
+ $contact->firstlast . ' <' . $contact_email->emailaddress . '>';
}
}
@emails;
}
}
@emails;
@@
-5356,6
+5354,11
@@
sub _upgrade_data { #class method
}
}
+sub queueable_upgrade {
+ my $class = shift;
+ FS::cust_main::Billing_Realtime::token_check(@_);
+}
+
=back
=head1 BUGS
=back
=head1 BUGS