RT#6223: Billing process - pending packages - feature request [order quotation on...

[freeside.git] / httemplate / edit / cust_main / first_pkg / select-part_pkg.html

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 aa3e805..5f7b688 100644 (file)
--- a/httemplate/edit/cust_main/first_pkg/select-part_pkg.html
+++ b/httemplate/edit/cust_main/first_pkg/select-part_pkg.html
@@ -111,7 +111,7 @@
 &>
 
 <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>
@@ -128,7 +128,7 @@ $opt{saved_domsvc} = 0 unless $opt{saved_domsvc};
 my $url_prefix = $opt{'relurls'} ? '' : $p;
 
 my @part_pkg  = @{ $opt{'part_pkg'}  };
-my @first_svc = @{ $opt{'first_svc'} };
+my @first_svc = @{ $opt{'first_svc'} || [] };
 
 my %pkgpart_svcpart = ();
 my %svcdb = ();
@@ -144,8 +144,9 @@ 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
              );