use strict;
use vars qw(@ISA %info);
#use FS::Record qw(qsearch);
+use FS::UI::bytecount;
use FS::part_pkg;
@ISA = qw(FS::part_pkg);
%info = (
'name' => 'Flat rate (anniversary billing)',
+ 'shortname' => 'Anniversary',
'fields' => {
'setup_fee' => { 'name' => 'Setup fee for this package',
'default' => 0,
},
'seconds' => { 'name' => 'Time limit for this package',
'default' => '',
+ 'check' => sub { shift =~ /^\d*$/ },
},
'upbytes' => { 'name' => 'Upload limit for this package',
'default' => '',
+ 'check' => sub { shift =~ /^\d*$/ },
+ 'format' => \&FS::UI::bytecount::display_bytecount,
+ 'parse' => \&FS::UI::bytecount::parse_bytecount,
},
'downbytes' => { 'name' => 'Download limit for this package',
'default' => '',
+ 'check' => sub { shift =~ /^\d*$/ },
+ 'format' => \&FS::UI::bytecount::display_bytecount,
+ 'parse' => \&FS::UI::bytecount::parse_bytecount,
},
'totalbytes' => { 'name' => 'Transfer limit for this package',
'default' => '',
+ 'check' => sub { shift =~ /^\d*$/ },
+ 'format' => \&FS::UI::bytecount::display_bytecount,
+ 'parse' => \&FS::UI::bytecount::parse_bytecount,
},
'recharge_amount' => { 'name' => 'Cost of recharge for this package',
'default' => '',
+ 'check' => sub { shift =~ /^\d*(\.\d{2})?$/ },
},
'recharge_seconds' => { 'name' => 'Recharge time for this package',
'default' => '',
+ 'check' => sub { shift =~ /^\d*$/ },
},
'recharge_upbytes' => { 'name' => 'Recharge upload for this package',
'default' => '',
+ 'check' => sub { shift =~ /^\d*$/ },
+ 'format' => \&FS::UI::bytecount::display_bytecount,
+ 'parse' => \&FS::UI::bytecount::parse_bytecount,
},
'recharge_downbytes' => { 'name' => 'Recharge download for this package',
'default' => '',
+ 'check' => sub { shift =~ /^\d*$/ },
+ 'format' => \&FS::UI::bytecount::display_bytecount,
+ 'parse' => \&FS::UI::bytecount::parse_bytecount,
},
'recharge_totalbytes' => { 'name' => 'Recharge transfer for this package',
'default' => '',
+ 'check' => sub { shift =~ /^\d*$/ },
+ 'format' => \&FS::UI::bytecount::display_bytecount,
+ 'parse' => \&FS::UI::bytecount::parse_bytecount,
},
+ 'usage_rollover' => { 'name' => 'Allow usage from previous period to roll '.
+ ' over into current period',
+ 'type' => 'checkbox',
+ },
+ 'recharge_reset' => { 'name' => 'Reset usage to these values on manual '.
+ 'package recharge',
+ 'type' => 'checkbox',
+ },
},
'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit',
'seconds', 'upbytes', 'downbytes', 'totalbytes',
'recharge_amount', 'recharge_seconds', 'recharge_upbytes',
'recharge_downbytes', 'recharge_totalbytes',
- 'externalid' ],
+ 'usage_rollover', 'recharge_reset', 'externalid' ],
'weight' => 10,
);
sub calc_setup {
my($self, $cust_pkg, $sdate, $details ) = @_;
- my ( $i, $count ) = ( 0, $self->option( 'additional_count' ) );
+ my $i = 0;
+ my $count = $self->option( 'additional_count', 'quiet' ) || 0;
while ($i < $count) {
push @$details, $self->option( 'additional_info' . $i++ );
}
sub calc_recur {
my($self, $cust_pkg) = @_;
- $self->reset_usage($cust_pkg);
$self->base_recur($cust_pkg);
}
sub base_recur {
my($self, $cust_pkg) = @_;
- $self->option('recur_fee');
+ $self->option('recur_fee', 1) || 0;
}
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;
+ if ($options{'time'}) {
+ $time = $options{'time'};
+ } else {
+ $time = time;
+ }
+
my $next_bill = $cust_pkg->getfield('bill') || 0;
my $last_bill = $cust_pkg->last_bill || 0;
return 0 if ! $self->base_recur
sub reset_usage {
my($self, $cust_pkg) = @_;
my %values = map { $_, $self->option($_) }
- grep { $self->option($_) }
+ grep { $self->option($_, 'hush') }
qw(seconds upbytes downbytes totalbytes);
- $cust_pkg->set_usage(\%values);
+ if ($self->option('usage_rollover', 1)) {
+ $cust_pkg->recharge(\%values);
+ }else{
+ $cust_pkg->set_usage(\%values);
+ }
}
1;