Schema reference

From 48ba2845d0119c56971d5b724661aa37e73b49dd Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 20 Nov 2004 17:26:56 +0000 Subject: first pass at VoIP rating --- httemplate/browse/rate.cgi | 34 ++++++++++ httemplate/docs/schema.html | 29 +++++++- httemplate/docs/upgrade10.html | 35 +++++++++- httemplate/edit/part_pkg.cgi | 7 +- httemplate/edit/process/rate.cgi | 37 +++++++++++ httemplate/edit/process/rate_region.cgi | 51 ++++++++++++++ httemplate/edit/rate.cgi | 94 ++++++++++++++++++++++++++ httemplate/edit/rate_region.cgi | 114 ++++++++++++++++++++++++++++++++ httemplate/search/sqlradius.cgi | 36 +++++++++- httemplate/search/sqlradius.html | 37 ++++++++--- 10 files changed, 459 insertions(+), 15 deletions(-) create mode 100644 httemplate/browse/rate.cgi create mode 100755 httemplate/edit/process/rate.cgi create mode 100755 httemplate/edit/process/rate_region.cgi create mode 100644 httemplate/edit/rate.cgi create mode 100644 httemplate/edit/rate_region.cgi (limited to 'httemplate') diff --git a/httemplate/browse/rate.cgi b/httemplate/browse/rate.cgi new file mode 100644 index 000000000..c31260166 --- /dev/null +++ b/httemplate/browse/rate.cgi @@ -0,0 +1,34 @@ + +<%= header("Rate plan listing", menubar( 'Main Menu' => "$p#sysadmin" )) %> +Rate plans, regions and prefixes for VoIP and call billing.

+Add a rate plan +| Add a region +

+ + +<%= table() %> + + Rate plan + + +<% foreach my $rate ( sort { + $a->getfield('ratenum') <=> $b->getfield('ratenum') + } qsearch('rate',{}) ) { +%> + + <%= $rate->ratenum %> + <%= $rate->ratename %> + + +<% } %> + + + + + + diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html index 8523a4a79..2e78f6e9e 100644 --- a/httemplate/docs/schema.html +++ b/httemplate/docs/schema.html @@ -1,4 +1,4 @@ - + Schema reference @@ -453,6 +453,33 @@

svcnum - account

groupname +

rate - Call rate plans +

ratenum - primary key +
ratename +

rate_detail - Call rate detail +

ratenum - rate plan +
orig_regionnum - call origination region +
dest_regionnum - call destination region +
min_included - included minutes +
min_charge - charge per minute +
sec_granularity - granularity in seconds, i.e. 6 or 60 +

rate_region - Call rate region +

regionnum - primary key +
regionname +

rate_prefix - Call rate prefix +

prefixnum - primary key +
regionnum rate region +
countrycode +
npa +
nxx +

msgcat - i18n message catalog

msgnum - primary key diff --git a/httemplate/docs/upgrade10.html b/httemplate/docs/upgrade10.html index 2f2c2daa6..e17f7add3 100644 --- a/httemplate/docs/upgrade10.html +++ b/httemplate/docs/upgrade10.html @@ -190,6 +190,39 @@ CREATE TABLE part_pkg_option ( CREATE INDEX part_pkg_option1 ON part_export_option ( pkgpart ); CREATE INDEX part_pkg_option2 ON part_export_option ( optionname ); +CREATE TABLE rate ( + ratenum serial NOT NULL, + reatename varchar(80) NOT NULL, + PRIMARY KEY (ratenum) +); + +CREATE TABLE rate_detail ( + ratenum int NOT NULL, + orig_regionnum int NULL, + dest_regionnum int NOT NULL, + min_included int NOT NULL, + min_charge decimal(10,2) NOT NULL, + sec_granularity int NOT NULL +); +CREATE UNIQUE INDEX rate_detail1 ON rate_detail ( ratenum, orig_regionnum, dest_regionnum ); + +CREATE TABLE rate_region ( + regionnum serial NOT NULL, + regionname varchar(80) NOT NULL, + PRIMARY KEY (regionnum) +); + +CREATE TABLE rate_prefix ( + prefixnum serial NOT NULL, + regionnum int NOT NULL, + countrycode varchar(3) NOT NULL, + npa varchar(4) NULL, + nxx varchar(3) NULL, + PRIMARY KEY (prefixnum) +); +CREATE INDEX rate_prefix1 ON rate_prefix ( countrycode ); +CREATE INDEX rate_prefix2 ON rate_prefix ( regionnum ); + DROP INDEX cust_bill_pkg1; ALTER TABLE cust_bill_pkg ADD itemdesc varchar(80) NULL; @@ -256,7 +289,7 @@ optionally: mandatory again: dbdef-create username -create-history-tables username cust_bill_pkg_detail router part_svc_router addr_block svc_broadband acct_snarf svc_external cust_pay_refund cust_pay_void +create-history-tables username cust_bill_pkg_detail router part_svc_router addr_block svc_broadband acct_snarf svc_external cust_pay_refund cust_pay_void part_pkg_option rate rate_detail rate_region rate_prefix dbdef-create username apache - fix sections to include .html also diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi index 6a06c3525..dc2992459 100755 --- a/httemplate/edit/part_pkg.cgi +++ b/httemplate/edit/part_pkg.cgi @@ -295,8 +295,11 @@ my $widget = new HTML::Widgets::SelectLayers( ? $plandata{$field} : $href->{$field}{'default'} ). qq!" onChange="fchanged(this)">!; - } elsif ( $href->{$field}{'type'} eq 'select_multiple' ) { - $html .= qq! + +Rate plan + +

+ +<%= table() %> + + Region + Prefix(es) + Included
minutes + Charge per
minute + Granularity + + +<% foreach my $rate_region ( + qsearch('rate_region', {}, '', 'ORDER BY regionname' ) + ) { + my $n = $rate_region->regionnum; + my $rate_detail = + $rate->dest_detail($rate_region) + || new FS::rate_region { 'min_included' => 0, + 'min_charge' => 0, + 'sec_granularity' => '60' + }; +%> + + <%= $rate_region->regionname %> + <%= $rate_region->prefixes_short %> + min_included %>"> + $min_charge ) %>"> + + + +<% } %> + + + + Add a region + + + + + +
"> + + + + + diff --git a/httemplate/edit/rate_region.cgi b/httemplate/edit/rate_region.cgi new file mode 100644 index 000000000..cc14dd37d --- /dev/null +++ b/httemplate/edit/rate_region.cgi @@ -0,0 +1,114 @@ + +<% + +my $rate_region; +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+)$/; + $rate_region = qsearchs( 'rate_region', { 'regionnum' => $1 } ); +} else { #adding + $rate_region = new FS::rate_region {}; +} +my $action = $rate_region->regionnum ? 'Edit' : 'Add'; + +my $p1 = popurl(1); + +my %granularity = ( + '6' => '6 second', + '60' => 'minute', +); + +my @rate_prefix = $rate_region->rate_prefix; +my $countrycode = ''; +if ( @rate_prefix ) { + $countrycode = $rate_prefix[0]->countrycode; + foreach my $rate_prefix ( @rate_prefix ) { + eidiot 'multiple country codes per region not yet supported by web UI' + unless $rate_prefix->countrycode eq $countrycode; + } +} + +%> + +<%= header("$action Region", menubar( + 'Main Menu' => $p, + #'View all regions' => "${p}browse/rate_region.cgi", + )) +%> + +<% if ( $cgi->param('error') ) { %> +Error: <%= $cgi->param('error') %>
+<% } %> + +
+ + + +<%= ntable('#cccccc') %> + + Region name + + + + + Country code + + + + + + Prefixes + + <%= join(', ', map $_->npa, @rate_prefix ) %> + + + + + +
+<%= table() %> + + Rate plan + Included
minutes + Charge per
minute + Granularity + + +<% foreach my $rate ( qsearch('rate', {}) ) { + + my $n = $rate->ratenum; + my $rate_detail = $rate->dest_detail($rate_region) + || new FS::rate_region { 'min_included' => 0, + 'min_charge' => 0, + 'sec_granularity' => '60' + }; + +%> + + <%= $rate->ratename %> + min_included %>"> + $min_charge ) %>"> + + + +<% } %> + + + +

"> + + + + + + diff --git a/httemplate/search/sqlradius.cgi b/httemplate/search/sqlradius.cgi index b506ba1cb..9e4a55e62 100644 --- a/httemplate/search/sqlradius.cgi +++ b/httemplate/search/sqlradius.cgi @@ -51,6 +51,15 @@ $ip = $1; } + my $prefix = $cgi->param('prefix'); + $prefix =~ s/\D//g; + if ( $prefix =~ /^(\d+)$/ ) { + $prefix = $1; + $prefix = "011$prefix" unless $prefix =~ /^1/; + } else { + $prefix = ''; + } + ### # field formatting subroutines ### @@ -221,11 +230,30 @@ # and finally, display the thing ### - foreach my $part_export ( map $_->rebless, + foreach my $part_export ( + #grep $_->can('usage_sessions'), qsearch( 'part_export' ) qsearch( 'part_export', { 'exporttype' => 'sqlradius' } ), qsearch( 'part_export', { 'exporttype' => 'sqlradius_withdomain' } ) ) { %user2svc_acct = (); + + my $efields = tie my %efields, 'Tie::IxHash', %fields; + delete $efields{'framedipaddress'} if $part_export->option('hide_ip'); + if ( $part_export->option('hide_data') ) { + delete $efields{$_} foreach qw(acctinputoctets acctoutputoctets); + } + if ( $part_export->option('show_called_station') ) { + $efields->Splice(1, 0, + 'calledstationid' => { + 'name' => + 'attrib' => 'Called-Station-ID', + 'fmt' => + sub { length($_[0]) ? shift : ' '; }, + 'align' => 'left', + }, + ); + } + %> <%= $part_export->exporttype %> to <%= $part_export->machine %>
@@ -239,8 +267,10 @@ <% } %> <% foreach my $session ( - @{ $part_export->usage_sessions( $beginning, $ending, $cgi_svc_acct, $ip ) } -) { %> + @{ $part_export->usage_sessions( + $beginning, $ending, $cgi_svc_acct, $ip, $prefix, ) } + ) { +%> <% foreach my $field ( keys %fields ) { %> diff --git a/httemplate/search/sqlradius.html b/httemplate/search/sqlradius.html index 48a3d8680..f33313f81 100644 --- a/httemplate/search/sqlradius.html +++ b/httemplate/search/sqlradius.html @@ -15,14 +15,35 @@ (leave blank to show all users) - - IP address: - - - - - (leave blank to show all IPs) - + +<% my @part_export = qsearch( 'part_export', { 'exporttype' => 'sqlradius' } ); + push @part_export, + qsearch( 'part_export', { 'exporttype' => 'sqlradius_withdomain' } ); +%> + +<% if ( grep { ! $_->option('hide_ip') } @part_export ) { %> + + IP address: + + + + + (leave blank to show all IPs) + +<% } %> + +<% if ( grep { $_->option('show_called_station') } @part_export ) { %> + + Destination prefix: + + + + + (country code or country code and prefix) + (leave blank to show all destinations) + +<% } %> + From: -- cgit v1.2.1