X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=5e42687f94ea3c75fdaea9bdc93cd2bddb9dc13f;hp=6391db92ae499f49c18bb91db9cb1a83998fcf08;hb=9d878141d7230e6d1a3a913d30ee04b3f2448cf2;hpb=287bf810a8ae3528525fff354610afa606468299 diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi index 6391db92a..5e42687f9 100755 --- a/httemplate/edit/part_pkg.cgi +++ b/httemplate/edit/part_pkg.cgi @@ -12,7 +12,8 @@ $javascript, 'html_bottom' => $html_bottom, 'body_etc' => - 'onLoad="agent_changed(document.edit_topform.agentnum)"', + 'onLoad="agent_changed(document.edit_topform.agentnum); + hide_supp_pkgs()"', 'begin_callback' => $begin_callback, 'end_callback' => $end_callback, @@ -24,11 +25,15 @@ 'error_callback' => $error_callback, 'field_callback' => $field_callback, + 'onsubmit' => 'confirm_submit', + 'labels' => { 'pkgpart' => 'Package Definition', - 'pkg' => 'Package (customer-visible)', + 'pkg' => 'Package', + %locale_field_labels, 'comment' => 'Comment (customer-hidden)', 'classnum' => 'Package class', + 'addon_classnum' => 'Restrict additional orders to package class', 'promo_code' => 'Promotional code', 'freq' => 'Recurring fee frequency', 'setuptax' => 'Setup fee tax exempt', @@ -37,15 +42,27 @@ 'taxproduct_select'=> 'Tax products', 'plan' => 'Price plan', 'disabled' => 'Disable new orders', + 'disable_line_item_date_ranges' => 'Disable line item date ranges', + 'start_on_hold' => 'Start on hold', 'setup_cost' => 'Setup cost', 'recur_cost' => 'Recur cost', 'pay_weight' => 'Payment weight', 'credit_weight' => 'Credit weight', - 'agentnum' => 'Agent', + 'agent_pkgpartid' => 'External ID', + 'agentnum' => 'Agent', + 'agent_type' => ' ', #just its title headingn is fine 'setup_fee' => 'Setup fee', + 'setup_show_zero' => 'Show zero setup', 'recur_fee' => 'Recurring fee', + 'recur_show_zero' => 'Show zero recurring', + 'discountnum' => 'Offer discounts for longer terms', 'bill_dst_pkgpart' => 'Include line item(s) from package', 'svc_dst_pkgpart' => 'Include services of package', + 'supp_dst_pkgpart' => 'When ordering package, also order', + 'report_option' => 'Report classes', + 'fcc_ds0s' => 'Voice-grade equivalents', + 'fcc_voip_class' => 'Category', + 'delay_start' => 'Default delay (days)', }, 'fields' => [ @@ -58,6 +75,10 @@ sub { shift->param('pkgnum') }, }, + { field=>'custom', type=>'hidden' }, + { field=>'family_pkgpart', type=>'hidden' }, + { field=>'successor', type=>'hidden' }, + { type => 'columnstart' }, { field => 'pkg', @@ -65,6 +86,7 @@ size => 40, #32 maxlength => 50, }, + #@locale_fields, {field=>'comment', type=>'text', size=>40 }, #32 { field => 'agentnum', type => 'select-agent', @@ -73,18 +95,37 @@ onchange => 'agent_changed', }, {field=>'classnum', type=>'select-pkg_class' }, + ( $conf->exists('pkg-addon_classnum') + ? ( { field=>'addon_classnum', + type =>'select-pkg_class', + } + ) + : () + ), {field=>'disabled', type=>$disabled_type, value=>'Y'}, + {field=>'disable_line_item_date_ranges', type=>$disabled_type, value=>'Y'}, + { field => 'start_on_hold', + type => 'checkbox', + value => 'Y' + }, - { type => 'tablebreak-tr-title', - value => 'Pricing', #better name? + { type => 'tablebreak-tr-title', + value => 'Pricing', #better name? }, - { field => 'plan', - type => 'selectlayers-select', - options => [ keys %plan_labels ], - labels => \%plan_labels, + { field => 'plan', + type => 'selectlayers-select', + options => [ keys %plan_labels ], + labels => \%plan_labels, + onchange => 'aux_planchanged(what);', }, - { field => 'setup_fee', - type => 'money', + { field => 'setup_fee', + type => 'money', + onchange => 'setup_changed', + }, + { field => 'setup_show_zero', + type => 'checkbox', + value => 'Y', + disabled => sub { $setup_show_zero_disabled }, }, { field => 'freq', type => 'part_pkg_freq', @@ -93,8 +134,15 @@ { field => 'recur_fee', type => 'money', disabled => sub { $recur_disabled }, + onchange => 'recur_changed', + }, + + { field => 'recur_show_zero', + type => 'checkbox', + value => 'Y', + disabled => sub { $recur_show_zero_disabled }, }, - + #price plan #setup fee #recurring frequency @@ -135,14 +183,35 @@ { type => 'tablebreak-tr-title', value => 'Cost tracking', #better name? }, - { field=>'setup_cost', type=>'money', }, - { field=>'recur_cost', type=>'money', }, + + ( $curuser->access_right('Edit package definition costs') + ? ( { field=>'setup_cost', type=>'money', }, + { field=>'recur_cost', type=>'money', }, + ) + : ( { field=>'setup_cost', type=>'fixed', }, + { field=>'recur_cost', type=>'fixed', }, + ) + ), + + ( $conf->exists('part_pkg-delay_start') + ? ( { type => 'tablebreak-tr-title', + value => 'Delayed start', + }, + { field => 'delay_start', + type => 'text', size => 6 }, + ) + : () + ), { type => 'columnnext' }, - { field => 'agent_type', - type => 'select-agent_types', - disabled => ! $acl_edit_global, + {type=>'justtitle', value=>'Agent (reseller) types' }, + + { field => 'agent_type', + type => 'select-agent_type', + disabled => ! $acl_edit_global, + element_etc => 'size="10"', + multiple => '1', #cause edit.html is dum curr_value_callback => sub { my($cgi, $object, $field) = @_; #in the other callbacks..? hmm. @@ -150,25 +219,91 @@ }, }, - { type => 'tablebreak-tr-title', - value => 'Line-item revenue recogition', #better name? - }, - { field=>'pay_weight', type=>'text', size=>6 }, - { field=>'credit_weight', type=>'text', size=>6 }, + { type => 'tablebreak-tr-title', + value => 'External Links', #better name? + }, + { field=>'agent_pkgpartid', type=>'text', size=>21 }, + + { type => 'tablebreak-tr-title', + value => 'Line-item revenue recogition', #better name? + }, + { field=>'pay_weight', type=>'text', size=>6 }, + { field=>'credit_weight', type=>'text', size=>6 }, + ($fcc_opts ? ( + { type => 'tablebreak-tr-title', + value => 'FCC Form 477 information', + }, + { field => 'fcc_options_string', + type => 'input-fcc_options', + curr_value_callback => sub { + my ($cgi, $part_pkg, $fref) = @_; + if ( $cgi->param('fcc_options_string') ) { + # error redirect + return $cgi->param('fcc_options_string'); + } + my %hash; + %hash = $part_pkg->fcc_options + if ($part_pkg->pkgpart); + return encode_json(\%hash); + }, + }, + ) : () + ), + { type => 'columnend' }, + { 'type' => $report_option ? 'tablebreak-tr-title' + : 'hidden', + 'value' => 'Optional report classes', + 'field' => 'census_title', + }, + { 'field' => 'report_option', + 'type' => $report_option ? 'select-table' + : 'hidden', + 'table' => 'part_pkg_report_option', + 'name_col' => 'name', + 'hashref' => { 'disabled' => '' }, + 'multiple' => 1, + }, - { type => 'columnend' }, + { 'type' => 'tablebreak-tr-title', + 'value' => 'Term discounts', + }, + { 'field' => 'discountnum', + 'type' => 'select-table', + 'table' => 'discount', + 'name_col' => 'name', + 'hashref' => { %$discountnum_hashref }, + #'extra_sql' => 'AND (months IS NOT NULL OR months != 0)', + 'empty_label'=> 'Select discount', + 'm2_label' => 'Offer discounts for longer terms', + 'm2m_method' => 'part_pkg_discount', + 'm2m_dstcol' => 'discountnum', + 'm2_error_callback' => $discount_error_callback, + }, - { 'type' => 'tablebreak-tr-title', - 'value' => 'Pricing add-ons', + { 'type' => 'tablebreak-tr-title', + 'value' => 'Pricing add-ons', + 'colspan' => 4, }, { 'field' => 'bill_dst_pkgpart', 'type' => 'select-part_pkg', + 'extra_sql' => sub { $pkgpart + ? "AND pkgpart != $pkgpart" + : '' + }, ++ 'label_callback' => sub { shift->pkg_comment_only }, 'm2_label' => 'Include line item(s) from package', 'm2m_method' => 'bill_part_pkg_link', 'm2m_dstcol' => 'dst_pkgpart', 'm2_error_callback' => &{$m2_error_callback_maker}('bill'), + 'm2_fields' => [ { 'field' => 'hidden', + 'type' => 'checkbox', + 'value' => 'Y', + 'curr_value' => '', + 'label' => 'Bundle', + }, + ], }, { type => 'tablebreak-tr-title', @@ -179,6 +314,11 @@ { 'field' => 'svc_dst_pkgpart', 'label' => 'Also include services from package: ', 'type' => 'select-part_pkg', + 'extra_sql' => sub { $pkgpart + ? "AND pkgpart != $pkgpart" + : '' + }, ++ 'label_callback' => sub { shift->pkg_comment_only }, 'm2_label' => 'Include services of package: ', 'm2m_method' => 'svc_part_pkg_link', 'm2m_dstcol' => 'dst_pkgpart', @@ -186,6 +326,23 @@ &{$m2_error_callback_maker}('svc'), }, + { 'type' => 'tablebreak-tr-title', + 'value' => 'Supplemental packages', + 'colspan' => '4', + 'include_opt_callback' => sub { + 'id' => 'show_supp_pkgs', + }, + }, + { 'field' => 'supp_dst_pkgpart', + 'type' => 'select-part_pkg', ++ 'label_callback' => sub { shift->pkg_comment_only }, + 'm2_label' => 'When ordering package, also order', + 'm2m_method' => 'supp_part_pkg_link', + 'm2m_dstcol' => 'dst_pkgpart', + 'm2_error_callback' => + &{$m2_error_callback_maker}('supp'), + }, + { type => 'tablebreak-tr-title', value => 'Price plan options', }, @@ -215,17 +372,43 @@ my $begin_callback = sub { my $disabled_type = $acl_edit_either ? 'checkbox' : 'hidden'; +#arg. access rights for cloning are Hard. +# on the one hand we don't really want cloning (customizing a package) to fail +# for want of finding the source package in normal usage +# on the other hand, we don't want people using the clone link to be able to +# see my $agent_clone_extra_sql = ' ( '. FS::part_pkg->curuser_pkgs_sql. - #kludge to clone custom customer packages you otherwise couldn't see - #really need a proper "CUSTOM" flag that's distinct from disabled - #" OR ( part_pkg.disabled = 'Y' AND part_pkg.comment LIKE '(CUSTOM)%' ) ". - " OR ( part_pkg.disabled = 'Y' ) ". + " OR ( part_pkg.custom = 'Y' ) ". ' ) '; my $conf = new FS::Conf; my $taxproducts = $conf->exists('enable_taxproducts'); +my $fcc_opts = $conf->exists('part_pkg-show_fcc_options'); + +my @locales = grep { ! /^en_/i } $conf->config('available-locales'); #should filter from the default locale lang instead of en_ +my %locale_labels = map { + ( $_ => 'Package -- '. FS::Locales->description($_) ) +} @locales; +@locales = + sort { $locale_labels{$a} cmp $locale_labels{$b} } + @locales; + +my $n = 0; +my %locale_field_labels = ( + map { + ( 'pkgpartmsgnum'. $n++. '_pkg' => $locale_labels{$_} ); + } + @locales +); + +my $sth = dbh->prepare("SELECT COUNT(*) FROM part_pkg_report_option". + " WHERE disabled IS NULL OR disabled = '' ") + or die dbh->errstr; +$sth->execute or die $sth->errstr; +my $report_option = $sth->fetchrow_arrayref->[0]; + #XXX # - tr-part_pkg_freq: month_increments_only (from price plans) # - test cloning @@ -246,6 +429,46 @@ my @taxproductnums = ( qw( setup recur ), sort (keys %taxproductnums) ); my %options = (); my $recur_disabled = 1; +my $setup_show_zero_disabled = 0; +my $recur_show_zero_disabled = 1; + +my $pkgpart = ''; + +my $splice_locale_fields = sub { + my( $fields, $pkey_value_callback, $pkg_value_callback ) = @_; + + my $n = 0; + my @locale_fields = ( + map { + my $pkey_value= $pkey_value_callback ? &$pkey_value_callback($_) : ''; + my $pkg_value = $pkg_value_callback + ? $pkg_value_callback eq 'cgiparam' + ? $cgi->param('pkgpartmsgnum'. $n. '_pkg') + : &$pkg_value_callback($_) + : ''; + ( + { field => 'pkgpartmsgnum'. $n, + type => 'hidden', + value => $pkey_value, + }, + { field => 'pkgpartmsgnum'. $n. '_locale', + type => 'hidden', + value => $_, + }, + { field => 'pkgpartmsgnum'. $n++. '_pkg', + type => 'text', + size => 40, + #maxlength => 50, + value => $pkg_value, + }, + ); + + } + @locales + ); + splice(@$fields, 7, 0, @locale_fields); #XXX 7 is arbitrary above + +}; my $error_callback = sub { my($cgi, $object, $fields, $opt ) = @_; @@ -254,7 +477,13 @@ my $error_callback = sub { $opt->{action} = 'Custom' if $cgi->param('pkgnum'); + $setup_show_zero_disabled = ($cgi->param('setup_fee') > 0) ? 1 : 0; + $recur_disabled = $cgi->param('freq') ? 0 : 1; + $recur_show_zero_disabled = + $cgi->param('freq') + ? $cgi->param('recur_fee') > 0 ? 1 : 0 + : 1; foreach ($cgi->param) { /^usage_taxproductnum_(\d+)$/ && ($taxproductnums{$1} = 1); @@ -276,9 +505,20 @@ my $error_callback = sub { } @options; - #$cgi->param($_, $options{$_}) foreach (qw( setup_fee recur_fee )); $object->set($_ => scalar($cgi->param($_)) ) - foreach (qw( setup_fee recur_fee )); + foreach (qw( setup_fee recur_fee disable_line_item_date_ranges )); + + $pkgpart = $object->pkgpart; + + &$splice_locale_fields( + $fields, + sub { + my $locale = shift; + my $part_pkg_msgcat = $object->part_pkg_msgcat($locale); + $part_pkg_msgcat ? $part_pkg_msgcat->pkgpartmsgnum : ''; + }, + 'cgiparam' + ); }; @@ -289,31 +529,75 @@ my $new_object_callback = sub { my $part_pkg = FS::part_pkg->new( $hashref ); $part_pkg->set($_ => '0') - foreach (qw( setup_fee recur_fee )); + foreach (qw( setup_fee recur_fee disable_line_item_date_ranges )); $part_pkg; }; -my $edit_callback = sub { - my( $cgi, $object, $fields, $opt ) = @_; - - $recur_disabled = $object->freq ? 0 : 1; - - (@agent_type) = map {$_->typenum} qsearch('type_pkgs',{'pkgpart'=>$1}); +sub set_report_option { + my($cgi, $object, $fields ) = @_; #, $opt + my @report_option = (); foreach ($object->options) { /^usage_taxproductnum_(\d+)$/ && ($taxproductnums{$1} = 1); + /^report_option_(\d+)$/ && (push @report_option, $1); } foreach ($object->part_pkg_taxoverride) { $taxproductnums{$_->usage_class} = 1 if $_->usage_class; } + $cgi->param('report_option', join(',', @report_option)); + foreach my $field ( @$fields ) { + next unless ( + ref($field) eq 'HASH' && + $field->{field} && + $field->{field} eq 'report_option' + ); + #$field->{curr_value} = join(',', @report_option); + $field->{value} = join(',', @report_option); + } + +} + +my $edit_callback = sub { + my( $cgi, $object, $fields, $opt ) = @_; + + $setup_show_zero_disabled = ($object->option('setup_fee') > 0) ? 1 : 0; + + $recur_disabled = $object->freq ? 0 : 1; + + $recur_show_zero_disabled = + $object->freq + ? $object->option('recur_fee') > 0 ? 1 : 0 + : 1; + + (@agent_type) = + map {$_->typenum} qsearch('type_pkgs', { 'pkgpart' => $object->pkgpart } ); + + set_report_option( $cgi, $object, $fields); + %options = $object->options; - $object->set($_ => $object->option($_)) - foreach (qw( setup_fee recur_fee )); + $object->set($_ => $object->option($_, 1)) + foreach (qw( setup_fee recur_fee disable_line_item_date_ranges )); + + $pkgpart = $object->pkgpart; + + &$splice_locale_fields( + $fields, + sub { + my $locale = shift; + my $part_pkg_msgcat = $object->part_pkg_msgcat($locale); + $part_pkg_msgcat ? $part_pkg_msgcat->pkgpartmsgnum : ''; + }, + sub { + my $locale = shift; + my $part_pkg_msgcat = $object->part_pkg_msgcat($locale); + $part_pkg_msgcat ? $part_pkg_msgcat->pkg : ''; + } + ); }; @@ -321,11 +605,16 @@ my $new_callback = sub { my( $cgi, $object, $fields ) = @_; my $conf = new FS::Conf; + if ( $conf->exists('agent_defaultpkg') ) { #my @all_agent_types = map {$_->typenum} qsearch('agent_type',{}); @agent_type = map {$_->typenum} qsearch('agent_type',{}); } + $options{'suspend_bill'}=1 if $conf->exists('part_pkg-default_suspend_bill'); + + &$splice_locale_fields($fields, '', ''); + }; my $clone_callback = sub { @@ -339,36 +628,78 @@ my $clone_callback = sub { $opt->{action} = 'Custom'; #my $part_pkg = $clone_part_pkg->clone; - #this is all clone did anyway - $object->comment( '(CUSTOM) '. $object->comment ) - unless $object->comment =~ /^\(CUSTOM\) /; + #this is all clone does anyway + $object->custom('Y'); $object->disabled('Y'); + } else { #when explicitly cloning, not customizing + + (@agent_type) = + map {$_->typenum} qsearch('type_pkgs',{ 'pkgpart' => $object->pkgpart } ); + } + set_report_option( $cgi, $object, $fields); + %options = $object->options; $object->set($_ => $options{$_}) - foreach (qw( setup_fee recur_fee )); + foreach (qw( setup_fee recur_fee disable_line_item_date_ranges )); $recur_disabled = $object->freq ? 0 : 1; + + &$splice_locale_fields( + $fields, + '', + sub { + my $locale = shift; + my $part_pkg_msgcat = $object->part_pkg_msgcat($locale); + $part_pkg_msgcat ? $part_pkg_msgcat->pkg : ''; + } + ); +}; + +my $discount_error_callback = sub { + my( $cgi, $object ) = @_; + map { + if ( /^discountnum(\d+)$/ && + ( my $discountnum = $cgi->param("discountnum$1") ) ) + { + new FS::part_pkg_discount { + 'pkgpart' => $object->pkgpart, + 'discountnum' => $discountnum, + }; + } else { + (); + } + } + $cgi->param; }; my $m2_error_callback_maker = sub { my $link_type = shift; #yay closures return sub { my( $cgi, $object ) = @_; - map { - new FS::part_pkg_link { - 'link_type' => $link_type, - 'src_pkgpart' => $object->pkgpart, - 'dst_pkgpart' => $_, - }; - } - grep $_, - map $cgi->param($_), - grep /^${link_type}_dst_pkgpart(\d+)$/, $cgi->param; + map { + + if ( /^${link_type}_dst_pkgpart(\d+)$/ && + ( my $dst = $cgi->param("${link_type}_dst_pkgpart$1") ) ) + { + + my $hidden = $cgi->param("${link_type}_dst_pkgpart__hidden$1") + || ''; + new FS::part_pkg_link { + 'link_type' => $link_type, + 'src_pkgpart' => $object->pkgpart, + 'dst_pkgpart' => $dst, + 'hidden' => $hidden, + }; + } else { + (); + } + } + $cgi->param; }; }; @@ -381,16 +712,43 @@ my $javascript = <<'END'; if ( freq == '0' ) { what.form.recur_fee.disabled = true; what.form.recur_fee.style.backgroundColor = '#dddddd'; + what.form.recur_show_zero.disabled = true; + //what.form.recur_show_zero.style.backgroundColor= '#dddddd'; } else { what.form.recur_fee.disabled = false; what.form.recur_fee.style.backgroundColor = '#ffffff'; + recur_changed( what.form.recur_fee ); + //what.form.recur_show_zero.style.backgroundColor= '#ffffff'; } } + function setup_changed(what) { + var setup = what.value; + if ( parseFloat(setup) == 0 ) { + what.form.setup_show_zero.disabled = false; + } else { + what.form.setup_show_zero.disabled = true; + } + } + + function recur_changed(what) { + var recur = what.value; + if ( parseFloat(recur) == 0 ) { + what.form.recur_show_zero.disabled = false; + } else { + what.form.recur_show_zero.disabled = true; + } + } + function agent_changed(what) { - var agentnum = what.options[what.selectedIndex].value; + var agentnum; + if ( what.type == 'select-one' ) { + agentnum = what.options[what.selectedIndex].value; + } else { + agentnum = what.value; + } if ( agentnum == 0 ) { what.form.agent_type.disabled = false; @@ -404,9 +762,72 @@ my $javascript = <<'END'; } - + function aux_planchanged(what) { //? + + var plan = what.options[what.selectedIndex].value; + var table = document.getElementById('TableNumber6') // XXX NOT ROBUST + + if ( plan == 'flat' || plan == 'prorate' || plan == 'subscription' ) { + //table.disabled = false; + table.style.visibility = ''; + } else { + //table.disabled = true; + table.style.visibility = 'hidden'; + } + + } + + // some magic to make "supplemental packages" less obvious + var supp_pkg_rows = []; + function show_supp_pkgs_click() { + supp_pkg_rows[0].style.display = ''; + this.onclick = ''; + this.style.backgroundColor = ''; + this.style.border = ''; + this.style.padding = ''; + } + + function hide_supp_pkgs() { + var all_selects = document.getElementsByTagName('select'); + for (var i=0; i < all_selects.length; i++) { + if ( all_selects[i].id.match(/^supp_dst_pkgpart/) ) { + supp_pkg_rows.push( all_selects[i].parentNode.parentNode ); + } + } + if ( supp_pkg_rows.length == 1 ) { + // there are none configured, so hide the row to create a new one + supp_pkg_rows[0].style.display = 'none'; + var button = document.getElementById('show_supp_pkgs'); + button.onclick = show_supp_pkgs_click; + button.style.backgroundColor = '#cccccc'; + button.style.border = '1px solid #7e0079'; + button.style.padding = '1px'; + } + } + END +my $warning = + 'Changing the setup or recurring fee will create a new package definition. '. + 'Continue?'; + +$javascript .= "function confirm_submit(f) {"; +if ( $conf->exists('part_pkg-lineage') ) { + $javascript .= " + + var fields = Array('setup_fee','recur_fee'); + for(var i=0; i < fields.length; i++) { + if ( f[fields[i]].value != f[fields[i]].defaultValue ) { + return confirm('$warning'); + } + } +"; +} +$javascript .= " + return true; +} +"; + tie my %plans, 'Tie::IxHash', %{ FS::part_pkg::plan_info() }; tie my %plan_labels, 'Tie::IxHash', @@ -437,7 +858,8 @@ my $html_bottom = sub { # $html .= ' SELECTED' if $freq eq $part_pkg->freq; # $html .= ">$freq{$freq}"; #} - #$html .= ''; + + #$html .= ''; my $href = $plans{$layer}->{'fields'}; my @fields = exists($plans{$layer}->{'fieldorder'}) @@ -446,6 +868,17 @@ my $html_bottom = sub { foreach my $field ( grep $_ !~ /^(setup|recur)_fee$/, @fields ) { + if(!exists($href->{$field})) { + # shouldn't happen + warn "nonexistent part_pkg option: '$field'\n"; + next; + } + if ( exists($href->{$field}->{display_if}) ) { + my %args = ( 'plan' => $layer ); # anything else? + my $display = &{ $href->{$field}->{display_if} }(%args); + next if !$display; + } + $html .= ''. $href->{$field}{'name'}. ''; my $format = sub { shift }; @@ -469,13 +902,27 @@ my $html_bottom = sub { ? ' CHECKED' : '' ). '>'; - + + } elsif ( $href->{$field}{'type'} eq 'select-rate' ) { + + $html .= include('/elements/select-rate.html', + 'field' => $layer.'__'.$field, + 'curr_value' => $options{$field}, + map { $_ => $href->{$field}{$_} } + grep { $_ !~ /^(name|type)$/ } + keys %{ $href->{$field} } + ); + } elsif ( $href->{$field}{'type'} =~ /^select/ ) { $html .= '{$field}{'type'} eq 'select_multiple'; $html .= qq! NAME="${layer}__$field">!; + + $html .= '