X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Felements%2Fcontact.html;h=308b846bcea9e28bfd87049fa427174a1e73f775;hp=909ff7893dd9dabb743a9d42ae878950b9aa1269;hb=f48ffc61601d08024aeff19ecd07d7420fc4e5b3;hpb=40062272379e4c32add419f839da60742719da2d

diff --git a/httemplate/elements/contact.html b/httemplate/elements/contact.html
index 909ff7893..308b846bc 100644
--- a/httemplate/elements/contact.html
+++ b/httemplate/elements/contact.html
@@ -180,7 +180,7 @@ unless ($opt{'for_prospect'}) {
 }
 
 my $first = 0;
-foreach my $phone_type ( qsearch({table=>'phone_type', order_by=>'weight'}) ) {
+foreach my $phone_type ( FS::phone_type->get_phone_types() ) {
   next if $phone_type->typename =~ /^(Home|Fax)$/;
   my $f = 'phonetypenum'.$phone_type->phonetypenum;
   $label{$f} = $phone_type->typename. ' phone';
@@ -191,8 +191,10 @@ $label{'comment'} = 'Comment';
 
 my @fields = $opt{'name_only'} ? qw( first last ) : keys %label;
 
+my $submitid = $opt{'submit_id'} ? $opt{'submit_id'} : 'submit';
+
 my $js = qq(
-    add_password_validation('changepw$id\_password', 'submit', '', '$contactnum');
+    add_password_validation('changepw$id\_password', '$submitid', '', '$contactnum');
 
     var selfService = document.getElementById("$id\_selfservice_access").value;
 
@@ -204,6 +206,6 @@ my $js = qq(
       else { document.getElementById("changepw$id\_password").disabled = 'true'; }
       return false;
     }
-);
+) unless $opt{'for_prospect'};
 
 </%init>