[freeside-commits] freeside/FS/FS/part_pkg delayed_Mixin.pm, 1.1.4.2, 1.1.4.3 flat.pm, 1.53.2.8, 1.53.2.9

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/part_pkg
In directory wavetail.420.am:/tmp/cvs-serv14755/FS/FS/part_pkg

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	delayed_Mixin.pm flat.pm 
Log Message:
hide start date on package order for specific package definitions, RT#13783

Index: flat.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/flat.pm,v
retrieving revision 1.53.2.8
retrieving revision 1.53.2.9
diff -u -w -d -r1.53.2.8 -r1.53.2.9
--- flat.pm	6 May 2011 00:29:28 -0000	1.53.2.8
+++ flat.pm	11 Aug 2011 00:38:59 -0000	1.53.2.9
@@ -196,6 +196,8 @@
 
 sub is_prepaid { 0; } #no, we're postpaid
 
+sub can_start_date { ! shift->option('start_1st', 1) }
+
 #XXX discounts only on recurring fees for now (no setup/one-time or usage)
 sub can_discount {
   my $self = shift;

Index: delayed_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/delayed_Mixin.pm,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -w -d -r1.1.4.2 -r1.1.4.3
--- delayed_Mixin.pm	10 Aug 2011 23:43:49 -0000	1.1.4.2
+++ delayed_Mixin.pm	11 Aug 2011 00:38:59 -0000	1.1.4.3
@@ -25,7 +25,7 @@
 sub calc_setup {
   my($self, $cust_pkg, $time ) = @_;
 
-  unless ( $self->option('delay_setup') ) {
+  unless ( $self->option('delay_setup', 1) ) {
     my $d = $cust_pkg->bill || $time;
     $d += 86400 * $self->option('free_days');
     $cust_pkg->bill($d);
@@ -37,7 +37,7 @@
 sub calc_remain {
   my ($self, $cust_pkg, %options) = @_;
 
-  unless ( $self->option('delay_setup') ) {
+  unless ( $self->option('delay_setup', 1) ) {
     my $last_bill = $cust_pkg->last_bill || 0;
     my $next_bill = $cust_pkg->getfield('bill') || 0;
     my $free_days = $self->option('free_days');
@@ -49,4 +49,6 @@
   return $self->SUPER::calc_remain($cust_pkg, %options);
 }
 
+sub can_start_date { ! shift->option('delay_setup', 1) }
+
 1;