optimize CDR rating after timed rate perf regression, RT#15739

[freeside.git] / httemplate / edit / rate_detail.html

diff --git a/httemplate/edit/rate_detail.html b/httemplate/edit/rate_detail.html
index dd8c3f6..d0b8509 100644 (file)
--- a/httemplate/edit/rate_detail.html
+++ b/httemplate/edit/rate_detail.html
@@ -5,7 +5,11 @@
      'labels' => { 'ratedetailnum'       => 'Rate', #should hide...
                    'dest_regionname'     => 'Region',
                    'dest_prefixes_short' => 'Prefix(es)',
+                   'rate_time_name'      => 'Time period',
                    'min_included'        => 'Included minutes/calls',
+                   'region_group'        => 'Region Group',
+                   'conn_charge'         => 'Connection charge',
+                   'conn_sec'            => 'For',
                    'min_charge'          => 'Charge per minute/call',
                    'sec_granularity'     => 'Granularity',
                    'classnum'            => 'Usage class',
@@ -14,9 +18,23 @@
                    { field=>'ratenum',             type=>'hidden', },
                    { field=>'orig_regionnum',      type=>'hidden', },
                    { field=>'dest_regionnum',      type=>'hidden', },
+                   { field=>'ratetimenum',         type=>'hidden', },
+                   { field=>'cdrtypenum',          type=>'hidden', },
                    { field=>'dest_regionname',     type=>'fixed',  },
                    { field=>'dest_prefixes_short', type=>'fixed',  },
+                   { field=>'rate_time_name',      type=>'fixed',  },
+                   { field => 'region_group',
+                     type => 'checkbox',
+                     value => 'Y',
+                   },
                    { field=>'min_included',        type=>'text',  size=>5 },
+                   { field=>'conn_charge',         type=>'money', size=>4 },
+                   { field          =>'conn_sec',
+                      type          =>'select',
+                      options       => [ keys %conn_secs ],
+                      labels        => \%conn_secs,
+                      disable_empty => 1,
+                   },
                    { field=>'min_charge',          type=>'money', size=>4 },
                    { field         =>'sec_granularity',
                      type          =>'select',
@@ -33,14 +51,23 @@
                    },
 
                  ],
+     'new_hashref_callback' => sub {
+        { ratenum        => $cgi->param('ratenum'),
+          dest_regionnum => $cgi->param('dest_regionnum'),
+          ratetimenum    => $cgi->param('ratetimenum'),
+          cdrtypenum     => $cgi->param('cdrtypenum'),
+          min_included   => 0,
+          conn_charge    => 0,
+        }
+      },
    )
 %>
 <%once>
 
 tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
+tie my %conn_secs,   'Tie::IxHash', FS::rate_detail::conn_secs();
 
 </%once>
-
 <%init>
 
 my $conf = new FS::Conf;