projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add start of torrus srvderive daemon, RT#10574
[freeside.git]
/
FS
/
FS
/
geocode_Mixin.pm
diff --git
a/FS/FS/geocode_Mixin.pm
b/FS/FS/geocode_Mixin.pm
index
cf45a92
..
08e7b86
100644
(file)
--- a/
FS/FS/geocode_Mixin.pm
+++ b/
FS/FS/geocode_Mixin.pm
@@
-5,6
+5,7
@@
use vars qw( $DEBUG $me );
use Carp;
use Locale::Country;
use FS::Record qw( qsearchs qsearch );
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;
use FS::cust_pkg;
use FS::cust_location;
use FS::cust_tax_location;
@@
-50,7
+51,8
@@
sub location_hash {
map { my $method = ($_ eq 'geocode') ? $_ : $prefix.$_;
$_ => $self->get($method);
}
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 ... ]
}
=item location_label [ OPTION => VALUE ... ]
@@
-82,11
+84,11
@@
sub location_label {
my $ds = $opt{double_space} || ' ';
my $line = '';
my $cydefault =
my $ds = $opt{double_space} || ' ';
my $line = '';
my $cydefault =
- $opt{'countrydefault'} || FS::
c
onf->new->config('countrydefault') || 'US';
+ $opt{'countrydefault'} || FS::
C
onf->new->config('countrydefault') || 'US';
my $prefix = $self->has_ship_address ? 'ship_' : '';
my $notfirst = 0;
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;
my $method = "$prefix$_";
$line .= ($notfirst ? $separator : ''). &$escape($self->$method)
if $self->$method;
@@
-122,7
+124,7
@@
sub geocode {
return $geocode if $geocode;
my $prefix =
return $geocode if $geocode;
my $prefix =
- ( FS::
c
onf->new->exists('tax-ship_address') && $self->has_ship_address )
+ ( FS::
C
onf->new->exists('tax-ship_address') && $self->has_ship_address )
? 'ship_'
: '';
? 'ship_'
: '';