X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Flocation.html;h=48c6159bbf260ce9b78e10e3cd5d4c166dd323c6;hb=3d2e1d9b5d1883f768f5a90e0dfaae7cc9a41367;hp=b5f76409bbfdeaffe5af126322f5d2f7b2b2fadb;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index b5f76409b..48c6159bb 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -17,8 +17,30 @@ Example:
%doc>
+% if ( $opt{'alt_format'} ) {
+
- <<%$th%> ALIGN="right"><%$r%><% $opt{'address1_label'} || 'Address' %><%$th%>>
+ <<%$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'),
+ )
+ %>
+ |
+
+
+% }
+
+
+ <<%$th%> ALIGN="right"><%$r%><% $opt{'address1_label'} || emt('Address') %><%$th%>>
|
+
+% if ( ! $opt{'alt_format'} ) { #regular format
+
>* >Unit # |
-
- <% $style %>
- >
+
+ <% $style %>
+ >
|
+% } else { # alternate format
+
+
-% if ( $opt{'alt_format'} ) {
- <<%$th%> ALIGN="right">Location Type<%$th%>>
-
- <% $style %>
- >
- |
- |
- <<%$th%> ALIGN="right">Number<%$th%>>
-
- <% $style %>
- >
- |
- <<%$th%> ALIGN="right">Kind<%$th%>>
-
- <% include('/elements/select.html',
- 'cgi' => $cgi,
- 'field' => 'location_kind',
- 'disabled' => $disabled,
- 'style' => $style,
- 'options' => \@location_kind_options,
- 'labels' => $location_kind_labels,
- 'curr_value' => $cgi->param('location_kind'),
- )
- %>
+ <<%$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%>>
+ <<%$th%> ALIGN="right"><%$r%><% mt('City') |h %><%$th%>>
<% include('/elements/city.html', %select_hash) %> |
- <<%$th%> ALIGN="right" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County<%$th%>>
- <% include('/elements/select-county.html', %select_hash ) %> |
- <<%$th%> ALIGN="right" WIDTH="1"><%$r%>State<%$th%>>
+ <<%$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%><% mt('State') |h %><%$th%>>
<% include('/elements/select-state.html', %select_hash ) %>
|
- <<%$th%>><%$r%>Zip<%$th%>>
+ <<%$th%> ALIGN="right" WIDTH="1"><%$r%><% mt('Zip') |h %><%$th%>>
|
- <<%$th%> ALIGN="right"><%$r%>Country<%$th%>>
+ <<%$th%> ALIGN="right"><%$r%><% mt('Country') |h %><%$th%>>
<% include('/elements/select-country.html', %select_hash ) %> |
@@ -152,6 +213,8 @@ $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;
@@ -189,7 +252,7 @@ my %select_hash = (
'prefix' => $pre,
'onchange' => $onchange,
'disabled' => $disabled,
- 'style' => \@style,
+ #'style' => \@style,
);
my $th = $opt{'no_bold'} ? 'TD' : 'TH';