X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Flocation.html;h=0ff119009ef3e3264244df6e9a915e55f0731620;hb=dad39ad50ddc5cbb549a0207262d94a4886d5fec;hp=dbc567d4d34119edcb4a37ede79a480c150f150b;hpb=d6b6f81e383f9d876e67e9704914e887a331012e;p=freeside.git
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index dbc567d4d..0ff119009 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -9,6 +9,7 @@ Example:
'disabled' => $disabled,
'same_checked' => $same_checked,
'geocode' => $geocode, #passed through
+ 'censustract' => $censustract, #passed through
'no_asterisks' => 0, #set true to disable the red asterisks next
#to required fields
'address1_label' => 'Address', #label for address
@@ -16,8 +17,30 @@ Example:
%doc>
+% if ( $opt{'alt_format'} ) {
+
+
+ <<%$th%> ALIGN="right">Location kind<%$th%>>
+
+ <% include('/elements/select.html',
+ 'cgi' => $cgi,
+ 'field' => 'location_kind',
+ 'id' => 'location_kind',
+ 'disabled' => $disabled,
+ #'style' => \@style,
+ 'options' => \@location_kind_options,
+ 'labels' => $location_kind_labels,
+ 'curr_value' => scalar($cgi->param('location_kind'))
+ || $object->get($pre.'location_kind'),
+ )
+ %>
+ |
+
+
+% }
+
- <%$r%><% $opt{'address1_label'} || 'Address' %> |
+ <<%$th%> ALIGN="right"><%$r%><% $opt{'address1_label'} || 'Address' %><%$th%>>
|
+% if ( ! $opt{'alt_format'} ) { #regular format
+
- >* >Unit # |
-
-
- <% $style %>
- >
- |
+ >* >Unit # |
+
+
+ <% $style %>
+ >
+ |
+% } else { # alternate format
+
+
+
- <%$r%>City |
-
-
- <% $style %>
- >
- |
- ><%$r%>County |
- <% include('/elements/select-county.html', %select_hash ) %> |
- <%$r%>State |
+ <<%$th%> ALIGN="right">Unit type and #<%$th%>>
+
+
+% my $location_type = scalar($cgi->param('location_type'))
+% || $object->get($pre.'location_type');
+% #my $location_number = scalar($cgi->param('location_number'))
+% # || $object->get($pre.'location_number');
+%
+% if ( $object->get($pre.'address2') && ! $location_type ) {
+% }
+%
+% if ( 1 ) { #ikano, switch on via config
+% tie my %location_types, 'Tie::IxHash',
+% FS::part_export::ikano->location_types;
+ <% include('/elements/select.html',
+ 'cgi' => $cgi,
+ 'field' => 'location_type',
+ 'id' => 'location_type',
+ 'disabled' => $disabled,
+ #'style' => \@style,
+ 'options' => [ keys %location_types ],
+ 'labels' => \%location_types,
+ 'curr_value' => $location_type,
+ 'onchange' => 'location_type_changed',
+ )
+ %>
+
+% } else {
+
+ <% $style %>
+ >
+% }
+
+
+ <% $style %>
+ >
+
+% #XXX i don't work so well when the dropdown is changed :/ i probably need to be triggered by "default service address"
+% $alt_err =~ s/(ship_)?address2/''.encode_entities($object->get($1.'address2')).'<\/B>'/e;
+ <% $alt_err %>
+
+ |
+
+
+
+% }
+
+
+
+ <<%$th%> ALIGN="right"><%$r%>City<%$th%>>
+ <% include('/elements/city.html', %select_hash) %> |
+ <<%$th%> ALIGN="right" WIDTH="1" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County<%$th%>>
+ <% include('/elements/select-county.html', %select_hash ) %> |
+ <<%$th%> ALIGN="right" WIDTH="1"><%$r%>State<%$th%>>
<% include('/elements/select-state.html', %select_hash ) %>
|
- <%$r%>Zip |
+ <<%$th%> ALIGN="right" WIDTH="1"><%$r%>Zip<%$th%>>
|
- <%$r%>Country |
+ <<%$th%> ALIGN="right"><%$r%>Country<%$th%>>
<% include('/elements/select-country.html', %select_hash ) %> |
% if ( !$pre ) {
+% } else {
+% if ( $pre eq 'ship_' && $conf->exists('cust_main-require_censustract') ) {
+ <<%$th%> ALIGN="right">Census tract
(automatic)<%$th%>>
+
+
+ |
+
+% } else {
+
+% }
% }
<%init>
@@ -111,8 +213,10 @@ $object->set($pre.'state', $statedefault )
unless $object->get($pre.'state')
|| $object->get($pre.'country') ne $countrydefault;
+my $alt_err = ($opt{'alt_format'} && !$disabled) ? $object->alternize : '';
+
my @style = ();
-push @style, 'background-color: #dddddd"' if $disabled;
+push @style, 'background-color: #dddddd' if $disabled;
my @address2_label_style = ();
push @address2_label_style, 'visibility:hidden'
@@ -141,13 +245,19 @@ my $county_style =
: '';
my %select_hash = (
+ 'city' => $object->get($pre.'city'),
'county' => $object->get($pre.'county'),
'state' => $object->get($pre.'state'),
'country' => $object->get($pre.'country'),
'prefix' => $pre,
'onchange' => $onchange,
'disabled' => $disabled,
- 'style' => \@style,
+ #'style' => \@style,
);
+my $th = $opt{'no_bold'} ? 'TD' : 'TH';
+
+my @location_kind_options = ( '', 'R', 'B' );
+my $location_kind_labels = { '' => '', 'R' => 'Residential', 'B' => 'Business' };
+
%init>