projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qualification address handling changes, RT#7111
[freeside.git]
/
httemplate
/
elements
/
location.html
diff --git
a/httemplate/elements/location.html
b/httemplate/elements/location.html
index
5304c37
..
f36f2c4
100644
(file)
--- a/
httemplate/elements/location.html
+++ b/
httemplate/elements/location.html
@@
-20,13
+20,14
@@
Example:
% if ( $opt{'alt_format'} ) {
<TR>
% if ( $opt{'alt_format'} ) {
<TR>
- <<%$th%> ALIGN="right">Locatio
pn type
</<%$th%>>
+ <<%$th%> ALIGN="right">Locatio
n kind
</<%$th%>>
<TD>
<% include('/elements/select.html',
'cgi' => $cgi,
'field' => 'location_kind',
<TD>
<% include('/elements/select.html',
'cgi' => $cgi,
'field' => 'location_kind',
+ 'id' => 'location_kind',
'disabled' => $disabled,
'disabled' => $disabled,
- 'style' =>
$style,
+ 'style' =>
\@style,
'options' => \@location_kind_options,
'labels' => $location_kind_labels,
'curr_value' => scalar($cgi->param('location_kind'))
'options' => \@location_kind_options,
'labels' => $location_kind_labels,
'curr_value' => scalar($cgi->param('location_kind'))
@@
-78,7
+79,7
@@
Example:
>
<TR>
>
<TR>
- <<%$th%> ALIGN="right">Unit
Type and
#</<%$th%>>
+ <<%$th%> ALIGN="right">Unit
type and
#</<%$th%>>
<TD COLSPAN=7>
% my $location_type = scalar($cgi->param('location_type'))
<TD COLSPAN=7>
% my $location_type = scalar($cgi->param('location_type'))
@@
-95,8
+96,9
@@
Example:
<% include('/elements/select.html',
'cgi' => $cgi,
'field' => 'location_type',
<% include('/elements/select.html',
'cgi' => $cgi,
'field' => 'location_type',
+ 'id' => 'location_type',
'disabled' => $disabled,
'disabled' => $disabled,
- 'style' =>
$
style,
+ 'style' =>
\@
style,
'options' => [ keys %location_types ],
'labels' => \%location_types,
'curr_value' => $location_type,
'options' => [ keys %location_types ],
'labels' => \%location_types,
'curr_value' => $location_type,
@@
-126,23
+128,17
@@
Example:
% }
<INPUT TYPE="text"
% }
<INPUT TYPE="text"
- NAME
=
"location_number"
- ID
=
"location_number"
- VALUE
=
"<% scalar($cgi->param('location_number')) || $object->get($pre.'location_number') |h %>"
- SIZE
=
"5"
+ NAME
=
"location_number"
+ ID
=
"location_number"
+ VALUE
=
"<% scalar($cgi->param('location_number')) || $object->get($pre.'location_number') |h %>"
+ SIZE
=
"5"
<% $disabled || ($location_type ? '' : 'DISABLED') %>
<% $style %>
>
<% $disabled || ($location_type ? '' : 'DISABLED') %>
<% $style %>
>
-% if ( $object->get($pre.'address2') ) {
-
-% #XXX try to parse first
-% if ( 0 ) {
-% } else {
- Can't parse unit type and number from <B><% $object->get($pre.'address2') |h %></B>
-% }
-
-% }
+% #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/'<B>'.encode_entities($object->get($1.'address2')).'<\/B>'/e;
+ <% $alt_err %>
</TD>
</TD>
@@
-154,13
+150,13
@@
Example:
<TR>
<<%$th%> ALIGN="right"><%$r%>City</<%$th%>>
<TD WIDTH="1"><% include('/elements/city.html', %select_hash) %></TD>
<TR>
<<%$th%> ALIGN="right"><%$r%>City</<%$th%>>
<TD WIDTH="1"><% include('/elements/city.html', %select_hash) %></TD>
- <<%$th%> ALIGN="right" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County</<%$th%>>
- <TD><% include('/elements/select-county.html', %select_hash ) %></TD>
+ <<%$th%> ALIGN="right"
WIDTH="1"
ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County</<%$th%>>
+ <TD
WIDTH="1"
><% include('/elements/select-county.html', %select_hash ) %></TD>
<<%$th%> ALIGN="right" WIDTH="1"><%$r%>State</<%$th%>>
<TD WIDTH="1">
<% include('/elements/select-state.html', %select_hash ) %>
</TD>
<<%$th%> ALIGN="right" WIDTH="1"><%$r%>State</<%$th%>>
<TD WIDTH="1">
<% include('/elements/select-state.html', %select_hash ) %>
</TD>
- <<%$th%>><%$r%>Zip</<%$th%>>
+ <<%$th%>
ALIGN="right" WIDTH="1"
><%$r%>Zip</<%$th%>>
<TD>
<INPUT TYPE = "text"
NAME = "<%$pre%>zip"
<TD>
<INPUT TYPE = "text"
NAME = "<%$pre%>zip"
@@
-217,6
+213,8
@@
$object->set($pre.'state', $statedefault )
unless $object->get($pre.'state')
|| $object->get($pre.'country') ne $countrydefault;
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;
my @style = ();
push @style, 'background-color: #dddddd' if $disabled;