diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/browse/cgp_rule.html | 2 | ||||
| -rw-r--r-- | httemplate/edit/cgp_rule.html | 4 | ||||
| -rw-r--r-- | httemplate/edit/process/cgp_rule.html | 2 | ||||
| -rw-r--r-- | httemplate/elements/select-cgp_rule_condition.html | 12 |
4 files changed, 10 insertions, 10 deletions
diff --git a/httemplate/browse/cgp_rule.html b/httemplate/browse/cgp_rule.html index 6f7b3e087..5be6bb4aa 100644 --- a/httemplate/browse/cgp_rule.html +++ b/httemplate/browse/cgp_rule.html @@ -55,7 +55,7 @@ my $condition_sub = sub { [ map { [ - { data => $_->condition, + { data => $_->conditionname, #align => }, { data => $_->op, diff --git a/httemplate/edit/cgp_rule.html b/httemplate/edit/cgp_rule.html index d9c19a150..41275aba7 100644 --- a/httemplate/edit/cgp_rule.html +++ b/httemplate/edit/cgp_rule.html @@ -51,7 +51,7 @@ my %opt = @_; my $m2_error_callback_cond = sub { my($cgi, $object) = @_; - my @fields = qw( condition op params ); + my @fields = qw( conditionname op params ); my @gfields = ( '', map "_$_", @fields ); map { @@ -83,7 +83,7 @@ my $m2_error_callback_action = sub { if ( /^ruleactionnum(\d+)$/ ) { my $num = $1; if ( grep $cgi->param("ruleactionnum$num$_"), @gfields ) { - my $x = new FS::cgp_rule_condition { + my $x = new FS::cgp_rule_action { 'ruleactionnum' => $cgi->param("ruleactionnum$num"), map { $_ => scalar($cgi->param("ruleactionnum${num}_$_")) } @fields, }; diff --git a/httemplate/edit/process/cgp_rule.html b/httemplate/edit/process/cgp_rule.html index f427b6ccf..965341384 100644 --- a/httemplate/edit/process/cgp_rule.html +++ b/httemplate/edit/process/cgp_rule.html @@ -4,7 +4,7 @@ 'process_o2m' => [ { 'table' => 'cgp_rule_condition', - 'fields' => [qw( condition op params )], + 'fields' => [qw( conditionname op params )], }, { 'table' => 'cgp_rule_action', diff --git a/httemplate/elements/select-cgp_rule_condition.html b/httemplate/elements/select-cgp_rule_condition.html index 622cbe86d..bc96ab487 100644 --- a/httemplate/elements/select-cgp_rule_condition.html +++ b/httemplate/elements/select-cgp_rule_condition.html @@ -3,10 +3,10 @@ <INPUT TYPE="hidden" NAME="<%$name%>" ID="<%$id%>" VALUE="<% $curr_value %>"> <% include( 'select.html', - 'field' => $name.'_condition', - 'id' => $id.'_condition', + 'field' => $name.'_conditionname', + 'id' => $id.'_conditionname', 'options' => \@conditions, - 'curr_value' => $condition, + 'curr_value' => $conditionname, 'labels' => { '' => 'Select Condition' }, 'onchange' => $name.'_changed', ) @@ -189,10 +189,10 @@ if ( $curr_value ) { $cgp_rule_condition = new FS::cgp_rule_condition {}; } -my $condition = scalar($cgi->param($name.'_condition')) - || $cgp_rule_condition->condition; +my $conditionname = scalar($cgi->param($name.'_conditionname')) + || $cgp_rule_condition->conditionname; -my @op = &$cond2op($condition); +my @op = &$cond2op($conditionname); my $disabled = scalar(@op) ? '' : 1; my $style = $disabled ? 'visibility:hidden' : ''; |