projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cardfortress backend support
[freeside.git]
/
httemplate
/
elements
/
select-cgp_rule_condition.html
diff --git
a/httemplate/elements/select-cgp_rule_condition.html
b/httemplate/elements/select-cgp_rule_condition.html
index
0c305d9
..
bc96ab4
100644
(file)
--- a/
httemplate/elements/select-cgp_rule_condition.html
+++ b/
httemplate/elements/select-cgp_rule_condition.html
@@
-3,11
+3,10
@@
<INPUT TYPE="hidden" NAME="<%$name%>" ID="<%$id%>" VALUE="<% $curr_value %>">
<% include( 'select.html',
<INPUT TYPE="hidden" NAME="<%$name%>" ID="<%$id%>" VALUE="<% $curr_value %>">
<% include( 'select.html',
- 'field' => $name.'_condition',
- 'id' => $id.'_condition',
+ 'field' => $name.'_condition
name
',
+ 'id' => $id.'_condition
name
',
'options' => \@conditions,
'options' => \@conditions,
- 'curr_value' => scalar($cgi->param($name.'_condition'))
- || $cgp_rule_condition->condition,
+ 'curr_value' => $conditionname,
'labels' => { '' => 'Select Condition' },
'onchange' => $name.'_changed',
)
'labels' => { '' => 'Select Condition' },
'onchange' => $name.'_changed',
)
@@
-190,7
+189,10
@@
if ( $curr_value ) {
$cgp_rule_condition = new FS::cgp_rule_condition {};
}
$cgp_rule_condition = new FS::cgp_rule_condition {};
}
-my @op = &$cond2op($curr_value);
+my $conditionname = scalar($cgi->param($name.'_conditionname'))
+ || $cgp_rule_condition->conditionname;
+
+my @op = &$cond2op($conditionname);
my $disabled = scalar(@op) ? '' : 1;
my $style = $disabled ? 'visibility:hidden' : '';
my $disabled = scalar(@op) ? '' : 1;
my $style = $disabled ? 'visibility:hidden' : '';