projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add northern cyprus, RT#39335
[freeside.git]
/
FS
/
FS
/
cust_main.pm
diff --git
a/FS/FS/cust_main.pm
b/FS/FS/cust_main.pm
index
dcf642b
..
4fb4f52
100644
(file)
--- a/
FS/FS/cust_main.pm
+++ b/
FS/FS/cust_main.pm
@@
-28,7
+28,6
@@
use Date::Format;
#use Date::Manip;
use File::Temp; #qw( tempfile );
use Business::CreditCard 0.28;
#use Date::Manip;
use File::Temp; #qw( tempfile );
use Business::CreditCard 0.28;
-use Locale::Country;
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;
@@
-3869,26
+3868,14
@@
sub ship_contact_firstlast {
$contact->get('first') . ' '. $contact->get('last');
}
$contact->get('first') . ' '. $contact->get('last');
}
-#XXX this doesn't work in 3.x+
-#=item country_full
-#
-#Returns this customer's full country name
-#
-#=cut
-#
-#sub country_full {
-# my $self = shift;
-# code2country($self->country);
-#}
-
sub bill_country_full {
my $self = shift;
sub bill_country_full {
my $self = shift;
-
code2country($self->bill_location->country)
;
+
$self->bill_location->country_full
;
}
sub ship_country_full {
my $self = shift;
}
sub ship_country_full {
my $self = shift;
-
code2country($self->ship_location->country)
;
+
$self->ship_location->country_full
;
}
=item county_state_county [ PREFIX ]
}
=item county_state_county [ PREFIX ]