X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main%2Ffirst_pkg%2Fselect-part_pkg.html;h=5f7b6887db30b837dc4013706ab2e36cfc3afdd7;hb=2f7688b1b21d92b406d60d09cdd8edcd7a99e842;hp=20f0e19827ea569b8b19be4a68d056eafcb0f88c;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git

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 20f0e1982..5f7b6887d 100644
--- a/httemplate/edit/cust_main/first_pkg/select-part_pkg.html
+++ b/httemplate/edit/cust_main/first_pkg/select-part_pkg.html
@@ -1,14 +1,12 @@
-<% include('/elements/xmlhttp.html',
+<& /elements/xmlhttp.html,
               'url'  => $url_prefix.'misc/svc_acct-domains.cgi',
               'subs' => [ $opt{'prefix'}. 'get_domains' ],
-           )
-%>
+&>
 
-<% include('/elements/xmlhttp.html',
+<& /elements/xmlhttp.html,
               'url'  => $url_prefix.'misc/part_svc-columns.cgi',
               'subs' => [ $opt{'prefix'}. 'get_part_svc' ],
-           )
-%>
+&>
 
 <INPUT TYPE="hidden" NAME="svcdb" VALUE="">
 
@@ -101,22 +99,19 @@
 
 </SCRIPT>
 
-<% include( '/elements/selectlayers.html',
+<& /elements/selectlayers.html,
               'field'        => $opt{'prefix'}. 'pkgpart_svcpart',
               'curr_value'   => $opt{pkgpart_svcpart},
               'options'      => \@options,
               'labels'       => \%labels,
               'html_between' => '</TD></TR></TABLE>',
-              #'onchange'     => $opt{'prefix'}. 'pkgpart_svcpart_changed(this,0);',
               'onchange'     => $opt{'prefix'}. 'pkgpart_svcpart_changed_too(what,0)',
-
               'layer_callback' => $layer_callback,
               'layermap'       => \%layermap,
-          )
-%>
+&>
 
 <SCRIPT TYPE="text/javascript">
-  pkgpart_svcpart_changed_too( document.CustomerForm.pkgpart_svcpart,
+  pkgpart_svcpart_changed_too( document.<% $opt{form_name} || 'CustomerForm' %>.pkgpart_svcpart,
                                <% $opt{saved_domsvc} %>
                              );
 </SCRIPT>
@@ -132,9 +127,8 @@ $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' );
+my @part_pkg  = @{ $opt{'part_pkg'}  };
+my @first_svc = @{ $opt{'first_svc'} || [] };
 
 my %pkgpart_svcpart = ();
 my %svcdb = ();
@@ -150,20 +144,17 @@ foreach my $part_pkg ( @part_pkg ) {
 my @options = ();
 push @options, '' unless $opt{'disable_empty'};
 push @options, map $pkgpart_svcpart{ $_->pkgpart }, @part_pkg;
+my $label_method = $opt{no_comment} ? 'pkg_price_info' : 'pkg_comment' ;
 my %labels = ( '' => ( $opt{'empty_label'} || '(none)' ),
-               map { $pkgpart_svcpart{ $_->pkgpart } => $_->pkg_comment }
+               map { $pkgpart_svcpart{ $_->pkgpart } => $_->$label_method() }
                    @part_pkg
              );
 
 my $layer_callback = sub {
   my $layer = shift;
-  #$layer_fields, $layer_values, $layer_prefix
-
-#  my( $pkgpart, $svcpart ) = split('_', $layer);
-#  my $svcdb = $svcdb{$pkgpart};
   my $svcdb = $layer;
 
-  return '' unless $svcdb; #'<BR><BR><BR><BR><BR>'
+  return '' unless $svcdb; 
 
   #full path cause we're being slung around as a coderef (mason closures?)
   include("/edit/cust_main/first_pkg/$svcdb.html", %opt, );