X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_event.html;h=56bf76778966b612f0b8f17187425e146ce4615a;hp=ad953e30d5239c00eca1f34b23e49b39608b3a2c;hb=1fc8addc56f8daf12397da568eb1ac1b27fd3984;hpb=f65410488a46be760bacf0e8d7673ba1e71be1fb diff --git a/httemplate/search/cust_event.html b/httemplate/search/cust_event.html index ad953e30d..56bf76778 100644 --- a/httemplate/search/cust_event.html +++ b/httemplate/search/cust_event.html @@ -134,6 +134,12 @@ my $trigger_link = sub { my $pkgnum = $cust_event->tablenum; my $frag = "cust_pkg$pkgnum"; #hack for IE ignoring real #fragment [ "${p}view/cust_main.cgi?custnum=$custnum$show;fragment=$frag#cust_pkg", 'tablenum' ]; + } elsif ( $eventtable eq 'cust_pay' ) { + [ "${p}view/$eventtable.html?paynum=", 'tablenum' ]; + } elsif ( $eventtable eq 'cust_statement' ) { + [ "${p}view/$eventtable.html?", 'tablenum' ]; + } elsif ( $eventtable eq 'cust_pay_batch' ) { + [ "${p}search/cust_pay_batch.cgi?batchnum=", 'cust_pay_batch_batchnum' ]; } else { [ "${p}view/$eventtable.cgi?", 'tablenum' ]; } @@ -157,7 +163,7 @@ die "access denied" || $cgi->param('pkgnum') =~ /^(\d+)$/ ); -my @statuses = $cgi->param('event_status'); +my @statuses = $cgi->multi_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 @@ -181,12 +187,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', @@ -195,6 +205,7 @@ my $sql_query = { 'part_event.*', #'cust_bill.custnum', #'cust_bill._date AS cust_bill_date', + 'cust_pay_batch.batchnum AS cust_pay_batch_batchnum', 'cust_main.custnum AS cust_main_custnum', FS::UI::Web::cust_sql_fields(), ), @@ -202,7 +213,6 @@ my $sql_query = { 'extra_sql' => $where, 'order_by' => 'ORDER BY _date ASC', 'addl_from' => $join, - 'debug' => 2, }; my $count_sql = "SELECT COUNT(*) FROM cust_event $join $where";