diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2014-01-09 12:32:29 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2014-01-09 12:32:29 -0800 |
| commit | 06bbfb407f24b2e32b38d601dd8fceac2b22e426 (patch) | |
| tree | 9cdd114d694a96a87ba534412e762bdcdaa85860 /FS/FS | |
| parent | 708cd9ef94ccb96955c6b9fe9d2ccdc0b311b556 (diff) | |
no reason for part_pkg.comment to be required, we've had price_info for ages
Diffstat (limited to 'FS/FS')
| -rw-r--r-- | FS/FS/Schema.pm | 2 | ||||
| -rw-r--r-- | FS/FS/part_pkg.pm | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index 60a143b24..db5bad293 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -2063,7 +2063,7 @@ sub tables_hashref { 'columns' => [ 'pkgpart', 'serial', '', '', '', '', 'pkg', 'varchar', '', $char_d, '', '', - 'comment', 'varchar', '', 2*$char_d, '', '', + 'comment', 'varchar', 'NULL', 2*$char_d, '', '', 'promo_code', 'varchar', 'NULL', $char_d, '', '', 'freq', 'varchar', '', $char_d, '', '', #billing frequency 'setuptax', 'char', 'NULL', 1, '', '', diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm index 9ba5bb087..2cccce051 100644 --- a/FS/FS/part_pkg.pm +++ b/FS/FS/part_pkg.pm @@ -603,7 +603,7 @@ sub check { my $error = $self->ut_numbern('pkgpart') || $self->ut_text('pkg') - || $self->ut_text('comment') + || $self->ut_textn('comment') || $self->ut_textn('promo_code') || $self->ut_alphan('plan') || $self->ut_enum('setuptax', [ '', 'Y' ] ) @@ -767,7 +767,8 @@ sub pkg_comment { #$self->pkg. ' - '. $self->comment; #$self->pkg. ' ('. $self->comment. ')'; my $pre = $opt{nopkgpart} ? '' : $self->pkgpart. ': '; - $pre. $self->pkg. ' - '. $self->custom_comment; + my $custom_comment = $self->custom_comment(%opt); + $pre. $self->pkg. ( $custom_comment ? " - $custom_comment" : '' ); } sub price_info { # safety, in case a part_pkg hasn't defined price_info @@ -776,7 +777,11 @@ sub price_info { # safety, in case a part_pkg hasn't defined price_info sub custom_comment { my $self = shift; - ( $self->custom ? '(CUSTOM) ' : '' ). $self->comment . ' ' . $self->price_info; + my $price_info = $self->price_info(@_); + ( $self->custom ? '(CUSTOM) ' : '' ). + $self->comment. + ( ( ($self->custom || $self->comment) && $price_info ) ? ' - ' : '' ). + $price_info; } =item pkg_class |