add svc_phone on new customer first package, RT#4315

1 files changed, 91 insertions, 584 deletions

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index 098de848e..7308c72da 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -1,14 +1,18 @@
 <% include('/elements/header.html',
       "Customer $action",
       '',
-      ' onUnload="myclose()"'
+      ' onUnload="myclose()"' #hmm, in billing.html
 ) %>
 
-<% include('/elements/init_overlib.html') %>
-
 <% include('/elements/error.html') %>
 
-<FORM NAME="topform" STYLE="margin-bottom: 0">
+<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 %>">
 
 % if ( $custnum ) { 
@@ -19,101 +23,16 @@
   <BR><BR>
 % } 
 
-<% &ntable("#cccccc") %>
-
-%# agent
-<% include('/elements/tr-select-agent.html', 
-              'curr_value'    => $cust_main->agentnum,
-              'label'         => "<B>${r}Agent</B>",
-              'empty_label'   => 'Select agent',
-              'disable_empty' => ( $cust_main->agentnum ? 1 : 0 ),
-           )
-%>
-
-%# agent_custid
-% if ( $conf->exists('cust_main-edit_agent_custid') ) {
-
-    <TR>
-      <TD ALIGN="right">Customer identifier</TD>
-      <TD><INPUT TYPE="text" NAME="agent_custid" VALUE="<% $cust_main->agent_custid %>"></TD>
-    </TR>
-
-% } else {
-
-    <INPUT TYPE="hidden" NAME="agent_custid" VALUE="<% $cust_main->agent_custid %>">
-
-% }
-
-%# referral (advertising source)
-%my $refnum = $cust_main->refnum || $conf->config('referraldefault') || 0;
-%if ( $custnum && ! $conf->exists('editreferrals') ) {
-
-  <INPUT TYPE="hidden" NAME="refnum" VALUE="<% $refnum %>">
-
-% } else { 
-
-   <% include('/elements/tr-select-part_referral.html',
-                'curr_value' => $refnum
-             )
-   %>
-% } 
-
-
-%# referring customer
-%my $referring_cust_main = '';
-%if ( $cust_main->referral_custnum
-%     and $referring_cust_main =
-%           qsearchs('cust_main', { custnum => $cust_main->referral_custnum } )
-%) {
-
-  <TR>
-    <TD ALIGN="right">Referring customer</TD>
-    <TD>
-      <A HREF="<% popurl(1) %>/cust_main.cgi?<% $cust_main->referral_custnum %>"><% $cust_main->referral_custnum %>: <% $referring_cust_main->name %></A>
-    </TD>
-  </TR>
-  <INPUT TYPE="hidden" NAME="referral_custnum" VALUE="<% $cust_main->referral_custnum %>">
-% } elsif ( ! $conf->exists('disable_customer_referrals') ) { 
-
-
-  <TR>
-    <TD ALIGN="right">Referring customer</TD>
-    <TD>
-      <!-- <INPUT TYPE="text" NAME="referral_custnum" VALUE=""> -->
-      <% include('/elements/search-cust_main.html',
-                    'field_name' => 'referral_custnum',
-                 )
-      %>
-    </TD>
-  </TR>
-% } else { 
-
-
-  <INPUT TYPE="hidden" NAME="referral_custnum" VALUE="">
-% } 
-
-
-</TABLE>
-
-<!-- birthdate -->
+%# agent, agent_custid, refnum (advertising source), referral_custnum
+<% include('cust_main/top_misc.html', $cust_main, 'custnum' => $custnum ) %>
 
+%# birthdate
 % if ( $conf->exists('cust_main-enable_birthdate') ) {
-
   <BR>
-  <% ntable("#cccccc", 2) %>
-  <% include ('/elements/tr-input-date-field.html',
-              'birthdate',
-              $cust_main->birthdate,
-              'Date of Birth',
-              $conf->config('date_format') || "%m/%d/%Y",
-              1)
-  %>
-
-  </TABLE>
-
+  <% include('cust_main/birthdate.html', $cust_main) %>
 % }
 
-<!-- contact info -->
+%# contact info
 
 %  my $same_checked = '';
 %  my $ship_disabled = '';
@@ -129,7 +48,8 @@
 %  }
 
 <BR><BR>
-Billing address
+<FONT SIZE="+1"><B>Billing address</B></FONT>
+
 <% include('cust_main/contact.html',
              'cust_main'    => $cust_main,
              'pre'          => '',
@@ -199,7 +119,8 @@ function samechanged(what) {
 </SCRIPT>
 
 <BR>
-Service address 
+<FONT SIZE="+1"><B>Service address</B></FONT>
+
 (<INPUT TYPE="checkbox" NAME="same" VALUE="Y" onClick="samechanged(this)" <%$same_checked%>>same as billing address)
 <% include('cust_main/contact.html',
              'cust_main' => $cust_main,
@@ -209,473 +130,69 @@ Service address
           )
 %>
 
-
-<!-- billing info -->
-
+%# billing info
 <% include( 'cust_main/billing.html', $cust_main,
                'payinfo'        => $payinfo,
                'invoicing_list' => \@invoicing_list,
            )
 %>
 
-<% include( '/elements/xmlhttp.html',
-              'url'  => $p.'misc/xmlhttp-cust_main-address_standardize.html',
-              'subs' => [ 'address_standardize' ],
-              #'method' => 'POST', #could get too long?
-          )
-%>
-
-<SCRIPT>
-function bottomfixup(what) {
-
-  //i don't think we need to copy things between two forms anymore, modern
-  //browsers are fine with DIVs inside FORMs
-
-  var topvars = new Array(
-    'birthdate',
-
-    'custnum', 'agentnum', 'agent_custid', 'refnum', 'referral_custnum',
-
-    'last', 'first', 'ss', 'company',
-    'address1', 'address2', 'city',
-    'county', 'state', 'zip', 'country',
-    'daytime', 'night', 'fax',
-    'stateid', 'stateid_state',
-
-    'same',
-
-    'ship_last', 'ship_first', 'ship_company',
-    'ship_address1', 'ship_address2', 'ship_city',
-    'ship_county', 'ship_state', 'ship_zip', 'ship_country',
-    'ship_daytime','ship_night', 'ship_fax',
-
-    'geocode',
-
-    'select' // XXX key
-  );
-
-  var layervars = new Array(
-    'payauto',
-    'payinfo', 'payinfo1', 'payinfo2', 'paytype',
-    'payname', 'paystate', 'exp_month', 'exp_year', 'paycvv',
-    'paystart_month', 'paystart_year', 'payissue',
-    'payip',
-    'paid'
-  );
-
-  var billing_bottomvars = new Array(
-    'tax',
-    'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX',
-    'invoice_terms',
-    'spool_cdr',
-    'squelch_cdr'
-  );
-
-  for ( f=0; f < topvars.length; f++ ) {
-    var field = topvars[f];
-    copyelement( document.topform.elements[field],
-                 document.bottomform.elements[field]
-               );
-  }
-
-  var layerform = document.topform.select.options[document.topform.select.selectedIndex].value;
-  for ( f=0; f < layervars.length; f++ ) {
-    var field = layervars[f];
-    copyelement( document.forms[layerform].elements[field],
-                 document.bottomform.elements[field]
-               );
-  }
-
-  for ( f=0; f < billing_bottomvars.length; f++ ) {
-    var field = billing_bottomvars[f];
-    copyelement( document.billing_bottomform.elements[field],
-                 document.bottomform.elements[field]
-               );
-  }
-
-  //this part does USPS address correction
-
-  // XXX should this be first and should we update the form fields that are
-  // displayed???
-
-  //var state_el = document.bottomform.elements['state'];
-
-  //address_standardize(
-  var cust_main = new Array(
-    'company',  document.bottomform.elements['company'].value,
-    'address1', document.bottomform.elements['address1'].value,
-    'address2', document.bottomform.elements['address2'].value,
-    'city',     document.bottomform.elements['city'].value,
-    'state',    document.bottomform.elements['state'].value,
-    //'state',    state_el.options[ state_el.selectedIndex ].value,
-    'zip',      document.bottomform.elements['zip'].value,
-
-    'ship_company',  document.bottomform.elements['ship_company'].value,
-    'ship_address1', document.bottomform.elements['ship_address1'].value,
-    'ship_address2', document.bottomform.elements['ship_address2'].value,
-    'ship_city',     document.bottomform.elements['ship_city'].value,
-    'ship_state',    document.bottomform.elements['ship_state'].value,
-    //'ship_state',    state_el.options[ state_el.selectedIndex ].value,
-    'ship_zip',      document.bottomform.elements['ship_zip'].value
-  );
-
-  address_standardize( cust_main, update_address );
-
-}
-
-var standardize_address;
-
-function update_address(arg) {
-
-  var argsHash = eval('(' + arg + ')');
-
-  var changed  = argsHash['address_standardized'];
-  var ship_changed = argsHash['ship_address_standardized'];
-  var error = argsHash['error'];
-  var ship_error = argsHash['ship_error'];
-
-  //yay closures
-  standardize_address = function () {
-
-    if ( changed ) {
-      document.bottomform.elements['company'].value = argsHash['new_company'];
-      document.bottomform.elements['address1'].value = argsHash['new_address1'];
-      document.bottomform.elements['address2'].value = argsHash['new_address2'];
-      document.bottomform.elements['city'].value = argsHash['new_city'];
-      document.bottomform.elements['state'].value = argsHash['new_state'];
-  //'state',    state_el.options[ state_el.selectedIndex ].value,
-      document.bottomform.elements['zip'].value = argsHash['new_zip'];
-    }
-
-    if ( ship_changed ) {
-      document.bottomform.elements['ship_company'].value = argsHash['new_ship_company'];
-      document.bottomform.elements['ship_address1'].value = argsHash['new_ship_address1'];
-      document.bottomform.elements['ship_address2'].value = argsHash['new_ship_address2'];
-      document.bottomform.elements['ship_city'].value = argsHash['new_ship_city'];
-      document.bottomform.elements['ship_state'].value = argsHash['new_ship_state'];
-  //'state',    state_el.options[ state_el.selectedIndex ].value,
-      document.bottomform.elements['ship_zip'].value = argsHash['new_ship_zip'];
-    }
-
-  }
-
-% if ( $conf->exists('enable_taxproducts') ) {
-
-  if ( <% $taxpre %>error ) {
-
-    if ( document.bottomform.elements['<% $taxpre %>country'].value == 'CA' ||
-         document.bottomform.elements['<% $taxpre %>country'].value == 'US'
-       )
-    {
-
-      var url = "cust_main/choose_tax_location.html?data_vendor=cch-zip;city="+document.bottomform.elements['<% $taxpre %>city'].value+";state="+document.bottomform.elements['<% $taxpre %>state'].value+";zip="+document.bottomform.elements['<% $taxpre %>zip'].value+";country="+document.bottomform.elements['<% $taxpre %>country'].value+";";
-      // popup a chooser
-      OLgetAJAX( url, update_geocode, 300 );
-
-    } else {
-
-      document.bottomform.elements['geocode'].value = 'DEFAULT';
-      document.bottomform.submit();
-
-    }
+% my $ro_comments = $conf->exists('cust_main-use_comments')?'':'readonly';
+% if (!$ro_comments || $cust_main->comments) {
 
-  } else
+    <BR>Comments
+    <% &ntable("#cccccc") %>
+      <TR>
+        <TD>
+          <TEXTAREA NAME = "comments"
+                    COLS = 80
+                    ROWS = 5
+                    WRAP = "HARD"
+                    <% $ro_comments %>
+          ><% $cust_main->comments %></TEXTAREA>
+        </TD>
+      </TR>
+    </TABLE>
 
 % }
 
-  if ( changed || ship_changed ) {
-
-%   if ( $conf->exists('cust_main-auto_standardize_address') ) {
-
-    standardize_address();
-    document.bottomform.submit();
-
-%   } else {
-
-    // popup a confirmation popup
-
-    var confirm_change =
-      '<CENTER><BR><B>Confirm address standardization</B><BR><BR>' +
-      '<TABLE>';
-    
-    if ( changed ) {
-
-      confirm_change = confirm_change + 
-        '<TR><TH>Entered billing address</TH>' +
-          '<TH>Standardized billing address</TH></TR>';
-        // + '<TR><TD>&nbsp;</TD><TD>&nbsp;</TD></TR>';
-      
-      if ( argsHash['company'] || argsHash['new_company'] ) {
-        confirm_change = confirm_change +
-        '<TR><TD>' + argsHash['company'] +
-          '</TD><TD>' + argsHash['new_company'] + '</TD></TR>';
-      }
-      
-      confirm_change = confirm_change +
-        '<TR><TD>' + argsHash['address1'] +
-          '</TD><TD>' + argsHash['new_address1'] + '</TD></TR>' +
-        '<TR><TD>' + argsHash['address2'] +
-          '</TD><TD>' + argsHash['new_address2'] + '</TD></TR>' +
-        '<TR><TD>' + argsHash['city'] + ', ' + argsHash['state'] + '  ' + argsHash['zip'] +
-          '</TD><TD>' + argsHash['new_city'] + ', ' + argsHash['new_state'] + '  ' + argsHash['new_zip'] + '</TD></TR>' +
-          '<TR><TD>&nbsp;</TD><TD>&nbsp;</TD></TR>';
-
-    }
-
-    if ( ship_changed ) {
-
-      confirm_change = confirm_change + 
-        '<TR><TH>Entered service address</TH>' +
-          '<TH>Standardized service address</TH></TR>';
-        // + '<TR><TD>&nbsp;</TD><TD>&nbsp;</TD></TR>';
-      
-      if ( argsHash['ship_company'] || argsHash['new_ship_company'] ) {
-        confirm_change = confirm_change +
-        '<TR><TD>' + argsHash['ship_company'] +
-          '</TD><TD>' + argsHash['new_ship_company'] + '</TD></TR>';
-      }
-      
-      confirm_change = confirm_change +
-        '<TR><TD>' + argsHash['ship_address1'] +
-          '</TD><TD>' + argsHash['new_ship_address1'] + '</TD></TR>' +
-        '<TR><TD>' + argsHash['ship_address2'] +
-          '</TD><TD>' + argsHash['new_ship_address2'] + '</TD></TR>' +
-        '<TR><TD>' + argsHash['ship_city'] + ', ' + argsHash['ship_state'] + '  ' + argsHash['ship_zip'] +
-          '</TD><TD>' + argsHash['new_ship_city'] + ', ' + argsHash['new_ship_state'] + '  ' + argsHash['new_ship_zip'] + '</TD></TR>' +
-        '<TR><TD>&nbsp;</TD><TD>&nbsp;</TD></TR>';
-
-    }
-
-    var addresses = 'address';
-    var height = 268;
-    if ( changed && ship_changed ) {
-      addresses = 'addresses';
-      height = 396; // #what
-    }
-
-    confirm_change = confirm_change +
-      '<TR><TD>' +
-        '<BUTTON TYPE="button" onClick="document.bottomform.submit();"><IMG SRC="<%$p%>images/error.png" ALT=""> Use entered ' + addresses + '</BUTTON>' + 
-      '</TD><TD>' +
-        '<BUTTON TYPE="button" onClick="standardize_address(); document.bottomform.submit();"><IMG SRC="<%$p%>images/tick.png" ALT=""> Use standardized ' + addresses + '</BUTTON>' + 
-      '</TD></TR>' +
-      '<TR><TD COLSPAN=2 ALIGN="center">' +
-        '<BUTTON TYPE="button" onClick="document.bottomform.submitButton.disabled=false; parent.cClick();"><IMG SRC="<%$p%>images/cross.png" ALT=""> Cancel submission</BUTTON></TD></TR>' +
-        
-      '</TABLE></CENTER>';
-
-    overlib( confirm_change, CAPTION, 'Confirm address standardization', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, 576, HEIGHT, height, BGCOLOR, '#333399', CGCOLOR, '#333399', TEXTSIZE, 3 );
-
-%   }
-
-  } else {
-
-    document.bottomform.submit();
-
-  }
-
-}
-
-function update_geocode() {
-
-  //yay closures
-  set_geocode = function (what) {
-
-    //alert(what.options[what.selectedIndex].value);
-    var argsHash = eval('(' + what.options[what.selectedIndex].value + ')');
-    document.bottomform.elements['<% $taxpre %>city'].value = argsHash['city'];
-    document.bottomform.elements['<% $taxpre %>state'].value = argsHash['state'];
-    document.bottomform.elements['<% $taxpre %>zip'].value = argsHash['zip'];
-    document.bottomform.elements['geocode'].value = argsHash['geocode'];
-
-  }
+% unless ( $custnum ) {
 
-  // popup a chooser
+    <% include('cust_main/first_pkg.html', $cust_main,
+                 'pkgpart_svcpart' => $pkgpart_svcpart,
+                 #svc_acct
+                 'username'        => $username,
+                 'password'        => $password,
+                 'popnum'          => $popnum,
+                 'saved_domsvc'    => $saved_domsvc,
+                 %svc_phone,
+              )
+    %>
 
-  overlib( OLresponseAJAX, CAPTION, 'Select tax location', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, 576, HEIGHT, 268, BGCOLOR, '#333399', CGCOLOR, '#333399', TEXTSIZE, 3 );
-
-}
-
-function copyelement(from, to) {
-  if ( from == undefined ) {
-    to.value = '';
-  } else if ( from.type == 'select-one' ) {
-    to.value = from.options[from.selectedIndex].value;
-    //alert(from + " (" + from.type + "): " + to.name + " => (" + from.selectedIndex + ") " + to.value);
-  } else if ( from.type == 'checkbox' ) {
-    if ( from.checked ) {
-      to.value = from.value;
-    } else {
-      to.value = '';
-    }
-  } else {
-    if ( from.value == undefined ) {
-      to.value = '';
-    } else {
-      to.value = from.value;
-    }
-  }
-  //alert(from + " (" + from.type + "): " + to.name + " => " + to.value);
-}
+% }
 
-</SCRIPT>
+<INPUT TYPE="hidden" NAME="otaker" VALUE="<% $cust_main->otaker %>">
 
-<FORM ACTION="<% popurl(1) %>process/cust_main.cgi" METHOD=POST NAME="bottomform" STYLE="margin-top: 0; margin-bottom: 0">
 % foreach my $hidden (
-%     'birthdate',
-%
-%     'custnum', 'agentnum', 'agent_custid', 'refnum', 'referral_custnum',
-%     'last', 'first', 'ss', 'company',
-%     'address1', 'address2', 'city',
-%     'county', 'state', 'zip', 'country',
-%     'daytime', 'night', 'fax',
-%     'stateid', 'stateid_state',
-%     
-%     'same',
-%     
-%     'ship_last', 'ship_first', 'ship_company',
-%     'ship_address1', 'ship_address2', 'ship_city',
-%     'ship_county', 'ship_state', 'ship_zip', 'ship_country',
-%     'ship_daytime','ship_night', 'ship_fax',
-%     
-%     'geocode',
-%     
-%     'select', #XXX key
-%
-%     'payauto',
-%     'payinfo', 'payinfo1', 'payinfo2', 'paytype',
-%     'payname', 'paystate', 'exp_month', 'exp_year', 'paycvv',
-%     'paystart_month', 'paystart_year', 'payissue',
-%     'payip',
-%     'paid',
-%     
-%     'tax',
-%     'invoicing_list', 'invoicing_list_POST', 'invoicing_list_FAX',
-%     'invoice_terms',
-%     'spool_cdr',
-%     'squelch_cdr'
-%   ) {
-%
-
-  <INPUT TYPE="hidden" NAME="<% $hidden %>" VALUE="">
-% } 
-%
-% my $ro_comments = $conf->exists('cust_main-use_comments')?'':'readonly';
-% if (!$ro_comments || $cust_main->comments) {
-
-<BR>Comments
-<% &ntable("#cccccc") %>
-  <TR>
-    <TD>
-      <TEXTAREA COLS=80 ROWS=5 WRAP="HARD" NAME="comments" <%$ro_comments%>><% $cust_main->comments %></TEXTAREA>
-    </TD>
-  </TR>
-</TABLE>
-%
-% }
-%
-%unless ( $custnum ) {
-%  # pry the wrong place for this logic.  also pretty expensive
-%  #use FS::part_pkg;
-%
-%  #false laziness, copied from FS::cust_pkg::order
-%  my $pkgpart;
-%  my $agentnum = '';
-%  my @agents = $FS::CurrentUser::CurrentUser->agents;
-%  if ( scalar(@agents) == 1 ) {
-%    # $pkgpart->{PKGPART} is true iff $custnum may purchase PKGPART
-%    $pkgpart = $agents[0]->pkgpart_hashref;
-%    $agentnum = $agents[0]->agentnum;
-%  } else {
-%    #can't know (agent not chosen), so, allow all
-%    $agentnum = 'all';
-%    my %typenum;
-%    foreach my $agent ( @agents ) {
-%      next if $typenum{$agent->typenum}++;
-%      $pkgpart->{$_}++ foreach keys %{ $agent->pkgpart_hashref }
-%    }
-%  }
-%  #eslaf
-%
-%  my @part_pkg = grep { $_->svcpart('svc_acct')
-%                        && ( $pkgpart->{ $_->pkgpart } 
-%                             || $agentnum eq 'all'
-%                             || ( $agentnum ne 'all'
-%                                  && $agentnum
-%                                  && $_->agentnum
-%                                  && $_->agentnum == $agentnum
-%                                )
-%                           )
-%                      }
-%    qsearch( 'part_pkg', { 'disabled' => '' }, '', 'ORDER BY pkg' ); # case?
-%
-%  if ( @part_pkg ) {
-%
-%    #    print "<BR><BR>First package", &itable("#cccccc", "0 ALIGN=LEFT"),
-%    #apiabuse & undesirable wrapping
-%
-%    
-
-    <BR>First package
-    <% ntable("#cccccc") %>
-    
-      <TR>
-        <TD COLSPAN=2>
-          <% include('cust_main/select-domain.html',
-                       'pkgparts'      => \@part_pkg,
-                       'saved_pkgpart' => $saved_pkgpart,
-                       'saved_domsvc' => $saved_domsvc,
-                    )
-          %>
-        </TD>
-      </TR>
-% 
-%        #false laziness: (mostly) copied from edit/svc_acct.cgi
-%        #$ulen = $svc_acct->dbdef_table->column('username')->length;
-%        my $ulen = dbdef->table('svc_acct')->column('username')->length;
-%        my $ulen2 = $ulen+2;
-%        my $passwordmax = $conf->config('passwordmax') || 8;
-%        my $pmax2 = $passwordmax + 2;
-%      
-
-    
-      <TR>
-        <TD ALIGN="right">Username</TD>
-        <TD>
-          <INPUT TYPE="text" NAME="username" VALUE="<% $username %>" SIZE=<% $ulen2 %> MAXLENGTH=<% $ulen %>>
-        </TD>
-      </TR>
-    
-      <TR>
-        <TD ALIGN="right">Domain</TD>
-        <TD>
-          <SELECT NAME="domsvc">
-            <OPTION>(none)</OPTION>
-          </SELECT>
-        </TD>
-      </TR>
-    
-      <TR>
-        <TD ALIGN="right">Password</TD>
-        <TD>
-          <INPUT TYPE="text" NAME="_password" VALUE="<% $password %>" SIZE=<% $pmax2 %> MAXLENGTH=<% $passwordmax %>>
-          (blank to generate)
-        </TD>
-      </TR>
-    
-      <TR>
-        <TD ALIGN="right">Access number</TD>
-        <TD><% FS::svc_acct_pop::popselector($popnum) %></TD>
-      </TR>
-    </TABLE>
-% } 
+%    'payauto',
+%    'payinfo', 'payinfo1', 'payinfo2', 'paytype',
+%    'payname', 'paystate', 'exp_month', 'exp_year', 'paycvv',
+%    'paystart_month', 'paystart_year', 'payissue',
+%    'payip',
+%    'paid',
+% ) {
+    <INPUT TYPE="hidden" NAME="<% $hidden %>" VALUE="">
 % } 
 
+<% include('cust_main/bottomfixup.html') %>
 
-<INPUT TYPE="hidden" NAME="otaker" VALUE="<% $cust_main->otaker %>">
-<BR>
-<INPUT TYPE="button" NAME="submitButton" ID="submitButton" VALUE="<% $custnum ?  "Apply Changes" : "Add Customer" %>" onClick="document.bottomform.submitButton.disabled=true; bottomfixup(this.form);">
 <BR>
+<INPUT TYPE    = "button"
+       NAME    = "submitButton"
+       ID      = "submitButton"
+       VALUE   = "<% $custnum ?  "Apply Changes" : "Add Customer" %>"
+       onClick = "this.disabled=true; bottomfixup(this.form);"
+>
 </FORM>
 
 <% include('/elements/footer.html') %>
@@ -685,52 +202,49 @@ function copyelement(from, to) {
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Edit customer');
 
-#for misplaced logic below
-#use FS::part_pkg;
-
-#for false laziness below (now more properly lazy)
-#use FS::svc_acct_pop;
-
-#for (other) false laziness below
-#use FS::agent;
-#use FS::type_pkgs;
-
 my $conf = new FS::Conf;
 
-my $taxpre = $conf->exists('tax-ship_address') ? 'ship_' : '';
 #get record
 
-my($custnum, $username, $password, $popnum, $cust_main, $saved_pkgpart, $saved_domsvc);
-my(@invoicing_list);
-my ($ss,$stateid,$payinfo);
+my($custnum, $cust_main, $ss, $stateid, $payinfo, @invoicing_list);
 my $same = '';
+my $pkgpart_svcpart = ''; #first_pkg
+my($username, $password, $popnum, $saved_domsvc) = ( '', '', 0, 0 ); #svc_acct
+my %svc_phone = ();
+
 if ( $cgi->param('error') ) {
+
   $cust_main = new FS::cust_main ( {
     map { $_, scalar($cgi->param($_)) } fields('cust_main')
   } );
+
   $custnum = $cust_main->custnum;
-  $saved_domsvc = $cgi->param('domsvc') || '';
-  if ( $saved_domsvc =~ /^(\d+)$/ ) {
-    $saved_domsvc = $1;
-  } else {
-    $saved_domsvc = '';
-  }
-  $saved_pkgpart = $cgi->param('pkgpart_svcpart') || '';
-  if ( $saved_pkgpart =~ /^(\d+)_/ ) {
-    $saved_pkgpart = $1;
-  } else {
-    $saved_pkgpart = '';
-  }
-  $username = $cgi->param('username');
-  $password = $cgi->param('_password');
-  $popnum = $cgi->param('popnum');
   @invoicing_list = split( /\s*,\s*/, $cgi->param('invoicing_list') );
   $same = $cgi->param('same');
   $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
+
+  $pkgpart_svcpart = $cgi->param('pkgpart_svcpart') || '';
+
+  #svc_acct
+  $username = $cgi->param('username');
+  $password = $cgi->param('_password');
+  $popnum = $cgi->param('popnum');
+  $saved_domsvc = $cgi->param('domsvc') || '';
+  if ( $saved_domsvc =~ /^(\d+)$/ ) {
+    $saved_domsvc = $1;
+  } else {
+    $saved_domsvc = '';
+  }
+
+  #svc_phone
+  $svc_phone{$_} = $cgi->param($_)
+    foreach qw( countrycode phonenum sip_password pin phone_name );
+
 } elsif ( $cgi->keywords ) { #editing
+
   my( $query ) = $cgi->keywords;
   $query =~ /^(\d+)$/;
   $custnum=$1;
@@ -741,31 +255,24 @@ if ( $cgi->param('error') ) {
     $paycvv =~ s/./*/g;
     $cust_main->paycvv($paycvv);
   }
-  $saved_pkgpart = 0;
-  $saved_domsvc = 0;
-  $username = '';
-  $password = '';
-  $popnum = 0;
   @invoicing_list = $cust_main->invoicing_list;
   $ss = $cust_main->masked('ss');
   $stateid = $cust_main->masked('stateid');
   $payinfo = $cust_main->paymask;
-} else {
+
+} else { #new customer
+
   $custnum='';
   $cust_main = new FS::cust_main ( {} );
   $cust_main->otaker( &getotaker );
   $cust_main->referral_custnum( $cgi->param('referral_custnum') );
-  $saved_pkgpart = 0;
-  $saved_domsvc = 0;
-  $username = '';
-  $password = '';
-  $popnum = 0;
   @invoicing_list = ();
   push @invoicing_list, 'POST'
     unless $conf->exists('disablepostalinvoicedefault');
   $ss = '';
   $stateid = '';
   $payinfo = '';
+
 }
 
 my $error = $cgi->param('error');