fix some indentation and the default cutoff day

3 files changed, 30 insertions, 19 deletions

diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index 59b625746..bed86cc8d 100644
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -20,10 +20,11 @@ use FS::part_pkg;
                                    ' of service at cancellation',
                          'type' => 'checkbox',
                        },
+    'externalid' => { 'name'   => 'Optional External ID',
+                      'default' => '',
+                    },
   },
-  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit' ],
-  #'setup' => 'what.setup_fee.value',
-  #'recur' => 'what.recur_fee.value',
+  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 'externalid' ],
   'weight' => 10,
 );
 
diff --git a/FS/FS/part_pkg/prorate.pm b/FS/FS/part_pkg/prorate.pm
index ac2f656b9..d3df01034 100644
--- a/FS/FS/part_pkg/prorate.pm
+++ b/FS/FS/part_pkg/prorate.pm
@@ -24,34 +24,38 @@ use FS::part_pkg::flat;
     'cutoff_day' => { 'name' => 'billing day',
 			 'default' => 1,
 					    },
-
+    #it would be better if this had to be turned on, its confusing
+    'externalid' => { 'name'   => 'Optional External ID',
+                      'default' => '',
+                    },
  },
-  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 'cutoff_day' ],
-  #'setup' => 'what.setup_fee.value',
-  #'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; my $mstart = timelocal(0,0,0,1,$mon,$year); my $mend = timelocal(0,0,0,1, $mon == 11 ? 0 : $mon+1, $year+($mon==11)); $sdate = $mstart; ( $part_pkg->freq - 1 ) * \' + what.recur_fee.value + \' / $part_pkg->freq + \' + what.recur_fee.value + \' / $part_pkg->freq * ($mend-$mnow) / ($mend-$mstart) ; \'',
+  'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 'cutoff_day',
+                    'externalid', ],
   'freq' => 'm',
   'weight' => 20,
 );
 
 sub calc_recur {
   my($self, $cust_pkg, $sdate ) = @_;
-  my $cutoff_day=$self->option('cutoff_day') or 1;
+  my $cutoff_day = $self->option('cutoff_day') || 1;
   my $mnow = $$sdate;
   my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];
   my $mend;
   my $mstart;
-  if($mday > $cutoff_day){
-    $mend = timelocal(0,0,0,$cutoff_day, $mon == 11 ? 0 : $mon+1, $year+($mon==11));
-    $mstart=  timelocal(0,0,0,$cutoff_day,$mon,$year);  
+  
+  if ( $mday > $cutoff_day ) {
+    $mend =
+      timelocal(0,0,0,$cutoff_day, $mon == 11 ? 0 : $mon+1, $year+($mon==11));
+    $mstart =
+      timelocal(0,0,0,$cutoff_day,$mon,$year);  
 
-  }
-  else{
+  } else {
     $mend = timelocal(0,0,0,$cutoff_day, $mon, $year);
-     if ($mon==0) {$mon=11;$year--;} else {$mon--;}
+    if ($mon==0) {$mon=11;$year--;} else {$mon--;}
     $mstart=  timelocal(0,0,0,$cutoff_day,$mon,$year);  
   }
 
-   $$sdate = $mstart;
+  $$sdate = $mstart;
   my $permonth = $self->option('recur_fee') / $self->freq;
 
   $permonth * ( ( $self->freq - 1 ) + ($mend-$mnow) / ($mend-$mstart) );
diff --git a/FS/FS/part_pkg/subscription.pm b/FS/FS/part_pkg/subscription.pm
index ccfcc00a8..bfb0582f3 100644
--- a/FS/FS/part_pkg/subscription.pm
+++ b/FS/FS/part_pkg/subscription.pm
@@ -20,8 +20,12 @@ use FS::part_pkg::flat;
     'cutoff_day' => { 'name' => 'billing day',
                       'default' => 1,
                     },
-
+    #it would be better if this had to be turned on, its confusing
+    'externalid' => { 'name'   => 'Optional External ID',
+                      'default' => '',
+                    },
   },
+  'fieldorder' => [ 'setup_fee', 'recur_fee', 'cutoff_day', 'externalid' ],
   'fieldorder' => [ 'setup_fee', 'recur_fee','cutoff_day'],
   'freq' => 'm',
   'weight' => 30,
@@ -29,16 +33,18 @@ use FS::part_pkg::flat;
 
 sub calc_recur {
   my($self, $cust_pkg, $sdate ) = @_;
-  my $cutoff_day=$self->option('cutoff_day') or 1;
+  my $cutoff_day = $self->option('cutoff_day') || 1;
   my $mnow = $$sdate;
   my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5];
 
-  if($mday <$cutoff_day){
+  if ( $mday < $cutoff_day ) {
      if ($mon==0) {$mon=11;$year--;}
      else {$mon--;}
   }
-$$sdate = timelocal(0,0,0,$cutoff_day,$mon,$year);
+
+  $$sdate = timelocal(0,0,0,$cutoff_day,$mon,$year);
 
   $self->option('recur_fee');
 }
+
 1;