diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2014-01-16 01:45:07 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2014-01-16 01:45:07 -0800 |
| commit | 39997db2139f32a84f4a1d1db2ee0cdd82bb9dfa (patch) | |
| tree | 4a449c5c0d1153246e5e0c52865aec5fadddd23d | |
| parent | 9fccafa7662f8eac572939f64867e625945a1c92 (diff) | |
fix part_pkg.comment showing in signup and self-service package order, RT#25557
| -rw-r--r-- | FS/FS/ClientAPI/MasonComponent.pm | 1 | ||||
| -rw-r--r-- | FS/FS/part_pkg.pm | 5 | ||||
| -rw-r--r-- | httemplate/edit/cust_main/first_pkg/select-part_pkg.html | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/FS/FS/ClientAPI/MasonComponent.pm b/FS/FS/ClientAPI/MasonComponent.pm index c4094ffe0..8a31185bd 100644 --- a/FS/FS/ClientAPI/MasonComponent.pm +++ b/FS/FS/ClientAPI/MasonComponent.pm @@ -99,6 +99,7 @@ my %session_callbacks = ( my %args = @$argsref; $args{part_pkg} = \@part_pkg; $args{first_svc} = \@first_svc; + $args{no_comment} = 1; @$argsref = ( %args ); return ''; #no error diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm index 8e65c50b9..e7f08d2f2 100644 --- a/FS/FS/part_pkg.pm +++ b/FS/FS/part_pkg.pm @@ -841,6 +841,11 @@ sub custom_comment { ($price_info || 'No charge'); } +sub pkg_price_info { + my $self = shift; + $self->pkg. ' - '. ($self->price_info || 'No charge'); +} + =item pkg_class Returns the package class, as an FS::pkg_class object, or the empty string 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 4f8914065..5f7b6887d 100644 --- a/httemplate/edit/cust_main/first_pkg/select-part_pkg.html +++ b/httemplate/edit/cust_main/first_pkg/select-part_pkg.html @@ -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 ); |