X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_event%2FAction%2Ffee.pm;h=68288d090f7495c2a184754862240a2b92b034e3;hp=c700301e23e486cbafb0c61e712b48f256b07a26;hb=74e058c8a010ef6feb539248a550d0bb169c1e94;hpb=5470df9cd0062a366aaf8ff7d1e66cf6fac60311

diff --git a/FS/FS/part_event/Action/fee.pm b/FS/FS/part_event/Action/fee.pm
index c700301e2..68288d090 100644
--- a/FS/FS/part_event/Action/fee.pm
+++ b/FS/FS/part_event/Action/fee.pm
@@ -10,30 +10,42 @@ sub event_stage { 'pre-bill'; }
 sub option_fields {
   ( 
     'charge'   => { label=>'Amount', type=>'money', }, # size=>7, },
-    'reason'   => 'Reason',
+    'reason'   => 'Reason (invoice line item)',
+    'classnum' => { label=>'Package class' => type=>'select-pkg_class', },
     'taxclass' => { label=>'Tax class', type=>'select-taxclass', },
-    'nextbill' => { label=>'Hold late fee until next invoice',
-                    type=>'checkbox', value=>'Y' },
     'setuptax' => { label=>'Late fee is tax exempt',
                     type=>'checkbox', value=>'Y' },
+    'nextbill' => { label=>'Hold late fee until next invoice',
+                    type=>'checkbox', value=>'Y' },
   );
 }
 
 sub default_weight { 10; }
 
+sub _calc_fee {
+  #my( $self, $cust_object ) = @_;
+  my $self = shift;
+  $self->option('charge');
+}
+
 sub do_action {
   my( $self, $cust_object ) = @_;
 
   my $cust_main = $self->cust_main($cust_object);
 
+  my $conf = new FS::Conf;
+
   my %charge = (
-    'amount'   => $self->option('charge'),
+    'amount'   => $self->_calc_fee($cust_object),
     'pkg'      => $self->option('reason'),
     'taxclass' => $self->option('taxclass'),
+    'classnum' => ( $self->option('classnum')
+                      || scalar($conf->config('finance_pkgclass')) ),
     'setuptax' => $self->option('setuptax'),
   );
 
-  $charge{'start_date'} = $cust_main->next_bill_date #unless its more than N months away?
+  #unless its more than N months away?
+  $charge{'start_date'} = $cust_main->next_bill_date
     if $self->option('nextbill');
 
   my $error = $cust_main->charge( \%charge );