projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prevent Enter from submitting quick payment form, RT13651
[freeside.git]
/
httemplate
/
edit
/
cust_main.cgi
diff --git
a/httemplate/edit/cust_main.cgi
b/httemplate/edit/cust_main.cgi
index
61d92b9
..
2ba40d2
100755
(executable)
--- a/
httemplate/edit/cust_main.cgi
+++ b/
httemplate/edit/cust_main.cgi
@@
-1,23
+1,21
@@
-<
% include('/elements/header.html'
,
+<
& /elements/header.html
,
$title,
'',
' onUnload="myclose()"' #hmm, in billing.html
$title,
'',
' onUnload="myclose()"' #hmm, in billing.html
-
) %
>
+
&
>
-<
% include('/elements/error.html') %
>
+<
& /elements/error.html &
>
<FORM NAME = "CustomerForm"
METHOD = "POST"
ACTION = "<% popurl(1) %>process/cust_main.cgi"
<FORM NAME = "CustomerForm"
METHOD = "POST"
ACTION = "<% popurl(1) %>process/cust_main.cgi"
-%# STYLE = "margin-bottom: 0"
-%# STYLE="margin-top: 0; margin-bottom: 0">
>
<INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>">
<INPUT TYPE="hidden" NAME="prospectnum" VALUE="<% $prospectnum %>">
% if ( $custnum ) {
>
<INPUT TYPE="hidden" NAME="custnum" VALUE="<% $custnum %>">
<INPUT TYPE="hidden" NAME="prospectnum" VALUE="<% $prospectnum %>">
% if ( $custnum ) {
-
Customer #
<B><% $cust_main->display_custnum %></B> -
+
<% mt('Customer #') |h %>
<B><% $cust_main->display_custnum %></B> -
<B><FONT COLOR="#<% $cust_main->statuscolor %>">
<% ucfirst($cust_main->status) %>
</FONT></B>
<B><FONT COLOR="#<% $cust_main->statuscolor %>">
<% ucfirst($cust_main->status) %>
</FONT></B>
@@
-25,12
+23,12
@@
% }
%# agent, agent_custid, refnum (advertising source), referral_custnum
% }
%# agent, agent_custid, refnum (advertising source), referral_custnum
-<
% include('cust_main/top_misc.html', $cust_main, 'custnum' => $custnum ) %
>
+<
& cust_main/top_misc.html, $cust_main, 'custnum' => $custnum &
>
%# birthdate
% if ( $conf->exists('cust_main-enable_birthdate') ) {
<BR>
%# birthdate
% if ( $conf->exists('cust_main-enable_birthdate') ) {
<BR>
- <
% include('cust_main/birthdate.html', $cust_main) %
>
+ <
& cust_main/birthdate.html, $cust_main &
>
% }
%# latitude and longitude
% }
%# latitude and longitude
@@
-60,9
+58,9
@@
% }
<BR>
% }
<BR>
-<FONT SIZE="+1"><B>
Billing address
</B></FONT>
+<FONT SIZE="+1"><B>
<% mt('Billing address') |h %>
</B></FONT>
-<
% include('cust_main/contact.html'
,
+<
& cust_main/contact.html
,
'cust_main' => $cust_main,
'pre' => '',
'onchange' => 'bill_changed(this)',
'cust_main' => $cust_main,
'pre' => '',
'onchange' => 'bill_changed(this)',
@@
-70,8
+68,7
@@
'ss' => $ss,
'stateid' => $stateid,
'same_checked' => $same_checked, #for address2 "Unit #" labeling
'ss' => $ss,
'stateid' => $stateid,
'same_checked' => $same_checked, #for address2 "Unit #" labeling
- )
-%>
+&>
<SCRIPT>
function bill_changed(what) {
<SCRIPT>
function bill_changed(what) {
@@
-138,29
+135,27
@@
function samechanged(what) {
</SCRIPT>
<BR>
</SCRIPT>
<BR>
-<FONT SIZE="+1"><B>
Service address
</B></FONT>
+<FONT SIZE="+1"><B>
<% mt('Service address') |h %>
</B></FONT>
-(<INPUT TYPE="checkbox" NAME="same" VALUE="Y" onClick="samechanged(this)" <%$same_checked%>>
same as billing address
)
-<
% include('cust_main/contact.html'
,
+(<INPUT TYPE="checkbox" NAME="same" VALUE="Y" onClick="samechanged(this)" <%$same_checked%>>
<% mt('same as billing address') |h %>
)
+<
& cust_main/contact.html
,
'cust_main' => $cust_main,
'pre' => 'ship_',
'onchange' => '',
'disabled' => $ship_disabled,
'style' => \@ship_style
'cust_main' => $cust_main,
'pre' => 'ship_',
'onchange' => '',
'disabled' => $ship_disabled,
'style' => \@ship_style
- )
-%>
+&>
%# billing info
%# billing info
-<
% include( 'cust_main/billing.html'
, $cust_main,
+<
& cust_main/billing.html
, $cust_main,
'payinfo' => $payinfo,
'invoicing_list' => \@invoicing_list,
'payinfo' => $payinfo,
'invoicing_list' => \@invoicing_list,
- )
-%>
+&>
% my $ro_comments = $conf->exists('cust_main-use_comments')?'':'readonly';
% if (!$ro_comments || $cust_main->comments) {
% my $ro_comments = $conf->exists('cust_main-use_comments')?'':'readonly';
% if (!$ro_comments || $cust_main->comments) {
- <BR>
Comments
+ <BR>
<% mt('Comments') |h %>
<% &ntable("#cccccc") %>
<TR>
<TD>
<% &ntable("#cccccc") %>
<TR>
<TD>
@@
-178,19
+173,17
@@
function samechanged(what) {
% unless ( $custnum ) {
% unless ( $custnum ) {
- <
% include('cust_main/first_pkg.html'
, $cust_main,
+ <
& cust_main/first_pkg.html
, $cust_main,
'pkgpart_svcpart' => $pkgpart_svcpart,
'disable_empty' =>
scalar( $cgi->param('lock_pkgpart') =~ /^(\d+)$/ ),
'pkgpart_svcpart' => $pkgpart_svcpart,
'disable_empty' =>
scalar( $cgi->param('lock_pkgpart') =~ /^(\d+)$/ ),
- #svc_acct
'username' => $username,
'password' => $password,
'popnum' => $popnum,
'saved_domsvc' => $saved_domsvc,
%svc_phone,
%svc_dsl,
'username' => $username,
'password' => $password,
'popnum' => $popnum,
'saved_domsvc' => $saved_domsvc,
%svc_phone,
%svc_dsl,
- )
- %>
+ &>
% }
% }
@@
-201,7
+194,7
@@
function samechanged(what) {
%# cust_main/bottomfixup.js
% foreach my $hidden (
% 'payauto',
%# cust_main/bottomfixup.js
% foreach my $hidden (
% 'payauto',
-% 'payinfo', 'payinfo1', 'payinfo2', 'paytype',
+% 'payinfo', 'payinfo1', 'payinfo2', 'pay
info3', 'pay
type',
% 'payname', 'paystate', 'exp_month', 'exp_year', 'paycvv',
% 'paystart_month', 'paystart_year', 'payissue',
% 'payip',
% 'payname', 'paystate', 'exp_month', 'exp_year', 'paycvv',
% 'paystart_month', 'paystart_year', 'payissue',
% 'payip',
@@
-210,18
+203,18
@@
function samechanged(what) {
<INPUT TYPE="hidden" NAME="<% $hidden %>" VALUE="">
% }
<INPUT TYPE="hidden" NAME="<% $hidden %>" VALUE="">
% }
-<
% include('cust_main/bottomfixup.html') %
>
+<
& cust_main/bottomfixup.html &
>
<BR>
<INPUT TYPE = "button"
NAME = "submitButton"
ID = "submitButton"
<BR>
<INPUT TYPE = "button"
NAME = "submitButton"
ID = "submitButton"
- VALUE = "<% $custnum ?
"Apply Changes" : "Add Customer"
%>"
+ VALUE = "<% $custnum ?
emt("Apply changes") : emt("Add Customer")
%>"
onClick = "this.disabled=true; bottomfixup(this.form);"
>
</FORM>
onClick = "this.disabled=true; bottomfixup(this.form);"
>
</FORM>
-<
% include('/elements/footer.html') %
>
+<
& /elements/footer.html &
>
<%init>
<%init>
@@
-315,6
+308,8
@@
if ( $cgi->param('error') ) {
$custnum='';
$cust_main = new FS::cust_main ( {} );
$custnum='';
$cust_main = new FS::cust_main ( {} );
+ $cust_main->agentnum( $conf->config('default_agentnum') )
+ if $conf->exists('default_agentnum');
$cust_main->otaker( &getotaker );
$cust_main->referral_custnum( $cgi->param('referral_custnum') );
@invoicing_list = ();
$cust_main->otaker( &getotaker );
$cust_main->referral_custnum( $cgi->param('referral_custnum') );
@invoicing_list = ();
@@
-373,6
+368,7
@@
my %keep = map { $_=>1 } qw( error tagnum lock_agentnum lock_pkgpart );
$cgi->delete( grep !$keep{$_}, $cgi->param );
my $title = $custnum ? 'Edit Customer' : 'Add Customer';
$cgi->delete( grep !$keep{$_}, $cgi->param );
my $title = $custnum ? 'Edit Customer' : 'Add Customer';
+$title = mt($title);
$title .= ": ". $cust_main->name if $custnum;
my $r = qq!<font color="#ff0000">*</font> !;
$title .= ": ". $cust_main->name if $custnum;
my $r = qq!<font color="#ff0000">*</font> !;