X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Ftr-select-cust_location.html;h=47a917dbdeb07bb7be9addecdab471427ce02d0a;hb=d2485c6fa278d7a4a1c940605816013f41d1f7e0;hp=bb10a83def61853be8b9abb2ccdc4a7d0b2a9131;hpb=fced2ed0147049fded427862a3517c172f86513e;p=freeside.git
diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index bb10a83de..47a917dbd 100644
--- a/httemplate/elements/tr-select-cust_location.html
+++ b/httemplate/elements/tr-select-cust_location.html
@@ -23,27 +23,60 @@ Example:
- <<%$th%> ALIGN="right"><% $opt{'label'} || 'Service location' %><%$th%>>
+ <<%$th%> ALIGN="right"><% $opt{'label'} || emt('Service location') %><%$th%>>
-
+
+ <& /elements/select-cust_location.html,
+ %opt,
+ 'curr_value' => $locationnum,
+ 'cust_location' => \@cust_location,
+ 'onchange' => 'locationnum_changed(this);',
+ &>
+
|
@@ -181,10 +200,14 @@ Example:
'disabled' => $disabled,
'no_asterisks' => 1,
'no_bold' => $opt{'no_bold'},
- 'alt_format' => $opt{'alt_format'},
+ 'alt_format' => $opt{'alt_format'},
+ 'enable_coords'=> 1,
+ 'enable_censustract' => 1,
)
%>
-
+
<%init>
my $conf = new FS::Conf;
@@ -197,8 +220,7 @@ my $cgi = $opt{'cgi'};
my $cust_pkg = $opt{'cust_pkg'};
my $cust_main = $opt{'cust_main'};
my $prospect_main = $opt{'prospect_main'};
-
-my $prefix = ($cust_main && length($cust_main->ship_last)) ? 'ship_' : '';
+die "cust_main or prospect_main required" unless $cust_main or $prospect_main;
my $locationnum = '';
if ( $cgi->param('error') ) {
@@ -210,9 +232,9 @@ if ( $cgi->param('error') ) {
} elsif ($prospect_main) {
my @cust_location = $prospect_main->cust_location;
$locationnum = $cust_location[0]->locationnum if scalar(@cust_location)==1;
- } else { #?
+ } else { #$cust_main
$cgi->param('locationnum') =~ /^(\-?\d*)$/ or die "illegal locationnum";
- $locationnum = $1;
+ $locationnum = $1 || $cust_main->ship_locationnum;
}
}
@@ -221,36 +243,42 @@ if ( $cgi->param('error') ) {
my $editable = $cust_main ? 0 : 1; #could use explicit control
my $addnew = $cust_main ? 1 : ( $locationnum>0 ? 0 : 1 );
-my @location_fields = qw( address1 address2 city county state zip country );
+my @location_fields = FS::cust_main->location_fields;
if ( $opt{'alt_format'} ) {
push @location_fields, qw( location_type location_number location_kind );
}
-my $cust_location;
+my $cust_location; #the one that shows by default in the location edit space
if ( $locationnum && $locationnum > 0 ) {
$cust_location = qsearchs('cust_location', { 'locationnum' => $locationnum } )
or die "unknown locationnum";
} else {
$cust_location = new FS::cust_location;
- if ( $locationnum == -1 ) {
+ if ( $locationnum == -1 || $locationnum == -3 ) {
$cust_location->$_( $cgi->param($_) ) foreach @location_fields;
} elsif ( $cust_pkg && $cust_pkg->locationnum ) {
my $pkg_location = $cust_pkg->cust_location;
$cust_location->$_( $pkg_location->$_ ) foreach @location_fields;
$opt{'empty_label'} ||= 'package address: '.$pkg_location->line;
} elsif ( $cust_main ) {
- $cust_location->$_( $cust_main->get($prefix.$_) ) foreach @location_fields;
+ $cust_location = $cust_main->ship_location; #I think
}
}
+$cust_location->coord_auto('Y');
+
my $location_sort = sub {
+ #enabled w/label_prefix _location # $a->locationname cmp $b->locationname
+ # or
$a->country cmp $b->country
+ or lc($a->state) cmp lc($b->state)
or lc($a->city) cmp lc($b->city)
+ or lc($a->county) cmp lc($b->county)
or lc($a->address1) cmp lc($b->address1)
or lc($a->address2) cmp lc($b->address2)
};
-my @cust_location = ();
+my @cust_location;
push @cust_location, $cust_main->cust_location if $cust_main;
push @cust_location, $prospect_main->cust_location if $prospect_main;
push @cust_location, $cust_location
@@ -259,14 +287,27 @@ push @cust_location, $cust_location
@cust_location = sort $location_sort grep !$_->disabled, @cust_location;
+$cust_location = $cust_location[0]
+ if ( $prospect_main )
+ && !$opt{'is_optional'}
+ && @cust_location;
+
my $disabled =
( $locationnum < 0
|| ( $editable && $locationnum )
- || ( $prospect_main && !$opt{'is_optional'} && !@cust_location && $addnew )
+ || ( $prospect_main
+ && !$opt{'is_optional'} && !@cust_location && $addnew
+ )
)
? ''
: 'DISABLED';
+if ( $cust_main && $opt{'alt_format'} && ! @cust_location ) {
+ $cust_location->locationnum(-3);
+ $cust_location->alternize;
+ push @cust_location, $cust_location;
+}
+
my $th = $opt{'no_bold'} ? 'TD' : 'TH';
%init>