{ field => 'change_to_pkgpart',
type => 'select-part_pkg',
extra_sql => sub { $pkgpart
- ? "AND pkgpart != $pkgpart"
+ ? "AND part_pkg.pkgpart != $pkgpart"
: ''
},
empty_label => 'no package',
{ field=>'agent_pkgpartid', type=>'text', size=>21 },
{ type => 'tablebreak-tr-title',
- value => 'Line-item revenue recogition', #better name?
+ value => 'Line-item revenue recognition', #better name?
},
{ field=>'pay_weight', type=>'text', size=>6 },
{ field=>'credit_weight', type=>'text', size=>6 },
{ 'field' => 'bill_dst_pkgpart',
'type' => 'select-part_pkg',
'extra_sql' => sub { $pkgpart
- ? "AND pkgpart != $pkgpart"
+ ? "AND part_pkg.pkgpart != $pkgpart"
: ''
},
'label_callback' => sub { shift->pkg_comment_only },
'label' => 'Also include services from package: ',
'type' => 'select-part_pkg',
'extra_sql' => sub { $pkgpart
- ? "AND pkgpart != $pkgpart"
+ ? "AND part_pkg.pkgpart != $pkgpart"
: ''
},
'label_callback' => sub { shift->pkg_comment_only },
#$html .= '</SELECT></TD></TR>';
my $href = $plans{$layer}->{'fields'};
- my @fields = exists($plans{$layer}->{'fieldorder'})
- ? @{$plans{$layer}->{'fieldorder'}}
- : keys %{ $href };
+ my @fields;
+ if ( $plans{$layer}->{'fieldorder'} ) {
+ @fields = @{ $plans{$layer}->{'fieldorder'} };
+ } else {
+ warn "FS::part_pkg::$layer has no fieldorder.\n";
+ @fields = keys %$href;
+ }
# hash of dependencies for each of the Pricing Plan fields.
# make sure NOT to use double-quotes inside the 'msg' value.
}
}
};
-
+
foreach my $field ( grep $_ !~ /^(setup|recur)_fee$/, @fields ) {
if(!exists($href->{$field})) {
next if !$display;
}
- $html .= '<TR><TD ALIGN="right">'. $href->{$field}{'name'}. '</TD><TD>';
+ $html .= '<TR><TD ALIGN="right">'. $href->{$field}{'name'}. '</TD><TD>
+ ';
my $format = sub { shift };
$format = $href->{$field}{'format'} if exists($href->{$field}{'format'});
$html .= '</TD></TR>';
}
$html .= '</TABLE>';
-
- $html .= qq(<INPUT TYPE="hidden" NAME="${layer}__OPTIONS" VALUE=").
- join(',', keys %{ $href } ). '">';
+
+ $html .= include('/elements/hidden.html',
+ field => $layer.'__OPTIONS',
+ value => join(',', @fields)
+ );
$html;