fix export-less DID selection, RT#12178

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

diff --git a/httemplate/elements/select-did.html b/httemplate/elements/select-did.html
index 6cc63b9..17eac48 100644 (file)
--- a/httemplate/elements/select-did.html
+++ b/httemplate/elements/select-did.html
@@ -99,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
@@ -114,14 +113,17 @@ my @exports = $part_svc->part_export_did;
 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>