From d9541c5d440849911472b8850c380b9c6556d6fa Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Thu, 11 May 2017 15:48:24 -0700 Subject: [PATCH] test billing events, RT#73949 --- httemplate/browse/part_event.html | 44 ++++++++++++++++++++++++++++++--- httemplate/misc/test-part_event.html | 48 ++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 httemplate/misc/test-part_event.html diff --git a/httemplate/browse/part_event.html b/httemplate/browse/part_event.html index 4b95b86f5..ea9739147 100644 --- a/httemplate/browse/part_event.html +++ b/httemplate/browse/part_event.html @@ -10,7 +10,7 @@ 'query' => { 'select' => 'part_event.*', 'table' => 'part_event', 'addl_from' => $join_conditions, - 'hashref' => {}, + 'hashref' => $hashref, 'order_by' => $order_conditions, }, 'count_query' => $count_query, @@ -78,14 +78,39 @@ my $conditions_sub = sub { my $part_event = shift; my $addl = 0; + [ map { my $part_event_condition = $_; my %options = $part_event_condition->options; + my $desc = $part_event_condition->description; + + if ( $cgi->param('test_eventtable_num') =~ /^(\d+)$/ ) { + + my $tablenum = $1; + + if ( $cgi->param('eventtable') =~ /^(cust_main|cust_pkg|cust_bill)$/ ) { + my $eventtable = "FS::$1"; + my $object = $eventtable->by_key($tablenum); + + my $cust_event = $part_event->new_cust_event($object); + + my $test = $part_event_condition->condition( + $object, + 'cust_event' => $cust_event, + ); + + my $yesno = $test ? '(yes)' + : '(no)'; + + $desc .= " $yesno"; + } + } + [ { - 'data' => $part_event_condition->description, + 'data' => $desc, 'width' => '100%', 'align' => 'center', 'colspan' => 2, @@ -166,6 +191,7 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Edit billing events') || $FS::CurrentUser::CurrentUser->access_right('Edit global billing events'); + my $html_init = #XXX better description 'Events are billing, collection or other actions triggered when certain '. @@ -183,13 +209,25 @@ foreach my $part_event ( qsearch('part_event', {'disabled'=>''}) ) { $html_init .= ''. '
'; - + +my $hashref = {}; + my $count_query = 'SELECT COUNT(*) FROM part_event WHERE '. $FS::CurrentUser::CurrentUser->agentnums_sql( 'null_right' => 'Edit global billing events', 'viewall_right' => 'None', ); +if ( $cgi->param('eventtable') =~ /^(\w+)$/ ) { + $hashref->{eventtable} = $1; + $count_query .= " AND eventtable = '$1' "; +} + +my $tablenum = ''; +if ( $cgi->param('test_eventtable_num') =~ /^(\d+)$/ ) { + $tablenum = $1; +} + my $join_conditions = FS::part_event_condition->join_conditions_sql('', 'time' => time); my $order_conditions = FS::part_event_condition->order_conditions_sql; diff --git a/httemplate/misc/test-part_event.html b/httemplate/misc/test-part_event.html new file mode 100644 index 000000000..e2d9d45bb --- /dev/null +++ b/httemplate/misc/test-part_event.html @@ -0,0 +1,48 @@ +<& /elements/header.html, { + 'title_noescape' => 'Test billing events for '. encode_entities($cust_main->name), + } +&> + +Customer events +

+
+Package events for + +<& /elements/select-table.html, + 'table' => 'cust_pkg', + 'name_col' => 'pkg_label_long', + 'hashref' => { 'custnum' => $custnum, }, + 'order_by' => 'ORDER BY pkgnum', + 'element_name' => 'test_eventtable_num', + 'disable_empty' => 1, +&> + +
+
+
+Invoice events for + +<& /elements/select-table.html, + 'table' => 'cust_bill', + 'name_col' => 'invnum', + 'hashref' => { 'custnum' => $custnum, }, + 'order_by' => 'ORDER BY invnum', + 'element_name' => 'test_eventtable_num', + 'disable_empty' => 1, +&> + +
+
+ +<& /elements/footer.html &> +<%init> + +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); + +$cgi->param('custnum') =~ /^(\d+)$/ or die 'unknown custnum'; +my $custnum = $1; + +my $cust_main = FS::cust_main->by_key($custnum); + + -- 2.11.0