[freeside-commits] freeside/httemplate/browse rate_region.html, 1.6, 1.7
Ivan,,,
ivan at wavetail.420.am
Tue Apr 21 13:59:45 PDT 2009
Update of /home/cvs/cvsroot/freeside/httemplate/browse
In directory wavetail.420.am:/tmp/cvs-serv3894
Modified Files:
rate_region.html
Log Message:
rate download/edit/upload, RT#5108
Index: rate_region.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/browse/rate_region.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- rate_region.html 21 Apr 2009 20:28:06 -0000 1.6
+++ rate_region.html 21 Apr 2009 20:59:43 -0000 1.7
@@ -40,7 +40,7 @@
" END";
my $prefixes_sql = "SELECT $prefix_sql $fromwhere AND npa IS NOT NULL";
$select .= "( SELECT countrycode $fromwhere LIMIT 1 ) AS ccode,
- ARRAY_TO_STRING( ARRAY($prefixes_sql), ',' ) AS prefixes";
+ ARRAY_TO_STRING( ARRAY($prefixes_sql), ', ' ) AS prefixes";
} elsif ( driver_name =~ /^mysql/i ) {
$join = 'LEFT JOIN rate_prefix USING ( regionnum )';
$select .= "GROUP_CONCAT( DISTINCT countrycode ) AS ccode,
@@ -52,6 +52,8 @@
my $base_count_sql = 'SELECT COUNT(*) FROM rate_region';
+tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
+
</%once>
<%init>
@@ -80,6 +82,40 @@
$count_query .= " WHERE $ccode_sql = '$1'";
}
+sub _rate_detail_factory {
+ my( $rate, $field ) = @_;
+ return sub {
+ my $rate_detail = $rate->dest_detail(shift)
+ || new FS::rate_region { 'min_included' => 0,
+ 'min_charge' => 0,
+ 'sec_granularity' => 0,
+ };
+ my $value = $rate_detail->$field();
+ $field eq 'sec_granularity' ? $granularity{$value} : $value;
+ };
+}
+
+if ( $cgi->param('show_rates') ) {
+ foreach my $rate ( qsearch('rate', {}) ) {
+
+ my $label = $rate->ratenum.': '. $rate->ratename;
+ push @header, "$label: Included minutes/calls",
+ "$label: Charge per minute/call",
+ "$label: Granularity",
+ "$label: Usage class";
+
+ #closure me harder
+ push @fields, _rate_detail_factory($rate, 'min_included'),
+ _rate_detail_factory($rate, 'min_charge'),
+ _rate_detail_factory($rate, 'sec_granularity'),
+ _rate_detail_factory($rate, 'classnum');
+
+ push @links, '', '', '', '';
+
+ }
+
+}
+
my $html_posttotal =
'(show country code: '.
qq(<SELECT NAME="countrycode" onChange="$countrycode_filter_change">).
More information about the freeside-commits
mailing list