diff options
| -rw-r--r-- | htetc/handler.pl | 3 | ||||
| -rwxr-xr-x | httemplate/edit/part_pkg.cgi | 44 | ||||
| -rwxr-xr-x | httemplate/edit/process/part_pkg.cgi | 2 |
3 files changed, 23 insertions, 26 deletions
diff --git a/htetc/handler.pl b/htetc/handler.pl index c1ca954e1..164da3702 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -119,8 +119,7 @@ sub handler use Chart::LinesPoints; use Chart::Mountain; use Color::Scheme; - use HTML::Widgets::SelectLayers 0.06; - #use HTML::Widgets::SelectLayers 0.07; # after 1.7.2 + use HTML::Widgets::SelectLayers 0.07; use Locale::Country; use FS; use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name); diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi index 77822d7e0..ce3e8547f 100755 --- a/httemplate/edit/part_pkg.cgi +++ b/httemplate/edit/part_pkg.cgi @@ -159,23 +159,23 @@ Line-item revenue recognition </TD><TD VALIGN="top"> -%#Reseller information # after 1.7.2 -%#<% ntable("#cccccc", 2) %> -%# <TR> -%# <TD ALIGN="right"><% 'Agent Types' %></TD> -%# <TD> -%# <% include( '/elements/select-table.html', -%# 'element_name' => 'agent_type', -%# 'table' => 'agent_type', -%# 'name_col' => 'atype', -%# 'value' => \@agent_type, -%# 'empty_label' => '(none)', -%# 'element_etc' => 'multiple size="10"', -%# ) -%# %> -%# </TD> -%# </TR> -%#</TABLE> +Reseller information +<% ntable("#cccccc", 2) %> + <TR> + <TD ALIGN="right"><% 'Agent Types' %></TD> + <TD> + <% include( '/elements/select-table.html', + 'element_name' => 'agent_type', + 'table' => 'agent_type', + 'name_col' => 'atype', + 'value' => \@agent_type, + 'empty_label' => '(none)', + 'element_etc' => 'multiple size="10"', + ) + %> + </TD> + </TR> +</TABLE> </TD></TR></TABLE> % % @@ -271,9 +271,7 @@ Line-item revenue recognition %#} else { %# push @fixups, 'taxclass'; #hidden %#} -%my @form_elements = ( 'classnum', 'taxclass' ); -%# copying non-existant elements is probably harmless, but after 1.7.2 -%#my @form_elements = ( 'classnum', 'taxclass', 'agent_type' ); +%my @form_elements = ( 'classnum', 'taxclass', 'agent_type' ); % %my @form_radio = (); %if ( dbdef->table('pkg_svc')->column('primary_svc') ) { @@ -330,7 +328,7 @@ Line-item revenue recognition % ( exists($plandata{$field}) % ? $plandata{$field} % : $href->{$field}{'default'} ). -% qq!" onChange="fchanged(this)">!; #after 1.7.2 +% qq!">!; % } elsif ( $href->{$field}{'type'} eq 'checkbox' ) { % $html .= qq!<INPUT TYPE="checkbox" NAME="$field" VALUE=1 !. % ( exists($plandata{$field}) && $plandata{$field} @@ -341,7 +339,7 @@ Line-item revenue recognition % $html .= '<SELECT'; % $html .= ' MULTIPLE' % if $href->{$field}{'type'} eq 'select_multiple'; -% $html .= qq! NAME="$field" onChange="fchanged(this)">!; # after 1.7.2 +% $html .= qq! NAME="$field">!; % % if ( $href->{$field}{'select_table'} ) { % foreach my $record ( @@ -385,7 +383,7 @@ Line-item revenue recognition % % $html .= '<INPUT TYPE="submit" VALUE="'. % ( $hashref->{pkgpart} ? "Apply changes" : "Add package" ). -% '" onClick="fchanged(this)">'; #after 1.7.2 +% '">'; % % $html; % diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi index 55e7e05ae..1158222b6 100755 --- a/httemplate/edit/process/part_pkg.cgi +++ b/httemplate/edit/process/part_pkg.cgi @@ -55,7 +55,7 @@ % $pkgpart = $new->pkgpart; %} % -%unless (1 || $error) { # after 1.7.2 +%unless ($error) { % my $error = $new->process_m2m( % 'link_table' => 'type_pkgs', % 'target_table' => 'agent_type', |