From 442bc38bc3cf8d95f0b39e42446a193ad0caaf31 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Mon, 19 May 2014 23:11:21 -0700 Subject: [PATCH] agent-virtualize VoIP rates, RT#29183 --- FS/FS/rate.pm | 1 - httemplate/edit/elements/rate_detail.html | 4 ++-- httemplate/edit/rate.cgi | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/FS/FS/rate.pm b/FS/FS/rate.pm index 88e93b6f1..1b2236f65 100644 --- a/FS/FS/rate.pm +++ b/FS/FS/rate.pm @@ -3,7 +3,6 @@ package FS::rate; use strict; use vars qw( @ISA $DEBUG ); use FS::Record qw( qsearch qsearchs dbh fields ); -#use FS::agent; #causes a weird dep loop in freeside-cdrrated, only needed for v3-style manual FK-checking, so, probably not bother use FS::rate_detail; @ISA = qw(FS::Record); diff --git a/httemplate/edit/elements/rate_detail.html b/httemplate/edit/elements/rate_detail.html index 72a86aee7..1b597fb4a 100644 --- a/httemplate/edit/elements/rate_detail.html +++ b/httemplate/edit/elements/rate_detail.html @@ -204,10 +204,10 @@ if ( $ratenum ) { )"; } @rows = qsearch({ table => 'rate_region', - hashref => { }, + hashref => {}, extra_sql => $where, }); - die "no region found" if !@rows; + #die "no region found" if !@rows; unshift @header, 'Region', 'Prefix(es)'; unshift @hlinks, '', ''; diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi index 652c1a68c..183ea8a42 100644 --- a/httemplate/edit/rate.cgi +++ b/httemplate/edit/rate.cgi @@ -5,7 +5,7 @@ <% include('/elements/progress-init.html', 'OneTrueForm', - [ 'rate', 'preserve_rate_detail' ], # 'rate', 'min_', 'sec_' ], + [ 'rate', 'agentnum', 'preserve_rate_detail' ], # 'rate', 'min_', 'sec_' ], 'process/rate.cgi', $p.'browse/rate.cgi', ) -- 2.20.1