'cgp_rule_condition' => {
'columns' => [
'ruleconditionnum', 'serial', '', '', '', '',
- 'condition', 'varchar', '', $char_d, '', '',
+ 'conditionname', 'varchar', '', $char_d, '', '',
'op', 'varchar', 'NULL', $char_d, '', '',
'params', 'varchar', 'NULL', 255, '', '',
'rulenum', 'int', '', '', '', '',
primary key
-=item condition
+=item conditionname
condition
my $error =
$self->ut_numbern('ruleconditionnum')
- || $self->ut_text('condition')
+ || $self->ut_text('conditionname')
|| $self->ut_textn('op')
|| $self->ut_textn('params')
|| $self->ut_foreign_key('rulenum', 'cgp_rule', 'rulenum')
=item arrayref
-Returns an array reference of the condition, op and params fields.
+Returns an array reference of the conditionname, op and params fields.
=cut
sub arrayref {
my $self = shift;
- [ map $self->$_, qw( condition op params ) ];
+ [ map $self->$_, qw( conditionname op params ) ];
}
=back
if (dbdef->table('h_cust_main'));
}
+if ( dbdef->table('cgp_rule_condition') &&
+ dbdef->table('cgp_rule_condition')->column('condition')
+ )
+{
+ push @bugfix,
+ "ALTER TABLE ${_}cgp_rule_condition RENAME COLUMN condition TO conditionname"
+ for '', 'h_';
+
+}
+
+if ( $DRY_RUN ) {
+ print
+ join(";\n", @bugfix ). ";\n";
+} elsif ( @bugfix ) {
+
+ foreach my $statement ( @bugfix ) {
+ warn "$statement\n";
+ $dbh->do( $statement )
+ or die "Error: ". $dbh->errstr. "\n executing: $statement";
+ }
+
+ dbdef_create($dbh, $dbdef_file);
+ delete $FS::Schema::dbdef_cache{$dbdef_file}; #force an actual reload
+ reload_dbdef($dbdef_file);
+
+}
+
#you should have run fs-migrate-part_svc ages ago, when you upgraded
#from 1.3 to 1.4... if not, it needs to be hooked into -upgrade here or
#you'll lose all the part_svc settings it migrates to part_svc_column
if ( $DRY_RUN ) {
print
- join(";\n", @bugfix, @statements ). ";\n";
+ join(";\n", @statements ). ";\n";
exit;
} else {
- foreach my $statement ( @bugfix, @statements ) {
+ foreach my $statement ( @statements ) {
warn "$statement\n";
$dbh->do( $statement )
or die "Error: ". $dbh->errstr. "\n executing: $statement";
[ map {
[
- { data => $_->condition,
+ { data => $_->conditionname,
#align =>
},
{ data => $_->op,
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 {
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,
};
'process_o2m' => [
{
'table' => 'cgp_rule_condition',
- 'fields' => [qw( condition op params )],
+ 'fields' => [qw( conditionname op params )],
},
{
'table' => 'cgp_rule_action',
<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',
)
$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' : '';