add spouse name to customer records, #24919

3 files changed, 41 insertions, 36 deletions

diff --git a/httemplate/edit/cust_main/birthdate.html b/httemplate/edit/cust_main/birthdate.html
index e1adbd3bd..ecf591fb0 100644
--- a/httemplate/edit/cust_main/birthdate.html
+++ b/httemplate/edit/cust_main/birthdate.html
@@ -34,28 +34,28 @@
 % }
 
 % if ( $conf->exists('cust_main-enable_birthdate') ) {
-  <% include( '/elements/tr-input-date-field.html', {
-                'name'        => 'birthdate',
-                'value'       => $cust_main->birthdate,
-                'label'       => 'Date of Birth',
-                'format'      => ( $conf->config('date_format') || "%m/%d/%Y" ),
-                'usedatetime' => 1,
-                'noinit'      => $noinit++,
-            })
-  %>
-% }
+  <& /elements/tr-input-date-field.html, {
+        'name'        => 'birthdate',
+        'value'       => $cust_main->birthdate,
+        'label'       => 'Date of Birth',
+        'format'      => ( $conf->config('date_format') || "%m/%d/%Y" ),
+        'usedatetime' => 1,
+        'noinit'      => $noinit++,
+     }
+  &>
 
-% if ( $conf->exists('cust_main-enable_spouse_birthdate') ) {
-  <% include( '/elements/tr-input-date-field.html', {
-                'name'        => 'spouse_birthdate',
-                'value'       => $cust_main->spouse_birthdate,
-                'label'       => 'Spouse Date of Birth',
-                'format'      => ( $conf->config('date_format') || "%m/%d/%Y" ),
-                'usedatetime' => 1,
-                'noinit'      => $noinit++,
-            })
-  %>
-% }
+%   if ( $conf->exists('cust_main-enable_spouse') ) {
+  <& /elements/tr-input-date-field.html, {
+        'name'        => 'spouse_birthdate',
+        'value'       => $cust_main->spouse_birthdate,
+        'label'       => 'Spouse Date of Birth',
+        'format'      => ( $conf->config('date_format') || "%m/%d/%Y" ),
+        'usedatetime' => 1,
+        'noinit'      => $noinit++,
+      }
+  &>
+%   } # if enable_spouse
+% } # if enable_birthdate 
 
 % if ( $conf->exists('cust_main-enable_anniversary_date') ) {
   <% include( '/elements/tr-input-date-field.html', {
diff --git a/httemplate/edit/cust_main/name.html b/httemplate/edit/cust_main/name.html
index 2641ec930..fbb0a916e 100644
--- a/httemplate/edit/cust_main/name.html
+++ b/httemplate/edit/cust_main/name.html
@@ -1,36 +1,40 @@
 <%def .namepart>
 % my ($field, $value, $label, $extra) = @_;
-<TD>
+<DIV STYLE="display: inline-block">
   <INPUT TYPE="text" NAME="<% $field %>" VALUE="<% $value |h %>" <%$extra%>>
   <BR><FONT SIZE=-1><% mt($label) %></FONT>
-</TD>
+</DIV>
 </%def>
 
 <TR>
-  <TH VALIGN="top" ALIGN="right"><%$r%><% mt('Contact name') |h %></TH>
-  <TD COLSPAN=6>
-    <TABLE CELLSPACING=0 CELLPADDING=0>
-      <TR>
-        <& .namepart, 'last', $cust_main->last, 'Last' &>
-        <TD VALIGN="top"> , </TD>
+  <TD CLASS="required label"><% mt('Contact name') |h %></TD>
+  <TD COLSPAN=6 STYLE="vertical-align:top">
+        <& .namepart, 'last', $cust_main->last, 'Last', ',' &>
         <& .namepart, 'first', $cust_main->first, 'First' &>
 % if ( $conf->exists('show_ss') ) {
-        <TD>&nbsp;</TD>
+        &nbsp;
         <& .namepart, 'ss', $ss, 'SS#', "SIZE=11" &>
 % } else  {
         <INPUT TYPE="hidden" NAME="ss" VALUE="<% $ss %>">
 % }
-      </TR>
-    </TABLE>
   </TD>
 </TR>
+% if ( $conf->exists('cust_main-enable_spouse') ) {
+<TR ID="spouse_row">
+  <TD CLASS="label"><% mt('Spouse\'s name') |h %></TD>
+  <TD COLSPAN=6>
+        <& .namepart, 'spouse_last', $cust_main->spouse_last, 'Last', ',' &>
+        <& .namepart, 'spouse_first', $cust_main->spouse_first, 'First' &>
+  </TD>
+</TR>
+% }
 
 % if ( $conf->exists('cust-email-high-visibility') ) {
 <TR>
-  <TD ALIGN="right">
+  <TD ALIGN="right" CLASS="
     <% $conf->exists('cust_main-require_invoicing_list_email', $agentnum)
-        ? $r
-        : '' %>Email address(es)
+        ? 'required label'
+        : 'label' %>">Email address(es)
   </TD>
   <TD BGCOLOR="#FFFF00">
     <INPUT TYPE="text" NAME="invoicing_list" 
@@ -42,7 +46,6 @@
 my $cust_main = shift;
 my $agentnum = $cust_main->agentnum if $cust_main->custnum;
 my $conf = FS::Conf->new;
-my $r = '<font color="#ff0000">*</font>&nbsp;';
 my $ss;
 
 if ( $cgi->param('error') or $conf->exists('unmask_ss') ) {
diff --git a/httemplate/edit/cust_main/top_misc.html b/httemplate/edit/cust_main/top_misc.html
index e25506f52..f3fde53fa 100644
--- a/httemplate/edit/cust_main/top_misc.html
+++ b/httemplate/edit/cust_main/top_misc.html
@@ -27,11 +27,13 @@
     if ( what.checked == (what.value == 'Commercial' ) ) {
       document.getElementById('company_row').style.display = '';
       document.getElementById('contacts_div').style.display = '';
+      document.getElementById('spouse_row').style.display = 'none';
     } else {
       if ( document.getElementById('company').value.length == 0 ) {
         document.getElementById('company_row').style.display = 'none';
       }
       document.getElementById('contacts_div').style.display = 'none';
+      document.getElementById('spouse_row').style.display = '';
     }
   }