From 6a10d16ff4e806357abab206254aa38c80a749d3 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 11 Feb 2011 23:59:29 +0000 Subject: rate selection by CDR type, RT#10991 --- httemplate/browse/elements/browse.html | 2 +- httemplate/browse/rate.cgi | 7 ++++-- httemplate/browse/rate_detail.html | 40 ------------------------------ httemplate/browse/rate_region.html | 2 +- httemplate/edit/cdr_type.cgi | 31 +++++++++++++++++++++++ httemplate/edit/process/cdr_type.cgi | 42 ++++++++++++++++++++++++++++++++ httemplate/edit/rate.cgi | 32 +++++++++++++++++++++--- httemplate/edit/rate_detail.html | 4 +++ httemplate/edit/rate_region.cgi | 31 ++++++++++++++++------- httemplate/elements/auto-table.html | 9 +++++-- httemplate/elements/select-cdr_type.html | 11 +++++++++ 11 files changed, 152 insertions(+), 59 deletions(-) delete mode 100644 httemplate/browse/rate_detail.html create mode 100644 httemplate/edit/cdr_type.cgi create mode 100644 httemplate/edit/process/cdr_type.cgi create mode 100644 httemplate/elements/select-cdr_type.html (limited to 'httemplate') diff --git a/httemplate/browse/elements/browse.html b/httemplate/browse/elements/browse.html index 513c2c4e9..9099d6538 100644 --- a/httemplate/browse/elements/browse.html +++ b/httemplate/browse/elements/browse.html @@ -1,5 +1,5 @@ <% include( '/search/elements/search.html', - 'disable_download' => 1, + 'really_disable_download' => 1, 'disable_nonefound' => 1, @_, ) diff --git a/httemplate/browse/rate.cgi b/httemplate/browse/rate.cgi index c6cfec074..0c425a5d1 100644 --- a/httemplate/browse/rate.cgi +++ b/httemplate/browse/rate.cgi @@ -4,6 +4,8 @@ $p.'browse/rate_region.html', 'Time Periods' => $p.'browse/rate_time.html', + 'CDR Types' => + $p.'edit/cdr_type.cgi', ], 'html_init' => $html_init, 'name' => 'rate plans', @@ -15,6 +17,7 @@ 'header' => [ '#', 'Rate plan', 'Rates' ], 'fields' => [ 'ratenum', 'ratename', $rates_sub ], 'links' => [ $link, $link, '' ], + 'really_disable_download' => 1 ) %> <%once> @@ -27,7 +30,7 @@ my $rates_sub = sub { my $rate = shift; my $ratenum = $rate->ratenum; - qq(
+ qq(

+<% include('/elements/footer.html') %> +<%init> + +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); + +my @data = ( + map { [ $_->cdrtypenum, $_->cdrtypename ] } + qsearch({ + 'table' => 'cdr_type', + 'hashref' => {}, + 'order_by' => 'ORDER BY cdrtypenum ASC' + }) +); + + diff --git a/httemplate/edit/process/cdr_type.cgi b/httemplate/edit/process/cdr_type.cgi new file mode 100644 index 000000000..b661de75d --- /dev/null +++ b/httemplate/edit/process/cdr_type.cgi @@ -0,0 +1,42 @@ +% if ( $error ) { +% $cgi->param('error', $error); +<% $cgi->redirect(popurl(2). "cdr_type.cgi?". $cgi->query_string ) %> +% } else { +<% $cgi->redirect(popurl(2). "cdr_type.cgi" ) %> +% } +<%init> +my $error = ''; +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); + +my %vars = $cgi->Vars; +warn Dumper(\%vars)."\n"; + +my %old = map { $_->cdrtypenum => $_ } qsearch('cdr_type', {}); + +my @new; +foreach ( keys(%vars) ) { + my ($i) = /^cdrtypenum(\d+)$/ or next; + my $cdrtypenum = $vars{"cdrtypenum$i"} or next; + my $cdrtypename = $vars{"cdrtypename$i"} or next; + # don't delete unchanged records + if ( $old{$i} and $old{$i}->cdrtypename eq $cdrtypename ) { + delete $old{$i}; + next; + } + push @new, FS::cdr_type->new({ + 'cdrtypenum' => $cdrtypenum, + 'cdrtypename' => $cdrtypename, + }); +} +foreach (values(%old)) { + $error = $_->delete; + last if $error; +} +if(!$error) { + foreach (@new) { + $error = $_->insert; + last if $error; + } +} + diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi index 13717dc1a..1abfb0d32 100644 --- a/httemplate/edit/rate.cgi +++ b/httemplate/edit/rate.cgi @@ -26,8 +26,24 @@ Rate plan % if($rate->ratenum) {

Rates in this plan +% if ( my $select_cdr_type = include('/elements/select-cdr_type.html', +% 'curr_value' => $cdrtypenum, +% 'onchange' => 'form.submit();', +% 'name_col' => 'cdrtypename', +% 'value_col' => 'cdrtypenum', +% 'empty_label' => '(default)', +% ) ) { +
+ + +Usage type: <% $select_cdr_type %> +
+% } + <% include('/edit/elements/rate_detail.html', - 'ratenum' => $rate->ratenum + 'ratenum' => $rate->ratenum, + 'countrycode' => $countrycode, + 'cdrtypenum' => $cdrtypenum, ) %> % } @@ -39,13 +55,21 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); my $rate; -if ( $cgi->keywords ) { - my($query) = $cgi->keywords; - $query =~ /^(\d+)$/; +if ( $cgi->param('ratenum') ) { + $cgi->param('ratenum') =~ /^(\d+)$/; $rate = qsearchs( 'rate', { 'ratenum' => $1 } ); } else { #adding $rate = new FS::rate {}; } my $action = $rate->ratenum ? 'Edit' : 'Add'; +my $countrycode = ''; +if ( $cgi->param('countrycode') =~ /^(\d+)$/ ) { + $countrycode = $1; +} + +my $cdrtypenum = ''; +if ( $cgi->param('cdrtypenum') =~ /^(\d+)$/ ) { + $cdrtypenum = $1; +} diff --git a/httemplate/edit/rate_detail.html b/httemplate/edit/rate_detail.html index ec04e4cbb..19378209e 100644 --- a/httemplate/edit/rate_detail.html +++ b/httemplate/edit/rate_detail.html @@ -18,6 +18,7 @@ { field=>'orig_regionnum', type=>'hidden', }, { field=>'dest_regionnum', type=>'hidden', }, { field=>'ratetimenum', type=>'hidden', }, + { field=>'cdrtypenum', type=>'hidden', }, { field=>'dest_regionname', type=>'fixed', }, { field=>'dest_prefixes_short', type=>'fixed', }, { field=>'rate_time_name', type=>'fixed', }, @@ -49,6 +50,9 @@ { ratenum => $cgi->param('ratenum'), dest_regionnum => $cgi->param('dest_regionnum'), ratetimenum => $cgi->param('ratetimenum'), + cdrtypenum => $cgi->param('cdrtypenum'), + min_included => 0, + conn_charge => 0, } }, ) diff --git a/httemplate/edit/rate_region.cgi b/httemplate/edit/rate_region.cgi index cae30030a..367bbafb6 100644 --- a/httemplate/edit/rate_region.cgi +++ b/httemplate/edit/rate_region.cgi @@ -35,17 +35,28 @@ -

+
"> %# rate plan info, if the region has been created yet % if($rate_region->regionnum) { -
-
-Rates in this region +

Rates in this region +% if ( my $select_cdr_type = include('/elements/select-cdr_type.html', +% 'curr_value' => $cdrtypenum, +% 'onchange' => 'form.submit();', +% 'name_col' => 'cdrtypename', +% 'value_col' => 'cdrtypenum', +% 'empty_label' => '(default)', +% ) ) { +
+ +Usage type: <% $select_cdr_type %> +
+% } <% include('/edit/elements/rate_detail.html', - 'regionnum' => $rate_region->regionnum, + 'regionnum' => $rate_region->regionnum, + 'cdrtypenum' => $cdrtypenum, ) %> % } @@ -68,9 +79,8 @@ if ( $cgi->param('error') ) { $rate_region = new FS::rate_region ( { map { $_, scalar($cgi->param($_)) } fields('rate_region') } ); -} elsif ( $cgi->keywords ) { - my($query) = $cgi->keywords; - $query =~ /^(\d+)$/ or die "unparsable regionnum"; +} elsif ( $cgi->param('regionnum') ) { + $cgi->param('regionnum') =~ /^(\d+)$/ or die "unparseable regionnum"; $rate_region = qsearchs( 'rate_region', { 'regionnum' => $1 } ) or die "unknown regionnum $1\n"; } else { #adding @@ -91,5 +101,8 @@ if ( @rate_prefix ) { unless $rate_prefix->countrycode eq $countrycode; } } - +my $cdrtypenum = ''; +if ( $cgi->param('cdrtypenum') =~ /^(\d+)$/ ) { + $cdrtypenum = $1; +} diff --git a/httemplate/elements/auto-table.html b/httemplate/elements/auto-table.html index 9c7dfd09a..49222745a 100644 --- a/httemplate/elements/auto-table.html +++ b/httemplate/elements/auto-table.html @@ -51,7 +51,9 @@ Values will be passed through as "mytable_id1", etc. % my $col = 0; % for ( $col = 0; $col < scalar @fields; $col++ ) { -% my $id = $prefix . $fields[$col] . $row; +% my $id = $prefix . $fields[$col]; +% # don't suffix rownum in the final, blank row +% $id .= $row if $row < (scalar @data) - 1; % my @o = @{ $select[$col] }; % if( @o ) { @@ -117,7 +119,10 @@ $val eq $data[$row][$col] ? ' SELECTED' : ''%>><% shift @o %> var row = <% $prefix %>table.insertRow(-1); var cells = <% $prefix %>_blank.cells; for (i=0; irownum++; } diff --git a/httemplate/elements/select-cdr_type.html b/httemplate/elements/select-cdr_type.html new file mode 100644 index 000000000..9d260898a --- /dev/null +++ b/httemplate/elements/select-cdr_type.html @@ -0,0 +1,11 @@ +% if ( FS::Record->scalar_sql('SELECT COUNT(*) FROM cdr_type') ) { +<% include( '/elements/select-table.html', + 'table' => 'cdr_type', + 'name_col' => 'cdrtypenum', + 'empty_label' => '(none)', + @_ + ) +%> +% } +<%init> + -- cgit v1.2.1