use Carp;
use Locale::Country;
use FS::Record qw( qsearchs qsearch );
+use FS::Conf;
use FS::cust_pkg;
use FS::cust_location;
use FS::cust_tax_location;
map { my $method = ($_ eq 'geocode') ? $_ : $prefix.$_;
$_ => $self->get($method);
}
- qw( address1 address2 city county state zip country geocode );
+ qw( address1 address2 city county state zip country geocode
+ location_type location_number location_kind );
}
=item location_label [ OPTION => VALUE ... ]
my $ds = $opt{double_space} || ' ';
my $line = '';
my $cydefault =
- $opt{'countrydefault'} || FS::conf->new->config('countrydefault') || 'US';
+ $opt{'countrydefault'} || FS::Conf->new->config('countrydefault') || 'US';
my $prefix = $self->has_ship_address ? 'ship_' : '';
my $notfirst = 0;
- foreach (qw ( address1 address2 ) ) {
+ foreach (qw ( address1 address2 location_type location_number ) ) {
my $method = "$prefix$_";
$line .= ($notfirst ? $separator : ''). &$escape($self->$method)
if $self->$method;
return $geocode if $geocode;
my $prefix =
- ( FS::conf->new->exists('tax-ship_address') && $self->has_ship_address )
+ ( FS::Conf->new->exists('tax-ship_address') && $self->has_ship_address )
? 'ship_'
: '';