diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2018-05-18 11:41:52 -0400 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2018-05-18 11:41:52 -0400 |
| commit | b003202d1bd1ddc6717a4429c1f8863ebc27844c (patch) | |
| tree | 5305b9be5fc0218529756374f09c22f89159f753 /httemplate | |
| parent | ddcfe66496c323f1f52fdbd00e8babd43249a609 (diff) | |
| parent | b65bbe5e2161ac6dd4e0e8239ccb7249e001639f (diff) | |
Merge branch 'master' of ssh://git.freeside.biz/home/git/freeside
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/search/cust_event.html | 7 | ||||
| -rw-r--r-- | httemplate/search/report_cust_event.html | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/httemplate/search/cust_event.html b/httemplate/search/cust_event.html index b1ba9090e..1766c1905 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' ]; } @@ -199,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(), ), diff --git a/httemplate/search/report_cust_event.html b/httemplate/search/report_cust_event.html index 7aa4ff9d7..84eb45f96 100644 --- a/httemplate/search/report_cust_event.html +++ b/httemplate/search/report_cust_event.html @@ -5,11 +5,9 @@ %> <FORM ACTION="cust_event.html" METHOD="GET"> - <TABLE BGCOLOR="#cccccc" CELLSPACING=0> - <TR> - <TH CLASS="background" COLSPAN=2 ALIGN="left"><FONT SIZE="+1">Search options</FONT></TH> - </TR> + <FONT CLASS="fsinnerbox-title"><% emt('Search options') %></FONT> + <TABLE CLASS="fsinnerbox"> <% include( '/elements/tr-select-agent.html', 'disable_empty'=>0 ) %> @@ -44,7 +42,7 @@ 'field' => 'event_status', 'multiple' => 1, 'all_selected' => 1, - 'size' => 5, + 'size' => 6, 'options' => [ qw( done_Y done_S done_N failed new locked ) ], 'option_labels' => { done_Y => 'Completed normally', done_S => 'Completed, with an error', |