From c1bb4ddb71147d0571bd301a6d8c452fdf0e1bc9 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 31 Jan 2006 04:26:54 +0000 Subject: move header() to include(/elements/header.html) so it can be changed in one place, thanks to Scott Edwards --- httemplate/edit/rate.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'httemplate/edit/rate.cgi') diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi index 1771f0105..f8f67f6c4 100644 --- a/httemplate/edit/rate.cgi +++ b/httemplate/edit/rate.cgi @@ -26,7 +26,7 @@ my %granularity = ( %> -<%= header("$action Rate plan", menubar( +<%= include("/elements/header.html","$action Rate plan", menubar( 'Main Menu' => $p, 'View all rate plans' => "${p}browse/rate.cgi", )) -- cgit v1.2.1 From ff24bc786a5fd479f2252260e0da580a736f97be Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 20 Mar 2006 19:13:27 +0000 Subject: add price plan to bill on internal or external CDRs directly, add option to export CDRs to a per-customer downstream file --- httemplate/edit/rate.cgi | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'httemplate/edit/rate.cgi') diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi index f8f67f6c4..9aa4e7291 100644 --- a/httemplate/edit/rate.cgi +++ b/httemplate/edit/rate.cgi @@ -13,7 +13,9 @@ my $action = $rate->ratenum ? 'Edit' : 'Add'; my $p1 = popurl(1); my %granularity = ( + '1', => '1 second', '6' => '6 second', + '30' => '30 second', # '1/2 minute', '60' => 'minute', ); @@ -60,9 +62,10 @@ Rate plan qsearch({ 'select' => 'DISTINCT ON ( regionnum ) rate_region.*', 'table' => 'rate_region', - 'addl_from' => 'INNER JOIN rate_prefix USING ( regionnum )', 'hashref' => {}, - 'extra_sql' => "WHERE countrycode != '1'", + #'addl_from' => 'INNER JOIN rate_prefix USING ( regionnum )', + #'extra_sql' => "WHERE countrycode != '1'", + # 'ORDER BY regionname' # ERROR: SELECT DISTINCT ON expressions must # match initial ORDER BY expressions -- cgit v1.2.1 From 3ce7691203a7737406bf2d4442f7fd84b81f847e Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 23 Aug 2006 22:25:39 +0000 Subject: Will things ever be the same again? It's the final masonize --- httemplate/edit/rate.cgi | 139 ++++++++++++++++++++++++----------------------- 1 file changed, 71 insertions(+), 68 deletions(-) (limited to 'httemplate/edit/rate.cgi') diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi index 9aa4e7291..72a04c339 100644 --- a/httemplate/edit/rate.cgi +++ b/httemplate/edit/rate.cgi @@ -1,40 +1,41 @@ -<% - -my $rate; -if ( $cgi->keywords ) { - my($query) = $cgi->keywords; - $query =~ /^(\d+)$/; - $rate = qsearchs( 'rate', { 'ratenum' => $1 } ); -} else { #adding - $rate = new FS::rate {}; -} -my $action = $rate->ratenum ? 'Edit' : 'Add'; - -my $p1 = popurl(1); - -my %granularity = ( - '1', => '1 second', - '6' => '6 second', - '30' => '30 second', # '1/2 minute', - '60' => 'minute', -); - -#my $nous = < - -<%= include("/elements/header.html","$action Rate plan", menubar( +% +% +%my $rate; +%if ( $cgi->keywords ) { +% my($query) = $cgi->keywords; +% $query =~ /^(\d+)$/; +% $rate = qsearchs( 'rate', { 'ratenum' => $1 } ); +%} else { #adding +% $rate = new FS::rate {}; +%} +%my $action = $rate->ratenum ? 'Edit' : 'Add'; +% +%my $p1 = popurl(1); +% +%my %granularity = ( +% '1', => '1 second', +% '6' => '6 second', +% '30' => '30 second', # '1/2 minute', +% '60' => 'minute', +%); +% +%#my $nous = < $p, 'View all rate plans' => "${p}browse/rate.cgi", )) %> -<%= include('/elements/progress-init.html', +<% include('/elements/progress-init.html', 'OneTrueForm', [ 'rate', 'min_', 'sec_' ], 'process/rate.cgi', @@ -42,13 +43,13 @@ my %granularity = ( ) %>
- + Rate plan - +

-<%= table() %> +<% table() %> Region Prefix(es) @@ -56,54 +57,56 @@ Rate plan Charge per
minute Granularity +% foreach my $rate_region ( +% sort { lc($a->regionname) cmp lc($b->regionname) } +% qsearch({ +% 'select' => 'DISTINCT ON ( regionnum ) rate_region.*', +% 'table' => 'rate_region', +% 'hashref' => {}, +% #'addl_from' => 'INNER JOIN rate_prefix USING ( regionnum )', +% #'extra_sql' => "WHERE countrycode != '1'", +% +% # 'ORDER BY regionname' +% # ERROR: SELECT DISTINCT ON expressions must +% # match initial ORDER BY expressions +% }) +% ) { +% my $n = $rate_region->regionnum; +% my $rate_detail = +% $rate->dest_detail($rate_region) +% || new FS::rate_detail { 'min_included' => 0, +% 'min_charge' => 0, +% 'sec_granularity' => '60' +% }; +% -<% foreach my $rate_region ( - sort { lc($a->regionname) cmp lc($b->regionname) } - qsearch({ - 'select' => 'DISTINCT ON ( regionnum ) rate_region.*', - 'table' => 'rate_region', - 'hashref' => {}, - #'addl_from' => 'INNER JOIN rate_prefix USING ( regionnum )', - #'extra_sql' => "WHERE countrycode != '1'", - - # 'ORDER BY regionname' - # ERROR: SELECT DISTINCT ON expressions must - # match initial ORDER BY expressions - }) - ) { - my $n = $rate_region->regionnum; - my $rate_detail = - $rate->dest_detail($rate_region) - || new FS::rate_detail { 'min_included' => 0, - 'min_charge' => 0, - 'sec_granularity' => '60' - }; -%> - <%= $rate_region->regionname %> - <%= $rate_region->prefixes_short %> - min_included %>"> - $min_charge ) %>"> + <% $rate_region->regionname %> + <% $rate_region->prefixes_short %> + min_included %>"> + $min_charge ) %>"> - +% foreach my $granularity ( keys %granularity ) { + +