X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main.cgi;h=39cddc02198c0cd3f19924ffd79faa92775ae7aa;hb=a16891c16e0ddd389b32963b638cdfeadf86c447;hp=069414b11779a9a24ce1c90694a7eb77a39bb5a6;hpb=99fa7a9f3c628a9a63983cafa131df9b331d30d6;p=freeside.git

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 069414b11..39cddc021 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -68,8 +68,8 @@
            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,
@@ -95,29 +95,26 @@
   </TD>
 </TR></TABLE>
 
-<SCRIPT>
+<SCRIPT TYPE="text/javascript">
+
 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 ) {
-    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,
-               'payinfo'        => $payinfo,
                'invoicing_list' => \@invoicing_list,
 &>
 
@@ -188,7 +185,7 @@ my $conf = new FS::Conf;
 
 #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 = ();
@@ -236,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
-  $payinfo = $cust_main->payinfo; # don't mask an entered value on errors
 
   $cust_main->national_id( $cgi->param('national_id1') || $cgi->param('national_id2') );
 
@@ -284,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');
-  $payinfo = $cust_main->paymask;
 
 } else { #new customer
 
@@ -296,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') );
-  @invoicing_list = ();
-  push @invoicing_list, 'POST'
+  $cust_main->set('postal_invoice', 'Y')
     unless $conf->exists('disablepostalinvoicedefault');
   $ss = '';
   $stateid = '';
-  $payinfo = '';
 
   $cgi->param('tagnum', FS::part_tag->default_tags);