X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpkg_category.pm;h=c2361cc2b8147875fea77b83b900ef3b168cfe7e;hp=0beaf1c117c1dc34ae3540d99a6a6958a69c28c0;hb=3adb46fccf9f631e188ea5383bd147b340477639;hpb=947c1f964f1304242f8a6ffabacccf040f1d505e

diff --git a/FS/FS/pkg_category.pm b/FS/FS/pkg_category.pm
index 0beaf1c11..c2361cc2b 100644
--- a/FS/FS/pkg_category.pm
+++ b/FS/FS/pkg_category.pm
@@ -1,11 +1,12 @@
 package FS::pkg_category;
+use base qw( FS::category_Common );
 
 use strict;
 use vars qw( @ISA $me $DEBUG );
-use FS::Record qw( qsearch dbh );
+use FS::Record qw( qsearch qsearchs );
+use FS::pkg_class;
 use FS::part_pkg;
 
-@ISA = qw( FS::Record );
 $DEBUG = 0;
 $me = '[FS::pkg_category]';
 
@@ -36,11 +37,30 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =over 4
 
-=item categorynum - primary key (assigned automatically for new package categoryes)
+=item categorynum
 
-=item categoryname - Text name of this package category
+primary key (assigned automatically for new package categoryes)
 
-=item disabled - Disabled flag, empty or 'Y'
+=item categoryname
+
+Text name of this package category
+
+=item weight
+
+Weight
+
+=item ticketing_queueid
+
+Ticketing Queue
+
+=item condense
+
+Condense flag for invoice display, empty or 'Y'
+
+
+=item disabled
+
+Disabled flag, empty or 'Y'
 
 =back
 
@@ -50,8 +70,8 @@ inherits from FS::Record.  The following fields are currently supported:
 
 =item new HASHREF
 
-Creates a new package category.  To add the package category to the database, see
-L<"insert">.
+Creates a new package category.  To add the package category to the database,
+see L<"insert">.
 
 =cut
 
@@ -64,22 +84,11 @@ error, otherwise returns false.
 
 =item delete
 
-Deletes this package category from the database.  Only package categoryes with no
-associated package definitions can be deleted.  If there is an error, returns
-the error, otherwise returns false.
-
-=cut
-
-sub delete {
-  my $self = shift;
-
-  return "Can't delete an pkg_category with pkg_class records!"
-    if qsearch( 'pkg_class', { 'categorynum' => $self->categorynum } );
-
-  $self->SUPER::delete;
-}
+Deletes this package category from the database.  Only package categoryes with
+no associated package definitions can be deleted.  If there is an error,
+returns the error, otherwise returns false.
 
-=item replace OLD_RECORD
+=item replace [ OLD_RECORD ]
 
 Replaces OLD_RECORD with this one in the database.  If there is an error,
 returns the error, otherwise returns false.
@@ -95,22 +104,31 @@ replace methods.
 sub check {
   my $self = shift;
 
-  $self->ut_numbern('categorynum')
-  or $self->ut_text('categoryname')
-  or $self->ut_snumber('weight')
-  or $self->SUPER::check;
+  $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;
 
@@ -127,6 +145,40 @@ sub _upgrade_data {
       $weight += 10;
     }
   }
+
+  # create default category for package fees
+  my $tax_category_name = 'Taxes, Surcharges, and Fees';
+  my $tax_category = qsearchs('pkg_category', 
+    { categoryname => $tax_category_name }
+  );
+  if (!$tax_category) {
+    $tax_category = FS::pkg_category->new({
+        categoryname => $tax_category_name,
+        weight       => 1000, # doesn't really matter
+    });
+    my $error = $tax_category->insert;
+    die "error creating tax category: $error\n" if $error;
+  }
+
+  my $fee_class_name = 'Fees'; # does not appear on invoice
+  my $fee_class = qsearchs('pkg_class', { classname => $fee_class_name });
+  if (!$fee_class) {
+    $fee_class = FS::pkg_class->new({
+        classname   => $fee_class_name,
+        categorynum => $tax_category->categorynum,
+    });
+    my $error = $fee_class->insert;
+    die "error creating fee class: $error\n" if $error;
+  }
+
+  # assign it to all fee defs that don't otherwise have a class
+  foreach my $part_fee (qsearch('part_fee', { classnum => '' })) {
+    $part_fee->set('classnum', $fee_class->classnum);
+    my $error = $part_fee->replace;
+    die "error assigning default class to fee def#".$part_fee->feepart .
+      ":$error\n" if $error;
+  }
+
   '';
 }
 
@@ -136,7 +188,7 @@ sub _upgrade_data {
 
 =head1 SEE ALSO
 
-L<FS::Record>, L<FS::part_pkg>, schema.html from the base documentation.
+L<FS::category_Common>, L<FS::Record>
 
 =cut