projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
optionally scale to the page width when printing, #71301
[freeside.git]
/
httemplate
/
edit
/
cust_main.cgi
diff --git
a/httemplate/edit/cust_main.cgi
b/httemplate/edit/cust_main.cgi
index
b6f6b0d
..
39cddc0
100755
(executable)
--- a/
httemplate/edit/cust_main.cgi
+++ b/
httemplate/edit/cust_main.cgi
@@
-40,7
+40,7
@@
% }
<BR>
<TABLE> <TR>
% }
<BR>
<TABLE> <TR>
- <TD
STYLE="width:650px"
>
+ <TD>
%#; padding-right:2px; vertical-align:top">
<FONT CLASS="fsinnerbox-title"><% mt('Billing address') |h %></FONT>
<TABLE CLASS="fsinnerbox" WIDTH="100%">
%#; padding-right:2px; vertical-align:top">
<FONT CLASS="fsinnerbox-title"><% mt('Billing address') |h %></FONT>
<TABLE CLASS="fsinnerbox" WIDTH="100%">
@@
-58,7
+58,7
@@
</TR>
<TR><TD STYLE="height:14px"></TD></TR>
<TR>
</TR>
<TR><TD STYLE="height:14px"></TD></TR>
<TR>
- <TD
STYLE="width:650px"
>
+ <TD>
<FONT CLASS="fsinnerbox-title"><% mt('Service address') |h %></FONT>
<INPUT TYPE="checkbox"
NAME="same"
<FONT CLASS="fsinnerbox-title"><% mt('Service address') |h %></FONT>
<INPUT TYPE="checkbox"
NAME="same"
@@
-68,8
+68,8
@@
VALUE="Y"
<% $has_ship_address ? '' : 'CHECKED' %>
><% mt('same as billing address') |h %>
VALUE="Y"
<% $has_ship_address ? '' : 'CHECKED' %>
><% mt('same as billing address') |h %>
- <DIV
CLASS="fsinnerbox
">
- <TABLE
ID="table_ship_location" WIDTH="100%
">
+ <DIV
ID="div_ship_location
">
+ <TABLE
WIDTH="100%" CLASS="fsinnerbox
">
<& cust_main/before_ship_location.html, $cust_main &>
<& /elements/location.html,
object => $cust_main->ship_location,
<& cust_main/before_ship_location.html, $cust_main &>
<& /elements/location.html,
object => $cust_main->ship_location,
@@
-80,13
+80,12
@@
&>
% unless ($conf->exists('invoice-ship_address')) { #it's always on, so hide per-cust config
<TR>
&>
% unless ($conf->exists('invoice-ship_address')) { #it's always on, so hide per-cust config
<TR>
- <TD> </TD>
- <TD COLSPAN="7">
+ <TD COLSPAN="8">
<% include('/elements/checkbox.html',
'field' => 'invoice_ship_address',
'value' => 'Y',
'curr_value' => $cust_main->invoice_ship_address,
<% include('/elements/checkbox.html',
'field' => 'invoice_ship_address',
'value' => 'Y',
'curr_value' => $cust_main->invoice_ship_address,
- 'postfix' => emt('
included
on invoices'),
+ 'postfix' => emt('
Include service address
on invoices'),
) %>
</TD>
</TR>
) %>
</TD>
</TR>
@@
-96,29
+95,26
@@
</TD>
</TR></TABLE>
</TD>
</TR></TABLE>
-<SCRIPT>
+<SCRIPT TYPE="text/javascript">
+
function samechanged(what) {
function samechanged(what) {
-%# not display = 'none', because we still want it to take up space
-%# document.getElementById('table_ship_location').style.visibility =
-%# what.checked ? 'hidden' : 'visible';
- var t1 = document.getElementById('table_ship_location');
if ( what.checked ) {
if ( what.checked ) {
- t1.style.visibility = 'hidden';
- }
- else {
- t1.style.visibility = 'visible'
+ $('#div_ship_location').slideUp();
+ } else {
+ $('#div_ship_location').slideDown();
}
}
}
}
-//samechanged(document.getElementById('same'));
-</SCRIPT>
-<BR>
+% if ( ! $has_ship_address ) {
+ $('#div_ship_location').hide();
+% }
+
+</SCRIPT>
<& cust_main/contacts_new.html, 'cust_main'=>$cust_main, &>
%# billing info
<& cust_main/billing.html, $cust_main,
<& cust_main/contacts_new.html, 'cust_main'=>$cust_main, &>
%# billing info
<& cust_main/billing.html, $cust_main,
- 'payinfo' => $payinfo,
'invoicing_list' => \@invoicing_list,
&>
'invoicing_list' => \@invoicing_list,
&>
@@
-189,7
+185,7
@@
my $conf = new FS::Conf;
#get record
#get record
-my($custnum, $cust_main, $ss, $stateid,
$payinfo,
@invoicing_list);
+my($custnum, $cust_main, $ss, $stateid, @invoicing_list);
my $pkgpart_svcpart = ''; #first_pkg
my($username, $password, $popnum, $saved_domsvc) = ( '', '', 0, 0 ); #svc_acct
my %svc_phone = ();
my $pkgpart_svcpart = ''; #first_pkg
my($username, $password, $popnum, $saved_domsvc) = ( '', '', 0, 0 ); #svc_acct
my %svc_phone = ();
@@
-237,7
+233,6
@@
if ( $cgi->param('error') ) {
$cust_main->setfield('paid' => $cgi->param('paid')) if $cgi->param('paid');
$ss = $cust_main->ss; # don't mask an entered value on errors
$stateid = $cust_main->stateid; # don't mask an entered value on errors
$cust_main->setfield('paid' => $cgi->param('paid')) if $cgi->param('paid');
$ss = $cust_main->ss; # don't mask an entered value on errors
$stateid = $cust_main->stateid; # don't mask an entered value on errors
- $payinfo = $cust_main->payinfo; # don't mask an entered value on errors
$cust_main->national_id( $cgi->param('national_id1') || $cgi->param('national_id2') );
$cust_main->national_id( $cgi->param('national_id1') || $cgi->param('national_id2') );
@@
-285,7
+280,6
@@
if ( $cgi->param('error') ) {
@invoicing_list = $cust_main->invoicing_list;
$ss = $conf->exists('unmask_ss') ? $cust_main->ss : $cust_main->masked('ss');
$stateid = $cust_main->masked('stateid');
@invoicing_list = $cust_main->invoicing_list;
$ss = $conf->exists('unmask_ss') ? $cust_main->ss : $cust_main->masked('ss');
$stateid = $cust_main->masked('stateid');
- $payinfo = $cust_main->paymask;
} else { #new customer
} else { #new customer
@@
-297,12
+291,10
@@
if ( $cgi->param('error') ) {
$cust_main->agentnum( $conf->config('default_agentnum') )
if $conf->exists('default_agentnum');
$cust_main->referral_custnum( $cgi->param('referral_custnum') );
$cust_main->agentnum( $conf->config('default_agentnum') )
if $conf->exists('default_agentnum');
$cust_main->referral_custnum( $cgi->param('referral_custnum') );
- @invoicing_list = ();
- push @invoicing_list, 'POST'
+ $cust_main->set('postal_invoice', 'Y')
unless $conf->exists('disablepostalinvoicedefault');
$ss = '';
$stateid = '';
unless $conf->exists('disablepostalinvoicedefault');
$ss = '';
$stateid = '';
- $payinfo = '';
$cgi->param('tagnum', FS::part_tag->default_tags);
$cgi->param('tagnum', FS::part_tag->default_tags);