import torrus 1.0.9

[freeside.git] / FS / FS / part_event / Action / cust_bill_fee_percent.pm

diff --git a/FS/FS/part_event/Action/cust_bill_fee_percent.pm b/FS/FS/part_event/Action/cust_bill_fee_percent.pm
index 100fc8b..48daf15 100644 (file)
--- a/FS/FS/part_event/Action/cust_bill_fee_percent.pm
+++ b/FS/FS/part_event/Action/cust_bill_fee_percent.pm
@@ -1,40 +1,28 @@
 package FS::part_event::Action::cust_bill_fee_percent;
 
 use strict;
-use base qw( FS::part_event::Action );
+use base qw( FS::part_event::Action::fee );
+use Tie::IxHash;
 
-sub description {
-  'Late fee (percentage of invoice)';
-}
+sub description { 'Late fee (percentage of invoice)'; }
 
 sub eventtable_hashref {
   { 'cust_bill' => 1 };
 }
 
 sub option_fields {
-  ( 
-    'percent' => { label=>'Percent', size=>2, },
-    'reason'  => 'Reason',
-  );
-}
+  my $class = shift;
+
+  my $t = tie my %option_fields, 'Tie::IxHash', $class->SUPER::option_fields();
+  $t->Shift; #assumes charge is first
+  $t->Unshift( 'percent'  => { label=>'Percent', size=>2, } );
 
-sub default_weight {
-  10;
+  %option_fields;
 }
 
-sub do_action {
+sub _calc_fee {
   my( $self, $cust_bill ) = @_;
-
-  #my $cust_main = $self->cust_main($cust_bill);
-  my $cust_main = $cust_bill->cust_main;
-
-  my $error = $cust_main->charge(
-    sprintf('%.2f', $cust_bill->owed * $self->option('percent') / 100 ),
-    $self->option('reason')
-  );
-  die $error if $error;
-
-  '';
+  sprintf('%.2f', $cust_bill->owed * $self->option('percent') / 100 );
 }
 
 1;