order svc_phone services from self-service too, RT#5085

2 files changed, 46 insertions, 8 deletions

diff --git a/httemplate/edit/cust_main/first_pkg/select-part_pkg.html b/httemplate/edit/cust_main/first_pkg/select-part_pkg.html
index d2d862bea..871e1cdee 100644
--- a/httemplate/edit/cust_main/first_pkg/select-part_pkg.html
+++ b/httemplate/edit/cust_main/first_pkg/select-part_pkg.html
@@ -1,15 +1,17 @@
 <% include('/elements/xmlhttp.html',
-              'url'  => $p.'misc/svc_acct-domains.cgi',
+              'url'  => $url_prefix.'misc/svc_acct-domains.cgi',
               'subs' => [ $opt{'prefix'}. 'get_domains' ],
            )
 %>
 
 <% include('/elements/xmlhttp.html',
-              'url'  => $p.'misc/part_svc-columns.cgi',
+              'url'  => $url_prefix.'misc/part_svc-columns.cgi',
               'subs' => [ $opt{'prefix'}. 'get_part_svc' ],
            )
 %>
 
+<INPUT TYPE="hidden" NAME="svcdb" VALUE="">
+
 <SCRIPT TYPE="text/javascript">
 
   function selopt(what,value,text,selected) {
@@ -27,10 +29,14 @@
 
   function <% $opt{'prefix'} %>pkgpart_svcpart_changed_too(what,selected) {
 
+    <% $opt{'onchange'} %>;
+
     pkgpart_svcpart = what.options[what.selectedIndex].value;
 
     var svcdb = pkgpart_svcpart2svcdb[pkgpart_svcpart];
 
+    what.form.svcdb.value = svcdb;
+
     if ( svcdb == 'svc_acct' ) {
 
       // go get the new domains
@@ -124,6 +130,8 @@ foreach my $opt (qw( svc_part pkgparts saved_pkgpart saved_domsvc prefix)) {
 }
 $opt{saved_domsvc} = 0 unless $opt{saved_domsvc};
 
+my $url_prefix = $opt{'relurls'} ? '' : $p;
+
 my @part_pkg = @{$opt{'part_pkg'}};
 
 my @first_svc = ( 'svc_acct', 'svc_phone' );
@@ -140,7 +148,7 @@ foreach my $part_pkg ( @part_pkg ) {
 }
 
 my @options = ( '', map $pkgpart_svcpart{ $_->pkgpart }, @part_pkg );
-my %labels = ( '' => '(none)',
+my %labels = ( '' => ( $opt{'empty_label'} || '(none)' ),
                map { $pkgpart_svcpart{ $_->pkgpart } => $_->pkg_comment }
                    @part_pkg
              );
diff --git a/httemplate/edit/cust_main/first_pkg/svc_acct.html b/httemplate/edit/cust_main/first_pkg/svc_acct.html
index 91ee7a56c..150d4c043 100644
--- a/httemplate/edit/cust_main/first_pkg/svc_acct.html
+++ b/httemplate/edit/cust_main/first_pkg/svc_acct.html
@@ -29,14 +29,44 @@
              VALUE     = "<% $opt{'password'} %>"
              SIZE      = <% $pmax2 %>
              MAXLENGTH = <% $passwordmax %>>
-      (blank to generate)
+%     unless ( $opt{'password_verify'} ) {
+        (blank to generate)
+%     }
     </TD>
   </TR>
 
-  <TR>
-    <TD ALIGN="right">Access number</TD>
-    <TD><% FS::svc_acct_pop::popselector($opt{'popnum'}) %></TD>
-  </TR>
+% if ( $opt{'password_verify'} ) {
+    <TR>
+      <TD ALIGN="right">Re-enter Password</TD>
+      <TD>
+        <INPUT TYPE      = "text"
+               NAME      = "_password2"
+               VALUE     = "<% $opt{'password2'} %>"
+               SIZE      = <% $pmax2 %>
+               MAXLENGTH = <% $passwordmax %>>
+      </TD>
+    </TR>
+% }
+
+% if ( $conf->exists('security_phrase') ) {
+    <TR>
+      <TD ALIGN="right">Security Phrase</TD>
+      <TD><INPUT TYPE="text" NAME="sec_phrase" VALUE="<% $opt{'sec_phrase'} %>">
+      </TD>
+    </TR>
+% } else {
+    <INPUT TYPE="hidden" NAME="sec_phrase" VALUE="">
+% }
+
+% if ( $conf->exists('svc_acct-disable_access_number') ) {
+    <INPUT TYPE="hidden" NAME="popnum" VALUE="">
+% } else {
+    <TR>
+      <TD ALIGN="right">Access number</TD>
+%#           XXX should gain "area code" selection and labels on the dropdowns
+      <TD><% FS::svc_acct_pop::popselector($opt{'popnum'}) %></TD>
+    </TR>
+% }
 
 </TABLE>