[freeside-commits] branch FREESIDE_4_BRANCH updated. 3e84035fd56d11da62663fed7651ff54098a52c9

[Jonathan Prykop]

The branch, FREESIDE_4_BRANCH has been updated
       via  3e84035fd56d11da62663fed7651ff54098a52c9 (commit)
      from  63c0876fa02e8872a0d1163242d0475f921b26ce (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 3e84035fd56d11da62663fed7651ff54098a52c9
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Wed Jan 4 06:01:59 2017 -0600

    42396: Prospect creation without contact (v4+) [hide fields prospect doesn't use]

diff --git a/httemplate/edit/prospect_main.html b/httemplate/edit/prospect_main.html
index 6aefe80..1e05578 100644
--- a/httemplate/edit/prospect_main.html
+++ b/httemplate/edit/prospect_main.html
@@ -39,7 +39,7 @@
          'm2m_dstcol'        => 'contactnum',
          'm2_label'          => 'Contact',
          'm2_error_callback' => $m2_error_callback,
-
+         'include_opt_callback' => sub { 'for_prospect' => 1 },
        },
        { 'field'         => 'locationnum',
          'type'          => 'select-cust_location',
diff --git a/httemplate/elements/contact.html b/httemplate/elements/contact.html
index 3fbcc05..b0a7cac 100644
--- a/httemplate/elements/contact.html
+++ b/httemplate/elements/contact.html
@@ -126,12 +126,17 @@ if ( $curr_value ) {
                    'contactnum'  => $curr_value,
                    'prospectnum' => $opt{'prospectnum'},
                  });
+    $opt{'for_prospect'} = 1;
   } else {
     die 'neither custnum nor prospectnum specified';
   }
 } else {
   $contact = new FS::contact {};
-  $X_contact = new FS::cust_contact; #arbitrary, it could be prospect_contact
+  if ($opt{'for_prospect'}) {
+    $X_contact = new FS::prospect_contact;
+  } else {
+    $X_contact = new FS::cust_contact;
+  }
 }
 
 my %size = ( 'title' => 12 );
@@ -140,11 +145,14 @@ tie my %label, 'Tie::IxHash',
   'first'              => 'First name',
   'last'               => 'Last name',
   'title'              => 'Title/Position',
-  'emailaddress'       => 'Email',
-  'invoice_dest'       => 'Send invoices',
-  'selfservice_access' => 'Self-service'
+  'emailaddress'       => 'Email'
 ;
 
+unless ($opt{'for_prospect'}) {
+  $label{'invoice_dest'} = 'Send invoices';
+  $label{'selfservice_access'} = 'Self-service';
+}
+
 my $first = 0;
 foreach my $phone_type ( qsearch({table=>'phone_type', order_by=>'weight'}) ) {
   next if $phone_type->typename =~ /^(Home|Fax)$/;

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

Summary of changes:
 httemplate/edit/prospect_main.html |    2 +-
 httemplate/elements/contact.html   |   16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)