combine ticket notification scrips, #15353

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

diff --git a/httemplate/elements/select-did.html b/httemplate/elements/select-did.html
index 6cc63b9..a69450c 100644 (file)
--- a/httemplate/elements/select-did.html
+++ b/httemplate/elements/select-did.html
@@ -18,47 +18,46 @@ Example:
     <TABLE>
 
       <TR>
-        <TD>
+        <TD VALIGN="top">
           <% include('/elements/select-state.html',
                        'prefix'        => 'phonenum_', #$field.'_',
                        'country'       => $country,
+                       'svcpart'       => $svcpart,
                        'disable_empty' => 0,
                        'empty_label'   => 'Select state',
                     )
           %>
+          <BR><FONT SIZE="-1">State</FONT>
         </TD>
-        <TD>
+        <TD VALIGN="top">
           <% include('/elements/select-areacode.html',
                        'state_prefix' => 'phonenum_', #$field.'_',
                        'svcpart'      => $svcpart,
                        'empty'        => 'Select area code',
                     )
           %>
+          <BR><FONT SIZE="-1">Area code</FONT>
         </TD>
-        <TD>
+        <TD VALIGN="top">
           <% include('/elements/select-exchange.html',
                        'svcpart' => $svcpart,
                        'empty'   => 'Select exchange',
                     )
           %>
+          <BR><FONT SIZE="-1">City / Exchange</FONT>
         </TD>
-        <TD>
+        <TD VALIGN="top">
           <% include('/elements/select-phonenum.html',
-                       'svcpart' => $svcpart,
-                       'empty'   => 'Select phone number',
-                      'bulknum' => $bulknum,
+                       'svcpart'  => $svcpart,
+                       'empty'    => 'Select phone number',
+                      'bulknum'  => $bulknum,
+                       'multiple' => $multiple,
                     )
           %>
+          <BR><FONT SIZE="-1">Phone number</FONT>
         </TD>
       </TR>
 
-      <TR>
-        <TD><FONT SIZE="-1">State</FONT></TD>
-        <TD><FONT SIZE="-1">Area code</FONT></TD>
-        <TD><FONT SIZE="-1">City / Exchange</FONT></TD>
-        <TD><FONT SIZE="-1">Phone number</FONT></TD>
-      </TR>
-
     </TABLE>
 
 % } 
@@ -99,7 +98,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,13 +112,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; #Bulk DID orders via ordering system, vs.
+my $multiple = $opt{'multiple'} || 0; #just selecting a bunch at a time
 
-my $bulknum = $opt{'bulknum'} || 0;
+my $country  = ( $export && $export->option('country') )
+            || $conf->config('countrydefault')
+            || 'US';
 
 #my $field = $opt{'field'} || 'phonenum';