[freeside-commits] freeside/httemplate/elements select-did.html, 1.7.4.4, 1.7.4.5

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail.420.am:/tmp/cvs-serv7059/httemplate/elements

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	select-did.html 
Log Message:
VoipNow provisioning export, #11170

Index: select-did.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-did.html,v
retrieving revision 1.7.4.4
retrieving revision 1.7.4.5
diff -u -w -d -r1.7.4.4 -r1.7.4.5
--- select-did.html	11 Jan 2011 15:49:12 -0000	1.7.4.4
+++ select-did.html	28 Mar 2011 19:04:07 -0000	1.7.4.5
@@ -99,7 +99,6 @@
 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
@@ -114,14 +113,17 @@
 if ( scalar(@exports) > 1 ) {
   die "more than one DID-providing export attached to svcpart $svcpart";
 }
+my $export = '';
+$export = $exports[0] if scalar(@exports);
 
 my $use_selector = scalar(@exports) ? 1 : 0;
 
-my $export;
-$export = $exports[0] if scalar(@exports);
-
 my $bulknum = $opt{'bulknum'} || 0;
 
+my $country  = ( $export && $export->option('country') )
+            || $conf->config('countrydefault')
+            || 'US';
+
 #my $field = $opt{'field'} || 'phonenum';
 
 </%init>