[freeside-commits] branch FREESIDE_4_BRANCH updated. 0f503d6064c0f7a7a2dae5a74701390a757f49ac

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  0f503d6064c0f7a7a2dae5a74701390a757f49ac (commit)
      from  7a4a7b6bab4cbd4bee47194892efd0f9388e57c6 (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 0f503d6064c0f7a7a2dae5a74701390a757f49ac
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue May 16 16:14:33 2017 -0700

    show a name on residential prospect quotations, RT#75990

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index eee85cc..dbcd635 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -603,6 +603,9 @@ sub print_generic {
     'total_pages'     => 1,
 
   );
+
+  #quotations have $name
+  $invoice_data{'name'} = $invoice_data{'payname'};
  
   #localization
   $invoice_data{'emt'} = sub { &$escape_function($self->mt(@_)) };
diff --git a/FS/FS/prospect_main.pm b/FS/FS/prospect_main.pm
index 76faf0f..c54c569 100644
--- a/FS/FS/prospect_main.pm
+++ b/FS/FS/prospect_main.pm
@@ -279,10 +279,45 @@ sub name {
   'Prospect #'. $self->prospectnum;
 }
 
+=item contact_firstlast
+
+If this prospect has a company, returns the empty string.  If not, returns the
+first contact's first and last name.
+
+Primarily intended for use in quotation substitutions, like the FS::cust_main
+method of the same name.
+
+=cut
+
+sub contact_firstlast {
+  my $self = shift;
+  return '' if $self->company;
+  my @contacts = $self->contact;
+  #return '' unless @contacts;
+  warn $contacts[0]->first;
+  warn $contacts[0]->get('last');
+  $contacts[0]->first. ' '. $contacts[0]->get('last');
+}
+
 =item contact
 
 Returns the contacts (see L<FS::contact>) associated with this prospect.
 
+=cut
+
+sub contact {
+  my $self = shift;
+  my $search = {
+    table       => 'contact',
+    addl_from   => ' JOIN prospect_contact USING (contactnum)',
+    extra_sql   => ' WHERE prospect_contact.prospectnum = '.$self->prospectnum,
+  };
+
+  #classnum argument like FS::cust_main->contact?
+
+  qsearch($search);
+}
+
 =item cust_location
 
 Returns the locations (see L<FS::cust_location>) associated with this prospect.

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

Summary of changes:
 FS/FS/Template_Mixin.pm |    3 +++
 FS/FS/prospect_main.pm  |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)