X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fedit%2Frate_region.cgi;h=cae30030a2daa70ede28d5c28da581a101b54913;hb=d6741df87df9e3352d7ae47a02d0e3f46154fef9;hp=47d1888e004b55feae2a5b157265b8961f7c061a;hpb=c371f6e225cfffa667815a51571203b034e4f75c;p=freeside.git
diff --git a/httemplate/edit/rate_region.cgi b/httemplate/edit/rate_region.cgi
index 47d1888e0..cae30030a 100644
--- a/httemplate/edit/rate_region.cgi
+++ b/httemplate/edit/rate_region.cgi
@@ -29,92 +29,40 @@
(comma-separated)
-
+
|
-%# rate plan info
-
-
-
-<% include('/elements/table-grid.html') %>
-% my $bgcolor1 = '#eeeeee';
-% my $bgcolor2 = '#ffffff';
-% my $bgcolor = '';
-
-
-
- Rate plan
- |
-
- Included minutes
- |
-
- Charge per minute
- |
-
- Granularity
- |
-
-
-% foreach my $rate ( qsearch('rate', {}) ) {
-%
-% my $n = $rate->ratenum;
-% my $rate_detail = $rate->dest_detail($rate_region)
-% || new FS::rate_region { 'min_included' => 0,
-% 'min_charge' => 0,
-% 'sec_granularity' => '60'
-% };
-%
-% if ( $bgcolor eq $bgcolor1 ) {
-% $bgcolor = $bgcolor2;
-% } else {
-% $bgcolor = $bgcolor1;
-% }
-
-
-
-
- <% $rate->ratename %>
- |
-
-
- min_included %>">
- |
-
-
- $min_charge ) %>">
- |
-
-
-
- |
-
-
-
-% }
-
-
-
-
">
-
+%# rate plan info, if the region has been created yet
+
+% if($rate_region->regionnum) {
+
+
+Rates in this region
+<% include('/edit/elements/rate_detail.html',
+ 'regionnum' => $rate_region->regionnum,
+) %>
+% }
<% include('/elements/footer.html') %>
+<%once>
+tie my %conn_secs, 'Tie::IxHash', FS::rate_detail::conn_secs();
+
+%once>
<%init>
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
+
my $rate_region;
if ( $cgi->param('error') ) {
$rate_region = new FS::rate_region ( {
@@ -132,12 +80,7 @@ my $action = $rate_region->regionnum ? 'Edit' : 'Add';
my $p1 = popurl(1);
-tie my %granularity, 'Tie::IxHash',
- '1', => '1 second',
- '6' => '6 second',
- '30' => '30 second', # '1/2 minute',
- '60' => 'minute',
-;
+tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
my @rate_prefix = $rate_region->rate_prefix;
my $countrycode = '';