X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fbrowse%2Frate_region.html;h=456ba34522081c2d97351a82a5568784133f46f0;hb=b19bf30f0d745d20e5e4f0a8e47ce16a04b02dd9;hp=b454a9e7493236302095b259c634bafa34e9bee7;hpb=35cf428c7c4f9f67125f8a648acb87304f0844b5;p=freeside.git

diff --git a/httemplate/browse/rate_region.html b/httemplate/browse/rate_region.html
index b454a9e74..456ba3452 100644
--- a/httemplate/browse/rate_region.html
+++ b/httemplate/browse/rate_region.html
@@ -12,9 +12,9 @@
                            'order_by'  => 'ORDER BY LOWER(regionname)',
                          },
      'count_query'    => $count_query,
-     'header'         => [ '#',         'Region',  'Country code', 'Prefixes' ],
-     'fields'         => [ 'regionnum', 'regionname',   'ccode',   'prefixes' ],
-     'links'          => [ $link, $link, $link, $link ],
+     'header'         => \@header,
+     'fields'         => \@fields,
+     'links'          => \@links,
    )
 %>
 <%once>
@@ -40,7 +40,7 @@ if ( driver_name =~ /^Pg/ ) {
                    " 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,12 +52,18 @@ if ( driver_name =~ /^Pg/ ) {
 
 my $base_count_sql = 'SELECT COUNT(*) FROM rate_region';
 
+tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
+
 </%once>
 <%init>
 
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
+my @header = ( '#',         'Region',  'Country code', 'Prefixes' );
+my @fields = ( 'regionnum', 'regionname',   'ccode',   'prefixes' );
+my @links  = ( $link, $link, $link, $link );
+
 $cgi->param('dummy', 1);
 my $countrycode_filter_change =
   "window.location = '".
@@ -76,6 +82,40 @@ if ( $cgi->param('countrycode') =~ /^(\d+)$/ ) {
   $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">).