[freeside-commits] freeside/httemplate/elements select-did.html, 1.6, 1.7 select-areacode.html, 1.1, 1.2

[Ivan,,,]

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

Modified Files:
	select-did.html select-areacode.html 
Log Message:
fix E911 vs. DID selector on phone provision, RT#7819

Index: select-did.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-did.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -d -r1.6 -r1.7
--- select-did.html	10 Jul 2009 17:50:26 -0000	1.6
+++ select-did.html	26 Mar 2010 22:25:36 -0000	1.7
@@ -3,7 +3,7 @@
 Example:
 
   include('/elements/select-did.html',
-            'field'   => 'phonenum',
+            #can't actuall change from phonenum yet# 'field'   => 'phonenum',
 
             'svcpart' => 5,
             #OR
@@ -18,6 +18,7 @@
       <TR>
         <TD>
           <% include('/elements/select-state.html',
+                       'prefix'        => 'phonenum_', #$field.'_',
                        'country'       => $country,
                        'disable_empty' => 0,
                        'empty_label'   => 'Select state',
@@ -26,6 +27,7 @@
         </TD>
         <TD>
           <% include('/elements/select-areacode.html',
+                       'state_prefix' => 'phonenum_', #$field.'_',
                        'svcpart' => $svcpart,
                        'empty'   => 'Select area code',
                     )
@@ -84,4 +86,6 @@
 
 my $use_selector = scalar(@exports) ? 1 : 0;
 
+#my $field = $opt{'field'} || 'phonenum';
+
 </%init>

Index: select-areacode.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-areacode.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- select-areacode.html	28 Jun 2008 23:03:09 -0000	1.1
+++ select-areacode.html	26 Mar 2010 22:25:36 -0000	1.2
@@ -12,7 +12,7 @@
     what.options[length] = optionName;
   }
 
-  function <% $opt{'prefix'} %>state_changed(what, callback) {
+  function <% $opt{'state_prefix'} %>state_changed(what, callback) {
 
     what.form.<% $opt{'prefix'} %>areacode.disabled = 'disabled';
     what.form.<% $opt{'prefix'} %>areacode.style.display = 'none';
@@ -24,7 +24,7 @@
     what.form.<% $opt{'prefix'} %>exchange.disabled = 'disabled';
     what.form.<% $opt{'prefix'} %>phonenum.disabled = 'disabled';
 
-    state = what.options[what.selectedIndex].value;
+    var state = what.options[what.selectedIndex].value;
 
     function <% $opt{'prefix'} %>update_areacodes(areacodes) {
 
@@ -87,5 +87,6 @@
 my %opt = @_;
 
 $opt{disabled} = 'disabled' unless exists $opt{disabled};
+$opt{state_prefix} = $opt{prefix} unless exists $opt{state_prefix};
 
 </%init>