X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Ftr-select-cust_location.html;h=34ed78dd400911e2ef10958a62ae99005ce57c24;hb=9a6e080912eb49a601b574591321cfc915359dc0;hp=7a5b43bb8aac8ea98f8177aa42d25cb9100d13be;hpb=aeb90ade381fc3d5477db0334048c2af623fccfe;p=freeside.git
diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index 7a5b43bb8..34ed78dd4 100644
--- a/httemplate/elements/tr-select-cust_location.html
+++ b/httemplate/elements/tr-select-cust_location.html
@@ -183,33 +183,14 @@ Example:
<<%$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);',
+ &>
+
|
@@ -224,9 +205,13 @@ Example:
'enable_censustract' => 1,
)
%>
-
+
+% unless ( $prospect_main ) {
+
+% }
+
<%init>
my $conf = new FS::Conf;
@@ -290,7 +275,9 @@ 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)
};