X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fbrowse%2Frate_region.html;h=b7d9589d0b48e4e5e9219e4588d89fd87d5385aa;hb=9a98d39e3ce40c1f2c324991e8ad469271093fb5;hp=953bbf17ad077677d63d7b5d4e70a57cf0014a13;hpb=d8a9cc7f94af67cfde06e9a5cf38d3d34868856f;p=freeside.git

diff --git a/httemplate/browse/rate_region.html b/httemplate/browse/rate_region.html
index 953bbf17a..b7d9589d0 100644
--- a/httemplate/browse/rate_region.html
+++ b/httemplate/browse/rate_region.html
@@ -15,6 +15,8 @@
      'header'         => \@header,
      'fields'         => \@fields,
      'links'          => \@links,
+     'align'          => \@align,
+     'xls_format'     => \@xls_format,
    )
 %>
 <%once>
@@ -39,12 +41,12 @@ if ( driver_name =~ /^Pg/ ) {
                    "   ELSE npa || '-' || nxx ".
                    " 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";
+  $select .= "( SELECT '+'||countrycode $fromwhere LIMIT 1 ) AS ccode, 
+              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,
-              GROUP_CONCAT( npa ORDER BY npa     ) AS prefixes ";
+  $select .= "'+'||GROUP_CONCAT( DISTINCT countrycode ) AS ccode,
+              GROUP_CONCAT( npa ORDER BY npa SEPARATOR ', ' ) AS prefixes ";
   $group_sql = 'GROUP BY regionnum, regionname';
 } else {
   die 'unknown database '. driver_name;
@@ -52,15 +54,19 @@ 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 );
+my @header     = ( '#',         'Region',  'Country code', 'Prefixes' );
+my @fields     = ( 'regionnum', 'regionname',   'ccode',   'prefixes' );
+my @links      = ( ($link) x 4 );
+my @align      = ( 'right', 'left', 'right', 'left' );
+my @xls_format = ( ({ locked=>1, bg_color=>22 }) x 4 );
 
 $cgi->param('dummy', 1);
 my $countrycode_filter_change =
@@ -80,6 +86,41 @@ 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, ( ('') x 4 );
+    push @xls_format, ( ({}) x 4 );
+
+  }
+
+}
+
 my $html_posttotal = 
   '(show country code: '.
   qq(<SELECT NAME="countrycode" onChange="$countrycode_filter_change">).