diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-09-23 10:51:32 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-09-23 10:51:32 -0700 |
| commit | ddbea80d28f423a9e5ad3f879545cff4434a4ed8 (patch) | |
| tree | c95bd91379207e8312b712f2c71e4ab8bbb264ae | |
| parent | 70054fbcf1d7172deba9d5aca04beab37bbe53e6 (diff) | |
fix searches for cust_pay events, RT#35167
| -rw-r--r-- | FS/FS/cust_event.pm | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/FS/FS/cust_event.pm b/FS/FS/cust_event.pm index 07a970135..1ef511a3d 100644 --- a/FS/FS/cust_event.pm +++ b/FS/FS/cust_event.pm @@ -10,6 +10,7 @@ use FS::part_event; use FS::cust_main; use FS::cust_pkg; use FS::cust_bill; +use FS::cust_pay; use FS::svc_acct; $DEBUG = 0; @@ -313,11 +314,13 @@ sub join_sql { LEFT JOIN cust_pay ON ( eventtable = 'cust_pay' AND tablenum = paynum ) LEFT JOIN cust_svc ON ( eventtable = 'svc_acct' AND tablenum = svcnum ) LEFT JOIN cust_pkg AS cust_pkg_for_svc ON ( cust_svc.pkgnum = cust_pkg_for_svc.pkgnum ) - LEFT JOIN cust_main ON ( ( eventtable = 'cust_main' AND tablenum = cust_main.custnum ) - OR ( eventtable = 'cust_bill' AND cust_bill.custnum = cust_main.custnum ) - OR ( eventtable = 'cust_pkg' AND cust_pkg.custnum = cust_main.custnum ) - OR ( eventtable = 'svc_acct' AND cust_pkg_for_svc.custnum = cust_main.custnum ) - ) + LEFT JOIN cust_main ON ( + ( eventtable = 'cust_main' AND tablenum = cust_main.custnum ) + OR ( eventtable = 'cust_bill' AND cust_bill.custnum = cust_main.custnum ) + OR ( eventtable = 'cust_pkg' AND cust_pkg.custnum = cust_main.custnum ) + OR ( eventtable = 'cust_pay' AND cust_pay.custnum = cust_main.custnum ) + OR ( eventtable = 'svc_acct' AND cust_pkg_for_svc.custnum = cust_main.custnum ) + ) "; } @@ -401,6 +404,11 @@ sub search_sql_where { "tablenum = '$1'"; } + if ( $param->{'paynum'} =~ /^(\d+)$/ ) { + push @search, "part_event.eventtable = 'cust_pay'", + "tablenum = '$1'"; + } + if ( $param->{'svcnum'} =~ /^(\d+)$/ ) { push @search, "part_event.eventtable = 'svc_acct'", "tablenum = '$1'"; |