diff options
| author | Mark Wells <mark@freeside.biz> | 2012-03-12 20:24:22 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2012-03-12 20:24:22 -0700 |
| commit | fdd00d4549faaa9de8952402f77fa86d0b8b22ee (patch) | |
| tree | b45dc5430ace293ad93d8b97b9527420b3558748 /httemplate | |
| parent | 5665d202b0b91bb9ad685c209265b7a3405de768 (diff) | |
"day-of-month of customer signup" condition, #16827
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/browse/part_event.html | 3 | ||||
| -rw-r--r-- | httemplate/view/part_event-targets.html | 18 |
2 files changed, 17 insertions, 4 deletions
diff --git a/httemplate/browse/part_event.html b/httemplate/browse/part_event.html index 6be28602d..03996435e 100644 --- a/httemplate/browse/part_event.html +++ b/httemplate/browse/part_event.html @@ -45,7 +45,8 @@ my $link = [ $p.'edit/part_event.html?', 'eventpart' ]; my $event_sub = sub { my $part_event = shift; my $onclick = include('/elements/popup_link_onclick.html', - action => $p.'view/part_event-targets.html?'.$part_event->eventpart, + action => $p.'view/part_event-targets.html?eventpart='. + $part_event->eventpart, actionlabel => 'Event query - '.$part_event->event, width => 650, height => 420, diff --git a/httemplate/view/part_event-targets.html b/httemplate/view/part_event-targets.html index c5faccfd6..2029fd4bc 100644 --- a/httemplate/view/part_event-targets.html +++ b/httemplate/view/part_event-targets.html @@ -3,6 +3,16 @@ 'title' => 'Event query - '.$part_event->event, } &> +<FORM STYLE="display:inline" ACTION=<%$cgi->url%> METHOD="GET"> +When event is run on <& /elements/input-date-field.html, { + 'name' => 'date', + 'value' => $time, + 'format' => FS::Conf->new->config('date_format') || '%m/%d/%Y', +} &> +<INPUT TYPE="hidden" NAME="eventpart" VALUE="<%$eventpart%>"> +<INPUT TYPE="submit" VALUE="Refresh"> +</FORM> +<BR><BR> % if ( $objects > 0 ) { <% emt("[quant,_1,$label]", $objects) %> % if ( $part_event->eventtable ne 'cust_main' ) { @@ -18,8 +28,8 @@ % my @rowcolors = ('ffffff','eeeeee'); % my $row = 0; - <TR style="background-color:#<% $rowcolors[$row++ % 2] %>"> % foreach my $object (@targets) { + <TR style="background-color:#<% $rowcolors[$row++ % 2] %>"> % # now works for all eventtables, including cust_pkg % my $link = $p . 'view/' . $part_event->eventtable . '.cgi?' . % $object->$pkey; @@ -65,12 +75,14 @@ die "access denied" unless $curuser->access_right('Edit billing events') || $curuser->access_right('Edit global billing events'); -my ($eventpart) = $cgi->keywords; +my ($eventpart) = $cgi->param('eventpart'); $eventpart =~ /^\d+$/ or die 'illegal eventpart'; +my $time = parse_datetime($cgi->param('date')) || time; + my $part_event = FS::part_event->by_key($eventpart) or die "Event definition $eventpart not found.\n"; -my @targets = $part_event->targets; +my @targets = $part_event->targets('time' => $time); my $total = @targets; # in imitation of search/elements/search-html.html |