[freeside-commits] branch FREESIDE_3_BRANCH updated. 609e7cb967020e23f147f4e1b475fed97e37db30

[Christopher Burger]

The branch, FREESIDE_3_BRANCH has been updated
       via  609e7cb967020e23f147f4e1b475fed97e37db30 (commit)
       via  9d730c5bfd39cca46b2801f32432a9d979d6501b (commit)
      from  1ab8e94c2cceed20d27e27441ebce543cf6565a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 609e7cb967020e23f147f4e1b475fed97e37db30
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Wed Apr 17 11:13:03 2019 -0400

    RT# 75357 - v3 fix for creating contact rows in prospects

diff --git a/httemplate/edit/prospect_main.html b/httemplate/edit/prospect_main.html
index 9340493b4..fefdb96c0 100644
--- a/httemplate/edit/prospect_main.html
+++ b/httemplate/edit/prospect_main.html
@@ -48,12 +48,13 @@
          'size'     => 50,
          'colspan'  => 6,
        },
-       { 'field'             => 'contactnum',
-         'type'              => 'contact',
-         'colspan'           => 6,
-         'o2m_table'      => 'contact',
-         'm2_label'       => 'Contact',
-         'm2_error_callback' => $m2_error_callback,
+       { 'field'                => 'contactnum',
+         'type'                 => 'contact',
+         'colspan'              => 6,
+         'o2m_table'            => 'contact',
+         'm2_label'             => 'Contact',
+         'm2_error_callback'    => $m2_error_callback,
+         'include_opt_callback' => sub { 'for_prospect' => '1' },
 
        },
        { 'field'         => 'locationnum',
diff --git a/httemplate/elements/contact.html b/httemplate/elements/contact.html
index 5cf8ddbd6..a9e1f23c9 100644
--- a/httemplate/elements/contact.html
+++ b/httemplate/elements/contact.html
@@ -145,7 +145,6 @@ tie my %label, 'Tie::IxHash',
   'last'               => 'Last name',
   'title'              => 'Title/Position',
   'emailaddress'       => 'Email',
-  'selfservice_access' => 'Self-service'
 ;
 
 unless ($opt{'for_prospect'}) {

commit 9d730c5bfd39cca46b2801f32432a9d979d6501b
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Wed Apr 17 10:46:02 2019 -0400

    RT# 75357 - now new contact row in created in correct place

diff --git a/httemplate/elements/contact.html b/httemplate/elements/contact.html
index 199f5cb53..5cf8ddbd6 100644
--- a/httemplate/elements/contact.html
+++ b/httemplate/elements/contact.html
@@ -180,6 +180,6 @@ my $js = qq(
       else { document.getElementById("changepw$id\_password").disabled = 'true'; }
       return false;
     }
-);
+) unless $opt{'for_prospect'};
 
 </%init>
diff --git a/httemplate/elements/tr-select-part_referral.html b/httemplate/elements/tr-select-part_referral.html
index 5041f7f73..4a9cafd01 100644
--- a/httemplate/elements/tr-select-part_referral.html
+++ b/httemplate/elements/tr-select-part_referral.html
@@ -11,7 +11,9 @@
     </FONT>
 %   } elsif ( scalar( @{$opt{'part_referrals'}} ) == 1 ) {
 
-     <INPUT TYPE="hidden" NAME="<% $opt{'element_name'} || $opt{'field'} || 'refnum' %>" VALUE="<% $opt{'part_referrals'}->[0]->refnum %>">
+     <TR><TD COLSPAN="<% $colspan %>">
+       <INPUT TYPE="hidden" NAME="<% $opt{'element_name'} || $opt{'field'} || 'refnum' %>" VALUE="<% $opt{'part_referrals'}->[0]->refnum %>">
+     </TD></TR>
 
 % } else { 
      <& /elements/tr-td-label.html, label => 'Advertising source', %opt &>

-----------------------------------------------------------------------

Summary of changes:
 httemplate/edit/prospect_main.html               | 13 +++++++------
 httemplate/elements/contact.html                 |  3 +--
 httemplate/elements/tr-select-part_referral.html |  4 +++-
 3 files changed, 11 insertions(+), 9 deletions(-)