agent-virtualize VoIP rates, RT#29183

2 files changed, 27 insertions, 19 deletions

diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 7abd76a2b..de5ea194a 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -615,15 +615,19 @@ tie my %config_sales, 'Tie::IxHash',
   'Sales People' => [ $fsurl.'browse/sales.html', 'Sales people bring in new business.' ],
 ;
 
-tie my %config_billing_rates, 'Tie::IxHash',
-  'Rate plans' => [ $fsurl.'browse/rate.cgi', 'Manage rate plans' ],
-  'Regions and prefixes' => [ $fsurl.'browse/rate_region.html', 'Manage regions and prefixes' ],
-  'Usage classes'  => [ $fsurl.'browse/usage_class.html', 'Usage classes define groups of usage for taxation.' ],
-  'Time periods' => [ $fsurl.'browse/rate_time.html', 'Time periods define days and hours for rate plans' ],
-  'Edit rates with Excel' => [ $fsurl.'misc/rate_edit_excel.html', 'Download and edit rates with Excel, then upload changes.' ], #"Edit with Excel" ?
-  'separator'     => '', #its a separator!
-  'Tiering plans' => [ $fsurl.'browse/rate_tier.html', 'Rating tiers' ],
-;
+tie my %config_billing_rates, 'Tie::IxHash';
+$config_billing_rates{'Rate plans'} = [ $fsurl.'browse/rate.cgi', 'Manage rate plans' ]
+  if $curuser->access_right('Edit CDR rates')
+  #|| $curuser->access_right('Edit global CDR rates')
+  || $curuser->access_right('Configuration');
+if ( $curuser->access_right('Configuration') ) {
+  $config_billing_rates{'Regions and prefixes'} = [ $fsurl.'browse/rate_region.html', 'Manage regions and prefixes' ];
+  $config_billing_rates{'Usage classes'} = [ $fsurl.'browse/usage_class.html', 'Usage classes define groups of usage for taxation.' ];
+  $config_billing_rates{'Time periods'} = [ $fsurl.'browse/rate_time.html', 'Time periods define days and hours for rate plans' ];
+  $config_billing_rates{'Edit rates with Excel'} = [ $fsurl.'misc/rate_edit_excel.html', 'Download and edit rates with Excel, then upload changes.' ]; #"Edit with Excel" ?
+  $config_billing_rates{'separator'} = ''; #its a separator!
+  $config_billing_rates{'Tiering plans'} = [ $fsurl.'browse/rate_tier.html', 'Rating tiers' ];
+}
 
 tie my %config_billing, 'Tie::IxHash';
 #  'Payment gateways'         => [ $fsurl.'browse/payment_gateway.html', 'Credit card and electronic check processors' ];
@@ -636,7 +640,10 @@ if ( $curuser->access_right('Configuration') ) {
   $config_billing{'Invoice templates'}      = [ $fsurl.'browse/invoice_template.html', 'Edit templates for HTML, plaintext and typeset invoices' ];
   $config_billing{'separator'} = ''; #its a separator!
   $config_billing{'Prepaid cards'}          = [ $fsurl.'search/prepay_credit.html', 'View outstanding cards, generate new cards' ];
-  $config_billing{'Call rates and regions'} = [ \%config_billing_rates, 'Manage rate plans, regions and prefixes for VoIP and call billing' ];
+}
+$config_billing{'Call rates and regions'} = [ \%config_billing_rates, 'Manage rate plans, regions and prefixes for VoIP and call billing' ]
+  if keys %config_billing_rates;
+if ( $curuser->access_right('Configuration') ) {
   $config_billing{'separator2'} = ''; #its a separator!
 
   my $config_taxes_name = 'Locales and tax rates'.
diff --git a/httemplate/elements/select-rate.html b/httemplate/elements/select-rate.html
index 83a7add06..4f2a1b2ec 100644
--- a/httemplate/elements/select-rate.html
+++ b/httemplate/elements/select-rate.html
@@ -1,9 +1,10 @@
-<% include( '/elements/select-table.html',
-                 'table'       => 'rate',
-                 'name_col'    => 'ratename',
-                 'empty_label' => 'Select rate plan',
-                 #'hashref'     => { 'disabled' => '' },
-                 'order_by'    => ' ORDER BY ratenum', #ratename ?
-                 @_,
-             )
-%>
+<& /elements/select-table.html,
+     'table'            => 'rate',
+     'name_col'         => 'ratename',
+     'empty_label'      => 'Select rate plan',
+     #'hashref'          => { 'disabled' => '' },
+     'order_by'         => ' ORDER BY ratenum', #ratename ?
+     'agent_virt'       => 1,
+     'agent_null_right' => 'Configuration', #'Edit global CDR rates'
+     @_,
+&>