[freeside-commits] freeside/FS/FS/part_pkg flat_delayed.pm, 1.5, 1.5.2.1 prorate_delayed.pm, NONE, 1.1.2.2 voip_cdr.pm, 1.3, 1.3.2.1

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/part_pkg
In directory wavetail:/tmp/cvs-serv15890

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	flat_delayed.pm voip_cdr.pm 
Added Files:
      Tag: FREESIDE_1_7_BRANCH
	prorate_delayed.pm 
Log Message:
backport 1.9 enhancements for flat_delayed, prorate_delayed, and voip_cdr plans

Index: voip_cdr.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/voip_cdr.pm,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- voip_cdr.pm	12 Jul 2006 00:20:23 -0000	1.3
+++ voip_cdr.pm	21 Dec 2007 22:27:14 -0000	1.3.2.1
@@ -130,7 +130,7 @@
         ###
 
         my( $to_or_from, $number );
-        if ( $cdr->dst =~ /^(\+?1)?8[02-8]{2}/ ) { #tollfree call
+        if ( $cdr->dst =~ /^(\+?1)?8([02-8])\1/ ) { #tollfree call
           $to_or_from = 'from';
           $number = $cdr->src;
         } else { #regular call

--- NEW FILE: prorate_delayed.pm ---
package FS::part_pkg::prorate_delayed;

use strict;
use vars qw(@ISA %info);
#use FS::Record qw(qsearch qsearchs);
use FS::part_pkg;

@ISA = qw(FS::part_pkg::prorate);

%info = (
  'name' => 'Free (or setup fee) for X days, then prorate, then flat-rate ' .
         '(1st of month billing)',
  'fields' =>  {
    'setup_fee' => { 'name' => 'Setup fee for this package',
                     'default' => 0,
                   },
    'free_days' => { 'name' => 'Initial free days',
                     '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',
                       },
  },
  'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee', 'unused_credit' ],
  #'setup' => '\'my $d = $cust_pkg->bill || $time; $d += 86400 * \' + what.free_days.value + \'; $cust_pkg->bill($d); $cust_pkg_mod_flag=1; \' + what.setup_fee.value',
  #'recur' => 'what.recur_fee.value',
  'weight' => 50,
);

sub calc_setup {
  my($self, $cust_pkg, $time ) = @_;

  my $d = $cust_pkg->bill || $time;
  $d += 86400 * $self->option('free_days');
  $cust_pkg->bill($d);
  
  $self->option('setup_fee');
}

sub calc_remain {
  my ($self, $cust_pkg, %options) = @_;
  my $next_bill = $cust_pkg->getfield('bill') || 0;
  my $last_bill = $cust_pkg->last_bill || 0;
  my $free_days = $self->option('free_days');

  return 0 if    $last_bill + (86400 * $free_days) == $next_bill
              && $last_bill == $cust_pkg->setup;

  return 0 if    ! $self->base_recur
              || ! $self->option('unused_credit', 1)
              || ! $last_bill
              || ! $next_bill;

  return $self->SUPER::calc_remain($cust_pkg, %options);
}

1;

Index: flat_delayed.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/flat_delayed.pm,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- flat_delayed.pm	23 Jan 2007 23:43:00 -0000	1.5
+++ flat_delayed.pm	21 Dec 2007 22:27:14 -0000	1.5.2.1
@@ -48,4 +48,21 @@
   $self->option('setup_fee');
 }
 
+sub calc_remain {
+  my ($self, $cust_pkg, %options) = @_;
+  my $next_bill = $cust_pkg->getfield('bill') || 0;
+  my $last_bill = $cust_pkg->last_bill || 0;
+  my $free_days = $self->option('free_days');
+
+  return 0 if    $last_bill + (86400 * $free_days) == $next_bill
+              && $last_bill == $cust_pkg->setup;
+
+  return 0 if    ! $self->base_recur
+              || ! $self->option('unused_credit', 1)
+              || ! $last_bill
+              || ! $next_bill;
+
+  return $self->SUPER::calc_remain($cust_pkg, %options);
+}
+
 1;