VoipNow export, #11170

[freeside.git] / httemplate / elements / select-did.html

diff --git a/httemplate/elements/select-did.html b/httemplate/elements/select-did.html
index 5256ae4..dd2e8e5 100644 (file)
--- a/httemplate/elements/select-did.html
+++ b/httemplate/elements/select-did.html
@@ -13,9 +13,8 @@ Example:
 </%doc>
 % if ( $use_selector ) {
 
-%   if ( $export->exporttype eq 'vitelity' && 
-%              ( $export->option('restrict_selection') eq 'non-tollfree'
-%                  || !$export->option('restrict_selection')) ) {
+%   if ( $export->option('restrict_selection') eq 'non-tollfree'
+%                  || !$export->option('restrict_selection') ) {
     <TABLE>
 
       <TR>
@@ -63,9 +62,8 @@ Example:
     </TABLE>
 
 % } 
-%      if ( $export->exporttype eq 'vitelity' && 
-%              ( $export->option('restrict_selection') eq 'tollfree'
-%                  || !$export->option('restrict_selection')) ) {
+%   if ( $export->option('restrict_selection') eq 'tollfree'
+%                  || !$export->option('restrict_selection') ) {
            <font size="-1">Toll-free</font>
            <% include('/elements/select-phonenum.html',
                        'svcpart' => $svcpart,
@@ -101,7 +99,6 @@ Example:
 my %opt = @_;
 
 my $conf = new FS::Conf;
-my $country = $conf->config('countrydefault') || 'US';
 
 #false laziness w/tr-select-did.html
 #XXX make sure this comes through on errors too
@@ -124,6 +121,10 @@ $export = $exports[0] if scalar(@exports);
 
 my $bulknum = $opt{'bulknum'} || 0;
 
+my $country = $export->option('country') ||
+              $conf->config('countrydefault') ||
+              'US';
+
 #my $field = $opt{'field'} || 'phonenum';
 
 </%init>