projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
fs_selfservice
/
FS-SelfService
/
cgi
/
contact.html
diff --git
a/fs_selfservice/FS-SelfService/cgi/contact.html
b/fs_selfservice/FS-SelfService/cgi/contact.html
index
20c15df
..
798af70
100644
(file)
--- a/
fs_selfservice/FS-SelfService/cgi/contact.html
+++ b/
fs_selfservice/FS-SelfService/cgi/contact.html
@@
-3,22
+3,22
@@
<TR>
<TH ALIGN="right"><%=$r%>Contact name<BR>(last, first)</TH>
<TD COLSPAN=5>
<TR>
<TH ALIGN="right"><%=$r%>Contact name<BR>(last, first)</TH>
<TD COLSPAN=5>
- <INPUT TYPE="text" NAME="<%=$pre%>last" VALUE="<%=
${$pre.'last'}
%>" onChange="<%= $onchange %>" <%=$disabled%>> ,
- <INPUT TYPE="text" NAME="<%=$pre%>first" VALUE="<%=
${$pre.'first'}
%>" onChange="<%= $onchange %>" <%=$disabled%>>
+ <INPUT TYPE="text" NAME="<%=$pre%>last" VALUE="<%=
encode_entities(${$pre.'last'})
%>" onChange="<%= $onchange %>" <%=$disabled%>> ,
+ <INPUT TYPE="text" NAME="<%=$pre%>first" VALUE="<%=
encode_entities(${$pre.'first'})
%>" onChange="<%= $onchange %>" <%=$disabled%>>
</TD>
</TR>
<TR>
<TD ALIGN="right">Company</TD>
<TD COLSPAN=7>
</TD>
</TR>
<TR>
<TD ALIGN="right">Company</TD>
<TD COLSPAN=7>
- <INPUT TYPE="text" NAME="<%=$pre%>company" VALUE="<%=
${$pre.'company'}
%>" SIZE=70 onChange="<%= $onchange %>" <%=$disabled%>>
+ <INPUT TYPE="text" NAME="<%=$pre%>company" VALUE="<%=
encode_entities(${$pre.'company'})
%>" SIZE=70 onChange="<%= $onchange %>" <%=$disabled%>>
</TD>
</TR>
<TR>
<TH ALIGN="right"><%=$r%>Address</TH>
<TD COLSPAN=7>
</TD>
</TR>
<TR>
<TH ALIGN="right"><%=$r%>Address</TH>
<TD COLSPAN=7>
- <INPUT TYPE="text" NAME="<%=$pre%>address1" VALUE="<%=
${$pre.'address1'}
%>" SIZE=70 onChange="<%= $onchange %>" <%=$disabled%>>
+ <INPUT TYPE="text" NAME="<%=$pre%>address1" VALUE="<%=
encode_entities(${$pre.'address1'})
%>" SIZE=70 onChange="<%= $onchange %>" <%=$disabled%>>
</TD>
</TR>
</TD>
</TR>
@@
-37,19
+37,16
@@
%>
</TD>
<TD COLSPAN=7>
%>
</TD>
<TD COLSPAN=7>
- <INPUT TYPE="text" NAME="<%=$pre%>address2" VALUE="<%=
${$pre.'address2'}
%>" SIZE=70 onChange="<%= $onchange %>" <%=$disabled%>>
+ <INPUT TYPE="text" NAME="<%=$pre%>address2" VALUE="<%=
encode_entities(${$pre.'address2'})
%>" SIZE=70 onChange="<%= $onchange %>" <%=$disabled%>>
</TD>
</TR>
<TR>
</TD>
</TR>
<TR>
- <TH ALIGN="right"><%=$r%>City</TH>
- <TD>
- <INPUT TYPE="text" ID="<%=$pre%>city" NAME="<%=$pre%>city" VALUE="<%= ${$pre.'city'} %>" onChange="<%= $onchange %>" <%=$disabled%>>
- </TD>
<%=
<%=
- ($county_html, $state_html, $country_html
) =
+ ($county_html, $state_html, $country_html
, $city_html) =
FS::SelfService::regionselector( {
prefix => $pre,
FS::SelfService::regionselector( {
prefix => $pre,
+ selected_city => ${$pre.'city'},
selected_county => ${$pre.'county'},
selected_state => ${$pre.'state'},
selected_country => ${$pre.'country'},
selected_county => ${$pre.'county'},
selected_state => ${$pre.'state'},
selected_country => ${$pre.'country'},
@@
-58,6
+55,8
@@
locales => \@cust_main_county,
} );
locales => \@cust_main_county,
} );
+ $OUT .= qq!<TH ALIGN="right">${r}City</TH>!;
+ $OUT .= qq!<TD>$city_html</TD>!;
$OUT .= qq!<TH ALIGN="right">${r}State/County</TH>!;
$OUT .= qq!<TD>$county_html $state_html</TD>!;
$OUT .= qq!<TH>${r}Zip</TH>!;
$OUT .= qq!<TH ALIGN="right">${r}State/County</TH>!;
$OUT .= qq!<TD>$county_html $state_html</TD>!;
$OUT .= qq!<TH>${r}Zip</TH>!;
@@
-73,7
+72,7
@@
<%=
if ( $disabled ) {
$OUT .= qq!var what = document.getElementById("${pre}city");!;
<%=
if ( $disabled ) {
$OUT .= qq!var what = document.getElementById("${pre}city");!;
- for (qw( county state country ) ) {
+ for (qw( c
ity c
ounty state country ) ) {
$OUT .= "what.form.$pre$_.disabled = true;";
$OUT .= "what.form.$pre$_.style.backgroundColor = '#dddddd';";
}
$OUT .= "what.form.$pre$_.disabled = true;";
$OUT .= "what.form.$pre$_.style.backgroundColor = '#dddddd';";
}