diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/edit/cust_main/contact.html | 32 | ||||
| -rwxr-xr-x | httemplate/edit/process/cust_main.cgi | 6 | ||||
| -rw-r--r-- | httemplate/view/cust_main/contacts.html | 16 |
3 files changed, 50 insertions, 4 deletions
diff --git a/httemplate/edit/cust_main/contact.html b/httemplate/edit/cust_main/contact.html index e813986cd..024222d3a 100644 --- a/httemplate/edit/cust_main/contact.html +++ b/httemplate/edit/cust_main/contact.html @@ -9,10 +9,10 @@ % if ( $conf->exists('show_ss') && !$pre ) { <TD ALIGN="right">SS#</TD> - <TD><INPUT TYPE="text" NAME="ss" VALUE="<% $cust_main->ss %>" SIZE=11></TD> + <TD><INPUT TYPE="text" NAME="ss" VALUE="<% $opt{ss} %>" SIZE=11></TD> % } elsif ( !$pre ) { - <TD><INPUT TYPE="hidden" NAME="ss" VALUE="<% $cust_main->ss %>"></TD> + <TD><INPUT TYPE="hidden" NAME="ss" VALUE="<% $opt{ss} %>"></TD> % } @@ -84,14 +84,35 @@ </TD> </TR> +% if ( $conf->exists('show_stateid') && !$pre ) { + +<TR> + <TD ALIGN="right"><% $stateid_label %></TD> + <TD><INPUT TYPE="text" NAME="stateid" VALUE="<% $opt{stateid} %>" SIZE=12 onChange="<% $onchange %>" <% $disabled %>></TD> + <TD ALIGN="right"><% $stateid_state_label %></TD> + <TD><% include('select-state.html', 'state' => $cust_main->stateid_state, + 'country' => $cust_main->country, + 'prefix' => 'stateid_', + 'onchange' => $onchange, + 'disabled' => $disabled) %></TD> +</TR> +% } elsif (!$pre) { + <TD><INPUT TYPE="hidden" NAME="stateid" VALUE="<% $opt{stateid} %>"></TD> + <TD><INPUT TYPE="hidden" NAME="stateid_state" VALUE="<% $cust_main->stateid_state %>"></TD> +% } + </TABLE> <%$r%>required fields<BR> <%init> -my( $cust_main, $pre, $onchange, $disabled ) = @_; +my( $cust_main, $pre, $onchange, $disabled, %opt ) = @_; my $conf = new FS::Conf; +foreach (qw(ss stateid)) { + $opt{$_} = $cust_main->masked($_) unless exists $opt{$_}; +} + #false laziness with ship state my $countrydefault = $conf->config('countrydefault') || 'US'; $cust_main->set($pre.'country', $countrydefault ) @@ -103,6 +124,9 @@ $cust_main->set($pre.'state', $statedefault ) unless $cust_main->get($pre.'state') || $cust_main->get($pre.'country') ne $countrydefault; +$cust_main->set('stateid_state', $cust_main->state ) + unless $pre || $cust_main->get('stateid_state'); + #my($county_html, $state_html, $country_html) = # FS::cust_main_county::regionselector( $cust_main->get($pre.'county'), # $cust_main->get($pre.'state'), @@ -128,6 +152,8 @@ my $county_style = scalar(@counties) > 1 ? '' : 'STYLE="visibility:hidden"'; my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day Phone'; my $night_label = FS::Msgcat::_gettext('night') || 'Night Phone'; +my $stateid_label = FS::Msgcat::_gettext('stateid') || 'Driver’s License'; +my $stateid_state_label = FS::Msgcat::_gettext('stateid_state') || 'Driver’s License State'; my $r = qq!<font color="#ff0000">*</font> !; diff --git a/httemplate/edit/process/cust_main.cgi b/httemplate/edit/process/cust_main.cgi index a4a70ca22..b270fc661 100755 --- a/httemplate/edit/process/cust_main.cgi +++ b/httemplate/edit/process/cust_main.cgi @@ -161,6 +161,12 @@ % && $new->paycvv =~ /^\s*\*+\s*$/ ) { % $new->paycvv($old->paycvv); % } +% if ($new->ss =~ /xx/) { +% $new->ss($old->ss); +% } +% if ($new->stateid =~ /^xxx/) { +% $new->stateid($old->stateid); +% } % if ($new->payby =~ /^(CARD|DCRD|CHEK|DCHK)$/ && $new->payinfo =~ /xx/) { % $new->payinfo($old->payinfo); % } diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html index d5788c9a4..0a0ba24ff 100644 --- a/httemplate/view/cust_main/contacts.html +++ b/httemplate/view/cust_main/contacts.html @@ -14,7 +14,7 @@ </TD> % if ( $which eq '' && $conf->exists('show_ss') ) { <TD ALIGN="right">SS#</TD> - <TD BGCOLOR="#ffffff"><% $cust_main->ss || ' ' %></TD> + <TD BGCOLOR="#ffffff"><% $cust_main->masked('ss') || ' ' %></TD> % } </TR> <TR> @@ -75,6 +75,14 @@ <% $cust_main->get("${pre}fax") || ' ' %> </TD> </TR> +% if ( $which eq '' && $conf->exists('show_stateid') ) { +<TR> + <TD ALIGN="right"><% $stateid_label %></TD> + <TD BGCOLOR="#ffffff"><% $cust_main->masked('stateid') || ' ' %></TD> + <TD ALIGN="right"><% $stateid_state_label %><\TD> + <TD BGCOLOR="#ffffff"><% $cust_main->stateid_state || ' ' %></TD> +</TR> +% } </TABLE></TD></TR></TABLE> % if ( $which ne 'ship_' ) { <BR> @@ -89,6 +97,12 @@ my $daytime_label = FS::Msgcat::_gettext('daytime') =~ /^(daytime)?$/ my $night_label = FS::Msgcat::_gettext('night') =~ /^(night)?$/ ? 'Night Phone' : FS::Msgcat::_gettext('night'); +my $stateid_label = FS::Msgcat::_gettext('stateid') =~ /^(stateid)?$/ + ? 'Driver’s License' + : FS::Msgcat::_gettext('stateid'); +my $stateid_state_label = FS::Msgcat::_gettext('stateid_state') =~ /^(stateid_state)?$/ + ? 'Driver’s License State' + : FS::Msgcat::_gettext('stateid_state'); </%once> <%init> |