diff options
| -rw-r--r-- | FS/FS/part_event/Condition/has_cust_tag.pm | 5 | ||||
| -rw-r--r-- | httemplate/elements/checkboxes-table.html | 17 |
2 files changed, 13 insertions, 9 deletions
diff --git a/FS/FS/part_event/Condition/has_cust_tag.pm b/FS/FS/part_event/Condition/has_cust_tag.pm index ea56bcd34..cc81f685f 100644 --- a/FS/FS/part_event/Condition/has_cust_tag.pm +++ b/FS/FS/part_event/Condition/has_cust_tag.pm @@ -1,9 +1,8 @@ package FS::part_event::Condition::has_cust_tag; +use base qw( FS::part_event::Condition ); use strict; - -use base qw( FS::part_event::Condition ); -use FS::Record qw( qsearch ); +#use FS::Record qw( qsearch ); sub description { 'Customer has tag', diff --git a/httemplate/elements/checkboxes-table.html b/httemplate/elements/checkboxes-table.html index 671cd1f9b..3c9940163 100644 --- a/httemplate/elements/checkboxes-table.html +++ b/httemplate/elements/checkboxes-table.html @@ -96,16 +96,21 @@ % % } % -% - - <INPUT TYPE="checkbox" NAME="<% $target_pkey. $targetnum %>" <% $checked %> VALUE="ON"> -% if ( $opt{'target_link'} ) { +% ### use name sent to function else use target table and key. +% my $checkbox_name; +% if ($opt{'field'}) { $checkbox_name = $opt{'field'}; } else { $checkbox_name = "$target_pkey$targetnum"; } +% ### use values sent to function rather than values in table to determine CHECKED if values are sent. +% my $values; +% if (ref $opt{'value'} eq ref {} ) { $values = $opt{'value'}; } +% else { foreach my $value ( split(/\,/, $opt{'value'}) ) { $values->{$value} = $value; } } +% if ($values->{$targetnum}) { $checked = "CHECKED"; } +% my $color_col = $opt{'color_col'}; + <INPUT TYPE="checkbox" NAME="<% $checkbox_name %>" <% $checked %> VALUE="<% $targetnum %>"><DIV STYLE="display:inline; background-color: #<% $color_col ? $target_obj->$color_col : '' %>"> +% if ( $opt{'target_link'} ) { <A HREF="<% $opt{'target_link'} %><% $targetnum %>"> -% -% % } % <% $targetnum %>: |