X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fbrowse%2Frate_region.html;h=b7d9589d0b48e4e5e9219e4588d89fd87d5385aa;hp=1d04b648cf65c08d7e2203bb3dbcb442bbf72b71;hb=74e058c8a010ef6feb539248a550d0bb169c1e94;hpb=c648976f0b7975f2328ebd7ba8c711fad0ca4195

diff --git a/httemplate/browse/rate_region.html b/httemplate/browse/rate_region.html
index 1d04b648c..b7d9589d0 100644
--- a/httemplate/browse/rate_region.html
+++ b/httemplate/browse/rate_region.html
@@ -3,6 +3,7 @@
      'name_singular'  => 'region', #'rate region',
      'menubar'        => [ 'Rate plans' => $p.'browse/rate.cgi' ],
      'html_init'      => $html_init,
+     'html_posttotal' => $html_posttotal,
      'query'          => {
                            'select'    => $select,
                            'table'     => 'rate_region',
@@ -10,10 +11,12 @@
                            'extra_sql' => $extra_sql, 
                            'order_by'  => 'ORDER BY LOWER(regionname)',
                          },
-     'count_query'    => 'SELECT COUNT(*) FROM rate_region',
-     'header'         => [ '#',         'Region',  'Country code', 'Prefixes' ],
-     'fields'         => [ 'regionnum', 'regionname',   'ccode',   'prefixes' ],
-     'links'          => [ $link, $link, $link, $link ],
+     'count_query'    => $count_query,
+     'header'         => \@header,
+     'fields'         => \@fields,
+     'links'          => \@links,
+     'align'          => \@align,
+     'xls_format'     => \@xls_format,
    )
 %>
 <%once>
@@ -29,25 +32,105 @@ my $html_init =
 #not quite right for the shouldn't-happen multiple countrycode per region case
 my $select = 'rate_region.*, ';
 my $join = '';
-my $extra_sql = '';
+my $group_sql = '';
 if ( driver_name =~ /^Pg/ ) {
   my $fromwhere = 'FROM rate_prefix'.
                   ' WHERE rate_prefix.regionnum = rate_region.regionnum';
-  $select .= "( SELECT countrycode $fromwhere LIMIT 1 ) AS ccode, 
-              ARRAY_TO_STRING( ARRAY(SELECT npa $fromwhere), ',' ) AS prefixes";
+  my $prefix_sql = " CASE WHEN nxx IS NULL OR nxx = '' ".
+                   "   THEN npa ".
+                   "   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";
 } 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 ";
-  $extra_sql = 'GROUP BY regionnum, regionname';
+  $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;
 }
 
+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) 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 =
+  "window.location = '".
+  $cgi->self_url. ";countrycode=' + this.options[this.selectedIndex].value;";
+
+my $countrycode = '';
+my $extra_sql = $group_sql;
+my $count_query = $base_count_sql;
+if ( $cgi->param('countrycode') =~ /^(\d+)$/ ) {
+  $countrycode = $1;
+  my $ccode_sql = '( SELECT countrycode FROM rate_prefix
+                       WHERE rate_prefix.regionnum = rate_region.regionnum
+                       LIMIT 1
+                   )';
+  $extra_sql = " WHERE $ccode_sql = '$1' $extra_sql";
+  $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">).
+  qq(<OPTION VALUE="">(all)).
+  join("\n", map { qq(<OPTION VALUE="$_").
+                     ($_ eq $countrycode ? ' SELECTED' : '' ).
+                     ">$_",
+                 }
+                 FS::rate_prefix->all_countrycodes
+      ).
+  '</SELECT>)';
+
 </%init>