diff options
author | Ivan Kohler <ivan@freeside.biz> | 2014-04-09 13:25:58 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2014-04-09 13:25:58 -0700 |
commit | f926513f6aa8cc228f62f8b1f582bb823c021cdc (patch) | |
tree | 9d7d1225112db4e3767899b52fbb1ef772bd1e28 /FS | |
parent | c6c8d0ffa48f07b5c1b7df7981bc28322d47cf70 (diff) |
installers, RT#16584
Diffstat (limited to 'FS')
-rw-r--r-- | FS/FS/Schema.pm | 11 | ||||
-rw-r--r-- | FS/FS/pkg_category.pm | 36 |
2 files changed, 39 insertions, 8 deletions
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index ae25da154..a1004d07d 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -5049,11 +5049,12 @@ sub tables_hashref { 'pkg_category' => { 'columns' => [ - 'categorynum', 'serial', '', '', '', '', - 'categoryname', 'varchar', '', $char_d, '', '', - 'weight', 'int', 'NULL', '', '', '', - 'condense', 'char', 'NULL', 1, '', '', - 'disabled', 'char', 'NULL', 1, '', '', + 'categorynum', 'serial', '', '', '', '', + 'categoryname', 'varchar', '', $char_d, '', '', + 'weight', 'int', 'NULL', '', '', '', + 'ticketing_queueid', 'int', 'NULL', '', '', '', + 'condense', 'char', 'NULL', 1, '', '', + 'disabled', 'char', 'NULL', 1, '', '', ], 'primary_key' => 'categorynum', 'unique' => [], diff --git a/FS/FS/pkg_category.pm b/FS/FS/pkg_category.pm index cd875d1a1..adfadd772 100644 --- a/FS/FS/pkg_category.pm +++ b/FS/FS/pkg_category.pm @@ -1,9 +1,9 @@ package FS::pkg_category; +use base qw( FS::category_Common ); use strict; -use base qw( FS::category_Common ); use vars qw( @ISA $me $DEBUG ); -use FS::Record qw( qsearch dbh ); +use FS::Record qw( qsearch ); use FS::pkg_class; use FS::part_pkg; @@ -49,6 +49,15 @@ Text name of this package category Weight +=item ticketing_queueid + +Ticketing Queue + +=item condense + +Condense flag for invoice display, empty or 'Y' + + =item disabled Disabled flag, empty or 'Y' @@ -92,13 +101,34 @@ replace methods. =cut +sub check { + my $self = shift; + + $self->ut_enum('condense', [ '', 'Y' ]) + || $self->ut_snumbern('ticketing_queueid') + || $self->SUPER::check; +} + +=item ticketing_queue + +Returns the queue name corresponding with the id from the I<ticketing_queueid> +field, or the empty string. + +=cut + +sub ticketing_queue { + my $self = shift; + return 'Agent-specific queue' if $self->ticketing_queueid == -1; + return '' unless $self->ticketing_queueid; + FS::TicketSystem->queue($self->ticketing_queueid); +} + # _ upgrade_data # # Used by FS::Upgrade to migrate to a new database. sub _upgrade_data { my ($class, %opts) = @_; - my $dbh = dbh; warn "$me upgrading $class\n" if $DEBUG; |