[freeside-commits] freeside/FS/FS/part_pkg delayed_Mixin.pm, NONE, 1.1.4.2 flat_delayed.pm, 1.9.6.1, 1.9.6.2 prorate_delayed.pm, 1.4.6.2, 1.4.6.3
Ivan,,,
ivan at wavetail.420.am
Wed Aug 10 16:43:51 PDT 2011
Update of /home/cvs/cvsroot/freeside/FS/FS/part_pkg
In directory wavetail.420.am:/tmp/cvs-serv7782/FS/FS/part_pkg
Modified Files:
Tag: FREESIDE_2_1_BRANCH
flat_delayed.pm prorate_delayed.pm
Added Files:
Tag: FREESIDE_2_1_BRANCH
delayed_Mixin.pm
Log Message:
delay setup checkbox, RT#13783
Index: flat_delayed.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/flat_delayed.pm,v
retrieving revision 1.9.6.1
retrieving revision 1.9.6.2
diff -u -w -d -r1.9.6.1 -r1.9.6.2
--- flat_delayed.pm 24 Dec 2010 09:49:49 -0000 1.9.6.1
+++ flat_delayed.pm 10 Aug 2011 23:43:49 -0000 1.9.6.2
@@ -1,54 +1,22 @@
package FS::part_pkg::flat_delayed;
+use base qw(FS::part_pkg::delayed_Mixin FS::part_pkg::flat );
use strict;
-use vars qw(@ISA %info);
-#use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg::flat;
-
- at ISA = qw(FS::part_pkg::flat);
+use vars qw(%info);
%info = (
'name' => 'Free (or setup fee) for X days, then flat rate'.
' (anniversary billing)',
'shortname' => 'Anniversary, with intro period',
- 'inherit_fields' => [ 'global_Mixin' ],
+ 'inherit_fields' => [qw( global_Mixin delayed_Mixin )],
'fields' => {
- 'free_days' => { 'name' => 'Initial free days',
- 'default' => 0,
- },
- 'recur_notify' => { 'name' => 'Number of days before recurring billing'.
- ' commences to notify customer. (0 means'.
- ' no warning)',
- 'default' => 0,
+ #shouldn't this be inherited from somewhere?
+ 'suspend_bill' => { 'name' => 'Continue recurring billing while suspended',
+ 'type' => 'checkbox',
},
},
- 'fieldorder' => [ 'free_days', 'recur_notify',
- ],
- #'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',
+ 'fieldorder' => [ 'suspend_bill', ],
'weight' => 12,
);
-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 $self->SUPER::calc_remain($cust_pkg, %options);
-}
-
1;
--- NEW FILE: delayed_Mixin.pm ---
package FS::part_pkg::delayed_Mixin;
use base qw( FS::part_pkg );
use strict;
use vars qw(%info);
%info = (
'disabled' => 1,
'fields' => {
'free_days' => { 'name' => 'Initial free days',
'default' => 0,
},
'delay_setup' => { 'name' => 'Delay setup fee in addition to recurring fee',
'type' => 'checkbox',
},
'recur_notify' => { 'name' => 'Number of days before recurring billing'.
' commences to notify customer. (0 means'.
' no warning)',
'default' => 0,
},
},
'fieldorder' => [ 'free_days', 'delay_setup', 'recur_notify', ],
);
sub calc_setup {
my($self, $cust_pkg, $time ) = @_;
unless ( $self->option('delay_setup') ) {
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) = @_;
unless ( $self->option('delay_setup') ) {
my $last_bill = $cust_pkg->last_bill || 0;
my $next_bill = $cust_pkg->getfield('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 $self->SUPER::calc_remain($cust_pkg, %options);
}
1;
Index: prorate_delayed.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/prorate_delayed.pm,v
retrieving revision 1.4.6.2
retrieving revision 1.4.6.3
diff -u -w -d -r1.4.6.2 -r1.4.6.3
--- prorate_delayed.pm 5 Jun 2011 06:05:13 -0000 1.4.6.2
+++ prorate_delayed.pm 10 Aug 2011 23:43:49 -0000 1.4.6.3
@@ -1,56 +1,22 @@
package FS::part_pkg::prorate_delayed;
+use base qw( FS::part_pkg::delayed_Mixin FS::part_pkg::prorate );
use strict;
-use vars qw(@ISA %info);
-#use FS::Record qw(qsearch qsearchs);
-use FS::part_pkg;
-
- at ISA = qw(FS::part_pkg::prorate);
+use vars qw(%info);
%info = (
'name' => 'Free (or setup fee) for X days, then prorate, then flat-rate ' .
'(1st of month billing)',
'shortname' => 'Prorate (Nth of month billing), with intro period', #??
- 'inherit_fields' => [ 'global_Mixin' ],
+ 'inherit_fields' => [qw( global_Mixin delayed_Mixin )],
'fields' => {
- 'free_days' => { 'name' => 'Initial free days',
- 'default' => 0,
- },
- 'recur_notify' => { 'name' => 'Number of days before recurring billing'.
- ' commences to notify customer. (0 means'.
- ' no warning)',
- 'default' => 0,
- },
+ #shouldn't this be inherited from somewhere?
'suspend_bill' => { 'name' => 'Continue recurring billing while suspended',
'type' => 'checkbox',
},
},
- 'fieldorder' => [ 'free_days', 'recur_notify', 'suspend_bill', ],
- #'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',
+ 'fieldorder' => [ 'suspend_bill', ],
'weight' => 22,
);
-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 $last_bill = $cust_pkg->last_bill || 0;
- my $next_bill = $cust_pkg->getfield('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 $self->SUPER::calc_remain($cust_pkg, %options);
-}
-
1;
More information about the freeside-commits
mailing list