X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fflat_comission_cust.pm;h=5acf73d7ab39637a302fdd05e4b43d63b8500d7b;hp=27a93ff79157341090c2de800375e6b1a0dccdc7;hb=74e058c8a010ef6feb539248a550d0bb169c1e94;hpb=e4ae5122522f2d45c68a38eaef337a82029f2fc1

diff --git a/FS/FS/part_pkg/flat_comission_cust.pm b/FS/FS/part_pkg/flat_comission_cust.pm
index 27a93ff79..5acf73d7a 100644
--- a/FS/FS/part_pkg/flat_comission_cust.pm
+++ b/FS/FS/part_pkg/flat_comission_cust.pm
@@ -3,31 +3,16 @@ package FS::part_pkg::flat_comission_cust;
 use strict;
 use vars qw(@ISA %info);
 #use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg;
+use FS::part_pkg::flat;
 
 @ISA = qw(FS::part_pkg::flat);
 
 %info = (
   'name' => 'Flat rate with recurring commission per active customer',
-  'fields' => {
-    'setup_fee' => { 'name' => 'Setup fee for this package',
-                     'default' => 0,
-                   },
-    'recur_fee' => { 'name' => 'Recurring fee for this package',
-                     'default' => 0,
-                   },
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
-                       },
-    'comission_amount' => { 'name' => 'Commission amount per month (per active customer)',
-                            'default' => 0,
-                          },
-    'comission_depth'  => { 'name' => 'Number of layers',
-                            'default' => 1,
-                          },
-  },
-  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 'comission_depth', 'comission_amount' ],
+  'shortname' => 'Commission per active customer',
+  'inherit_fields' => [ 'flat_comission', 'global_Mixin' ],
+  'fields' => { },
+  'fieldorder' => [ ],
   #'setup' => 'what.setup_fee.value',
   #'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_main_ncancelled(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
   'weight' => '60',
@@ -38,15 +23,22 @@ sub calc_recur {
 
   my $amount = $self->option('comission_amount');
   my $num_active = scalar(
-    $cust_pkg->cust_main->referral_cust_pkgcust_main_ncancelled(
+    $cust_pkg->cust_main->referral_cust_main_ncancelled(
       $self->option('comission_depth')
     )
   );
 
-  my $error = $cust_pkg->cust_main->credit( $amount*$num_active, "commission" );
-  die $error if $error;
+  if ( $amount && $num_active ) {
+    my $error =
+      $cust_pkg->cust_main->credit( $amount*$num_active, "commission",
+                                    'reason_type'=>$self->option('reason_type'),
+                                  );
+    die $error if $error;
+  }
 
   $self->option('recur_fee');
 }
 
+sub can_discount { 0; }
+
 1;