[freeside-commits] branch FREESIDE_3_BRANCH updated. ce0dabc99cf469db3abc85800b23be8dfcdd5790

[Christopher Burger]

The branch, FREESIDE_3_BRANCH has been updated
       via  ce0dabc99cf469db3abc85800b23be8dfcdd5790 (commit)
       via  f794618852978efcb4d135d8748c9b34f8b0ab5e (commit)
      from  14e9d4f4927bb71ab3ca6f368fb11f0e40cf1bf9 (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 ce0dabc99cf469db3abc85800b23be8dfcdd5790
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
    
    Conflicts:
    	httemplate/elements/checkboxes-table.html

diff --git a/FS/FS/part_event/Condition/has_cust_tag.pm b/FS/FS/part_event/Condition/has_cust_tag.pm
index ea56bcd..cc81f68 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 671cd1f..3c99401 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 %>: 

commit f794618852978efcb4d135d8748c9b34f8b0ab5e
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Tue Jun 27 13:58:13 2017 -0400

    RT# 76303 - added tag options to payments, batch payments, and statement billing event types

diff --git a/FS/FS/part_event/Condition/has_cust_tag.pm b/FS/FS/part_event/Condition/has_cust_tag.pm
index cde9338..ea56bcd 100644
--- a/FS/FS/part_event/Condition/has_cust_tag.pm
+++ b/FS/FS/part_event/Condition/has_cust_tag.pm
@@ -10,9 +10,12 @@ sub description {
 }
 
 sub eventtable_hashref {
-    { 'cust_main' => 1,
-      'cust_bill' => 1,
-      'cust_pkg'  => 1,
+    { 'cust_main'      => 1,
+      'cust_bill'      => 1,
+      'cust_pkg'       => 1,
+      'cust_pay'       => 1,
+      'cust_pay_batch' => 1,
+      'cust_statement' => 1,
     };
 }
 
diff --git a/FS/FS/part_event/Condition/hasnt_cust_tag.pm b/FS/FS/part_event/Condition/hasnt_cust_tag.pm
index e56151d..d69f1b1 100644
--- a/FS/FS/part_event/Condition/hasnt_cust_tag.pm
+++ b/FS/FS/part_event/Condition/hasnt_cust_tag.pm
@@ -9,9 +9,12 @@ sub description {
 }
 
 sub eventtable_hashref {
-    { 'cust_main' => 1,
-      'cust_bill' => 1,
-      'cust_pkg'  => 1,
+    { 'cust_main'      => 1,
+      'cust_bill'      => 1,
+      'cust_pkg'       => 1,
+      'cust_pay'       => 1,
+      'cust_pay_batch' => 1,
+      'cust_statement' => 1,
     };
 }
 

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

Summary of changes:
 FS/FS/part_event/Condition/has_cust_tag.pm   |   14 ++++++++------
 FS/FS/part_event/Condition/hasnt_cust_tag.pm |    9 ++++++---
 httemplate/elements/checkboxes-table.html    |   17 +++++++++++------
 3 files changed, 25 insertions(+), 15 deletions(-)