X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fcgp_rule.html;h=41275aba779813d70f5499fa5594c49082133347;hp=6f2d801616dc6285ae06ebdf23e44d8c0a577d82;hb=75e11f1d1a5ced24496b5732e290f7762403feb8;hpb=6874a21f3cb26a167e49cc1324df30119c6ed75d

diff --git a/httemplate/edit/cgp_rule.html b/httemplate/edit/cgp_rule.html
index 6f2d80161..41275aba7 100644
--- a/httemplate/edit/cgp_rule.html
+++ b/httemplate/edit/cgp_rule.html
@@ -10,29 +10,29 @@
                          },
              'fields' => [ 'name',
                            'comment',
-                           { 'field'   => 'priority',
-                             'type'    => 'select',
-                             'options' => [ 0 .. 10 ],
-                             'labels'  => { 0 => 'Inactive' },
+                           { 'field'     => 'priority',
+                             'type'      => 'select',
+                             'options'   => [ 0 .. 10 ],
+                             'labels'    => { 0 => 'Inactive' },
                            },
-                           { 'field'   => 'svcnum', 'type' => 'hidden', },
-                           { 'type'    => 'tablebreak-tr-title',
-                             'value'   => 'Conditions',
+                           { 'field'     => 'svcnum', 'type' => 'hidden', },
+                           { 'type'      => 'tablebreak-tr-title',
+                             'value'     => 'Conditions',
                            },
-                           { 'field'   => 'ruleconditionnum',
-                             'type'    => 'select-cgp_rule_condition',
+                           { 'field'     => 'ruleconditionnum',
+                             'type'      => 'select-cgp_rule_condition',
                              'o2m_table' => 'cgp_rule_condition',
-                             'm2_label' => 'Condition',
-                             #XXX m2_error_callback
+                             'm2_label'  => 'Condition',
+                             'm2_error_callback' => $m2_error_callback_cond,
                            },
-                           { 'type'    => 'tablebreak-tr-title',
-                             'value'   => 'Actions',
+                           { 'type'      => 'tablebreak-tr-title',
+                             'value'     => 'Actions',
                            },
-                           { 'field'   => 'ruleactionnum',
-                             'type'    => 'select-cgp_rule_action',
+                           { 'field'     => 'ruleactionnum',
+                             'type'      => 'select-cgp_rule_action',
                              'o2m_table' => 'cgp_rule_action',
-                             'm2_label' => 'Action',
-                             #XXX m2_error_callback
+                             'm2_label'  => 'Action',
+                             'm2_error_callback' => $m2_error_callback_action,
                            },
                          ],
              'new_callback' => sub { my( $cgi, $cgp_rule ) = @_;
@@ -46,7 +46,57 @@
 
 my %opt = @_;
 
-#my $svcnum #huh XXX
 #my $viewall_url = $p. "browse/$table.html?svcnum=$svcnum";
 
+my $m2_error_callback_cond = sub {
+  my($cgi, $object) = @_;
+
+  my @fields = qw( conditionname op params );
+  my @gfields = ( '', map "_$_", @fields );
+
+  map {
+        if ( /^ruleconditionnum(\d+)$/ ) {
+          my $num = $1;
+          if ( grep $cgi->param("ruleconditionnum$num$_"), @gfields ) {
+            my $x = new FS::cgp_rule_condition {
+              'ruleconditionnum' => $cgi->param("ruleconditionnum$num"),
+              map { $_ => scalar($cgi->param("ruleconditionnum${num}_$_")) } @fields,
+            };
+            $x;
+          } else {
+            ();
+          }
+        } else {
+          ();
+        }
+      }
+      $cgi->param;
+};
+
+my $m2_error_callback_action = sub {
+  my($cgi, $object) = @_;
+
+  my @fields = qw( action params );
+  my @gfields = ( '', map "_$_", @fields );
+
+  map {
+        if ( /^ruleactionnum(\d+)$/ ) {
+          my $num = $1;
+          if ( grep $cgi->param("ruleactionnum$num$_"), @gfields ) {
+            my $x = new FS::cgp_rule_action {
+              'ruleactionnum' => $cgi->param("ruleactionnum$num"),
+              map { $_ => scalar($cgi->param("ruleactionnum${num}_$_")) } @fields,
+            };
+            $x;
+          } else {
+            ();
+          }
+        } else {
+          ();
+        }
+      }
+      $cgi->param;
+
+};
+
 </%init>