X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fbase_rate.pm;h=43a05061069640a211b2e14aa71fb99513fe0664;hb=ecb7665dc7dadd32cdfa5a1b98be57f0850c234d;hp=440e985185a6284ab1f09d33f4f9834218c33397;hpb=94a66b78bcda5605d7ee5eb7c3e692fb2fe5cf2c;p=freeside.git

diff --git a/FS/FS/part_pkg/base_rate.pm b/FS/FS/part_pkg/base_rate.pm
index 440e98518..43a050610 100644
--- a/FS/FS/part_pkg/base_rate.pm
+++ b/FS/FS/part_pkg/base_rate.pm
@@ -12,26 +12,30 @@ use FS::part_pkg;
             # XXX it multiplies recurring fee by cust_pkg option "units", how to
             # express that
   'shortname' => 'Bulk (manual from "units" option)',
+  'inherit_fields' => [ 'global_Mixin' ],
   'fields' => {
-    'setup_fee'     => { 'name' => 'Setup fee for this package',
-                         'default' => 0,
-                       },
-    'recur_fee'     => { 'name' => 'Recurring Base fee for this package',
-                         'default' => 0,
-                       },
-    'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
-                                   ' of service at cancellation',
-                         'type' => 'checkbox',
-                       },
-    'externalid' => { 'name'   => 'Optional External ID',
+    'externalid' => { 'name'    => 'Optional External ID',
                       'default' => '',
                     },
   },
-  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 
-                    'externalid' ],
+  'fieldorder' => [ qw( externalid ) ],
   'weight' => 52,
 );
 
+sub price_info {
+    my $self = shift;
+    my $conf = new FS::Conf;
+    my $money_char = $conf->config('money_char') || '$';
+    my $setup = $self->option('setup_fee') || 0;
+    my $recur = $self->option('recur_fee', 1) || 0;
+    my $str = '';
+    $str = $money_char . $setup . ' one-time' if $setup;
+    $str .= ', ' if ($setup && $recur);
+    $str .= $money_char . $recur . ' recurring per unit ' if $recur;
+    $str;
+}
+
+
 sub calc_setup {
   my($self, $cust_pkg, $sdate, $details ) = @_;
 
@@ -59,13 +63,10 @@ sub base_recur {
 }
 
 sub calc_remain {
-  my ($self, $cust_pkg) = @_;
-  my $time = time;  #should be able to pass this in for credit calculation
+  my ($self, $cust_pkg, %options) = @_;
+  my $time = $options{'time'} || time;
   my $next_bill = $cust_pkg->getfield('bill') || 0;
-  my $last_bill = $cust_pkg->last_bill || 0;
-  return 0 if    ! $self->base_recur($cust_pkg)
-              || ! $self->option('unused_credit', 1)
-              || ! $last_bill
+  return 0 if  ! $self->base_recur($cust_pkg)
               || ! $next_bill
               || $next_bill < $time;