[freeside-commits] branch master updated. dadbfd8b7e4e471151ed828f5173ceb7dee95fe5

[Jonathan Prykop]

The branch, master has been updated
       via  dadbfd8b7e4e471151ed828f5173ceb7dee95fe5 (commit)
       via  f65410488a46be760bacf0e8d7673ba1e71be1fb (commit)
      from  a21d07037590cccd5ac5c572f5d28f062c622968 (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 dadbfd8b7e4e471151ed828f5173ceb7dee95fe5
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Fri May 13 22:47:53 2016 -0500

    RT#41394: Add advertising source to customer fields selection [added referral join to search/cust_event]

diff --git a/httemplate/search/cust_event.html b/httemplate/search/cust_event.html
index ad953e3..b1ba909 100644
--- a/httemplate/search/cust_event.html
+++ b/httemplate/search/cust_event.html
@@ -181,12 +181,16 @@ $search{'ending'}    = $ending;
 my $where = ' WHERE '. FS::cust_event->search_sql_where( \%search );
 
 my $join = FS::cust_event->join_sql() .
+  # warning: does not show the true service address for package events.
+  # the query to do that would be painfully slow.
   'LEFT JOIN cust_location bill_location '.
   'ON (cust_main.bill_locationnum = bill_location.locationnum) '.
   'LEFT JOIN cust_location ship_location '.
-  'ON (cust_main.ship_locationnum = ship_location.locationnum)';
-  # warning: does not show the true service address for package events.
-  # the query to do that would be painfully slow.
+  'ON (cust_main.ship_locationnum = ship_location.locationnum)'.
+  # include link to referral in case it's in cust-fields
+  #   (maybe we should be using FS::UI::Web::join_cust_main instead?)
+  'LEFT JOIN (select refnum, referral from part_referral) AS part_referral_x '.
+  'ON (cust_main.refnum = part_referral_x.refnum) ';
 
 my $sql_query = {
   'table'     => 'cust_event',

commit f65410488a46be760bacf0e8d7673ba1e71be1fb
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Fri May 13 22:39:07 2016 -0500

    Bug fix, fallout from #36741 commit 11df448b, discovered/fixed while testing #41394

diff --git a/httemplate/search/cust_event.html b/httemplate/search/cust_event.html
index 122bee0..ad953e3 100644
--- a/httemplate/search/cust_event.html
+++ b/httemplate/search/cust_event.html
@@ -157,7 +157,7 @@ die "access denied"
               || $cgi->param('pkgnum')  =~ /^(\d+)$/
             );
 
-my @statuses = $cgi->multi_param('event_status');
+my @statuses = $cgi->param('event_status');
 my $title = 'Billing events';
 if ( $statuses[0] eq 'failed' and !defined($statuses[1]) ) {
   # tweak the title if we're showing only failed events

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

Summary of changes:
 httemplate/search/cust_event.html |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)