Merge branch 'patch-1' of https://github.com/gjones2/Freeside

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

diff --git a/httemplate/elements/select-phonenum.html b/httemplate/elements/select-phonenum.html
index 25a885a..18abe3d 100644 (file)
--- a/httemplate/elements/select-phonenum.html
+++ b/httemplate/elements/select-phonenum.html
@@ -12,7 +12,7 @@
     what.options[length] = optionName;
   }
 
-  function <% $opt{'prefix'} %>exchange_changed(what, callback) {
+  function <% $opt{'prefix'} %><% $previous %>_changed(what, callback) {
 
     what.form.<% $opt{'prefix'} %>phonenum.disabled = 'disabled';
     what.form.<% $opt{'prefix'} %>phonenum.style.display = 'none';
@@ -21,7 +21,7 @@
     var phonenumerror = document.getElementById('<% $opt{'prefix'} %>phonenumerror');
     phonenumerror.style.display = 'none';
 
-    exchange = what.options[what.selectedIndex].value;
+    var thing = "<% $previous eq 'region' ? '_REGION ' : '' %>" + what.options[what.selectedIndex].value;
 
     function <% $opt{'prefix'} %>update_phonenums(phonenums) {
 
@@ -30,7 +30,9 @@
           what.form.<% $opt{'prefix'} %>phonenum.options[i] = null;
 
 %     if ($opt{empty}) {
-        opt(what.form.<% $opt{'prefix'} %>phonenum, '', '<% $opt{empty} %>');
+        if ( what.form.<% $opt{'prefix'} %>phonenum.type != 'select-multiple' ){
+          opt(what.form.<% $opt{'prefix'} %>phonenum, '', '<% $opt{empty} %>');
+        }
 %     }
 
       // add the new phonenums
@@ -82,7 +84,7 @@
     }
 
     // go get the new phonenums
-    <% $opt{'prefix'} %>get_phonenums( exchange, <% $opt{'svcpart'} %>, <% $opt{'prefix'} %>update_phonenums );
+    <% $opt{'prefix'} %>get_phonenums( thing, <% $opt{'svcpart'} %>, <% $opt{'prefix'} %>update_phonenums );
 
   }
 
@@ -124,13 +126,18 @@
 % unless ( $opt{'tollfree'} ) {
 <DIV ID="phonenumwait" STYLE="display:none"><IMG SRC="<%$fsurl%>images/wait-orange.gif"> <B>Finding phone numbers</B></DIV>
 
-<DIV ID="phonenumerror" STYLE="display:none"><IMG SRC="<%$fsurl%>images/cross.png"> <B>Select a different city/exchange</B></DIV>
+<DIV ID="phonenumerror" STYLE="display:none"><IMG SRC="<%$fsurl%>images/cross.png"> <B>Select a different <% $opt{'region'} ? 'region' : 'city/exchange' %></B></DIV>
 % }
 
-<SELECT ID="<% $opt{'prefix'} %>phonenum" NAME="<% $opt{'prefix'} %>phonenum" 
-    notonChange="<% $opt{'prefix'} %>phonenum_changed(this); <% $opt{'onchange'} %>"
-    <% $opt{'disabled'} %>>
-  <OPTION VALUE="">Select phone number</OPTION>
+<SELECT <% $opt{multiple} ? 'MULTIPLE SIZE=25' : '' %>
+        ID   = "<% $opt{'prefix'} %>phonenum"
+        NAME = "<% $opt{'prefix'} %>phonenum" 
+        <% $opt{'disabled'} %>
+%#        notonChange="<% $opt{'prefix'} %>phonenum_changed(this); <% $opt{'onchange'} %>"
+>
+% unless ( $opt{multiple} ) {
+    <OPTION VALUE="">Select phone number</OPTION>
+% }
 </SELECT>
 
 <%init>
@@ -139,4 +146,6 @@ my %opt = @_;
 
 $opt{disabled} = 'disabled' unless exists $opt{disabled};
 
+my $previous = $opt{'region'} ? 'region' : 'exchange';
+
 </%init>