fix problem with expiring discounts, RT#6679

[freeside.git] / FS / FS / part_pkg / flat.pm

diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm
index b825dde..cc23105 100644 (file)
--- a/FS/FS/part_pkg/flat.pm
+++ b/FS/FS/part_pkg/flat.pm
@@ -107,19 +107,30 @@ tie my %temporalities, 'Tie::IxHash',
                              'type' => 'select',
                              'select_options' => \%temporalities,
                            },
-
-    %usage_fields,
-    %usage_recharge_fields,
-
     'unused_credit' => { 'name' => 'Credit the customer for the unused portion'.
                                    ' of service at cancellation',
                          'type' => 'checkbox',
                        },
+
+    #used in cust_pkg.pm so could add to any price plan
+    'expire_months' => { 'name' => 'Auto-add an expiration date this number of months out',
+                       },
+    #used in cust_pkg.pm so could add to any price plan where it made sense
+    'start_1st'     => { 'name' => 'Auto-add a start date to the 1st, ignoring the current month.',
+                         'type' => 'checkbox',
+                       },
+
+    %usage_fields,
+    %usage_recharge_fields,
+
     'externalid' => { 'name'   => 'Optional External ID',
                       'default' => '',
                     },
   },
-  'fieldorder' => [ qw( setup_fee recur_fee recur_temporality unused_credit ),
+  'fieldorder' => [ qw( setup_fee recur_fee
+                        recur_temporality unused_credit
+                        expire_months start_1st
+                      ),
                     @usage_fieldorder, @usage_recharge_fieldorder,
                     qw( externalid ),
                   ],
@@ -147,8 +158,7 @@ sub unit_setup {
 }
 
 sub calc_recur {
-  my $self = shift;
-  my($cust_pkg) = @_;
+  my($self, $cust_pkg, $sdate, $details, $param ) = @_;
 
   #my $last_bill = $cust_pkg->last_bill;
   my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
@@ -156,22 +166,22 @@ sub calc_recur {
   return 0
     if $self->option('recur_temporality', 1) eq 'preceding' && $last_bill == 0;
 
-  my $br = $self->base_recur(@_);
+  my $br = $self->base_recur($cust_pkg);
 
-  my $discount = $self->calc_discount(@_);
+  my $discount = $self->calc_discount($cust_pkg, $sdate, $details, $param);
 
   sprintf('%.2f', $br - $discount);
 }
 
 sub calc_discount {
-  my $self = shift;
-  my($cust_pkg, $sdate, $details, $param ) = @_;
+  my($self, $cust_pkg, $sdate, $details, $param ) = @_;
 
-  my $br = $self->base_recur(@_);
+  my $br = $self->base_recur($cust_pkg);
 
   my $tot_discount = 0;
   #UI enforces just 1 for now, will need ordering when they can be stacked
-  foreach my $cust_pkg_discount ( $cust_pkg->cust_pkg_discount_active ) {
+  my @cust_pkg_discount = $cust_pkg->cust_pkg_discount_active;
+  foreach my $cust_pkg_discount ( @cust_pkg_discount ) {
      my $discount = $cust_pkg_discount->discount;
      #UI enforces one or the other (for now?  probably for good)
      my $amount = 0;
@@ -182,7 +192,7 @@ sub calc_discount {
      
      my $months = $discount->months
                     ? min( $chg_months,
-                           $discount->months - $cust_pkg->months_used )
+                           $discount->months - $cust_pkg_discount->months_used )
                     : $chg_months;
 
      my $error = $cust_pkg_discount->increment_months_used($months);