[freeside-commits] branch FREESIDE_4_BRANCH updated. f37c3c6ac7c133abc53b73527f1e0000701eeddc

[Christopher Burger]

The branch, FREESIDE_4_BRANCH has been updated
       via  f37c3c6ac7c133abc53b73527f1e0000701eeddc (commit)
      from  713396647226e3c2c9479f52f262460d41678ddd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f37c3c6ac7c133abc53b73527f1e0000701eeddc
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Tue Jul 11 11:22:07 2017 -0400

    RT# 76303 - fixed bug with tags not saving when selected

diff --git a/FS/FS/part_event/Condition/has_cust_tag.pm b/FS/FS/part_event/Condition/has_cust_tag.pm
index 8a2df14..0ca5ef5 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 d3bbab4..96d1303 100644
--- a/httemplate/elements/checkboxes-table.html
+++ b/httemplate/elements/checkboxes-table.html
@@ -101,10 +101,19 @@
 %
 %     }
 %
-%
+
+% ### 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="<% $target_pkey. $targetnum %>" <% $checked %> VALUE="ON"><DIV STYLE="display:inline; background-color: #<% $color_col ? $target_obj->$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 %>">
 %  }

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/part_event/Condition/has_cust_tag.pm |    5 ++---
 httemplate/elements/checkboxes-table.html  |   13 +++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)