X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fdiscount_Mixin.pm;h=63909b3829b1a172c65137957662b1e7a0654f1b;hp=17e2f53445b8bce43684ca02a3701c8fa5e5bee3;hb=a58af29105ebefb04c0abbcee6d392446fff9eb0;hpb=49ea5f3f188b474557417dd58bb59b7334c5837b

diff --git a/FS/FS/part_pkg/discount_Mixin.pm b/FS/FS/part_pkg/discount_Mixin.pm
index 17e2f5344..63909b382 100644
--- a/FS/FS/part_pkg/discount_Mixin.pm
+++ b/FS/FS/part_pkg/discount_Mixin.pm
@@ -1,14 +1,12 @@
 package FS::part_pkg::discount_Mixin;
 
 use strict;
-use vars qw(@ISA %info);
-use FS::part_pkg;
+use vars qw( %info );
+use Time::Local qw( timelocal );
+use List::Util  qw( min );
 use FS::cust_pkg;
 use FS::cust_bill_pkg_discount;
-use Time::Local qw(timelocal);
-use List::Util 'min';
 
-@ISA = qw(FS::part_pkg);
 %info = ( 'disabled' => 1 );
 
 =head1 NAME
@@ -40,10 +38,11 @@ discount and generates an invoice detail describing it.
 
 sub calc_discount {
   my($self, $cust_pkg, $sdate, $details, $param ) = @_;
+  my $conf = new FS::Conf;
 
   my $br = $self->base_recur_permonth($cust_pkg, $sdate);
   $br += $param->{'override_charges'} if $param->{'override_charges'};
-  
+ 
   my $tot_discount = 0;
   #UI enforces just 1 for now, will need ordering when they can be stacked
 
@@ -92,14 +91,13 @@ sub calc_discount {
       $discount->months - $cust_pkg_discount->months_used )
     : $chg_months;
 
-    if(defined $param->{'setup_charge'}) {
+    if (defined $param->{'setup_charge'}) {
         next unless $discount->setup;
 
-        if ( $discount->percent ) {
+        if ( $discount->percent > 0 ) {
             $amount = sprintf('%.2f', $discount->percent * $param->{'setup_charge'} / 100 );
             $months = 1;
-        }
-        elsif ( $discount->amount && $discount->months == 1) {
+        } elsif ( $discount->amount > 0 && $discount->months == 1) {
             $discount_left = $param->{'setup_charge'} - $discount->amount;
             $amount = $param->{'setup_charge'} if $discount_left < 0;
             $amount = $discount->amount if $discount_left >= 0;
@@ -108,50 +106,60 @@ sub calc_discount {
             # transfer remainder of discount, if any, to recur
             $param->{'discount_left_recur'}{$discount->discountnum} = 
                 0 - $discount_left if $discount_left < 0;
-        }
-        else {
+        } else {
             next; 
         }
-    }
-    elsif ( defined $param->{'discount_left_recur'}{$discount->discountnum}
-        && $param->{'discount_left_recur'}{$discount->discountnum} > 0) {
+    } elsif ( defined $param->{'discount_left_recur'}{$discount->discountnum}
+              && $param->{'discount_left_recur'}{$discount->discountnum} > 0
+            ) {
         # use up transferred remainder of discount from setup
         $amount = $param->{'discount_left_recur'}{$discount->discountnum};
         $param->{'discount_left_recur'}{$discount->discountnum} = 0;
         $months = 1;
+    } elsif (    $discount->setup
+              && $discount->months == 1
+              && $discount->amount > 0
+            ) {
+        next;
     }
 
-    my $error = $cust_pkg_discount->increment_months_used($months)
-        if (defined $param->{'real_pkgpart'} 
-            && $cust_pkg->pkgpart == $param->{'real_pkgpart'} 
-            && ! defined $param->{'setup_charge'});
-    die "error discounting: $error" if $error;
+    if ( ! defined $param->{'setup_charge'} ) {
+      my $error = $cust_pkg_discount->increment_months_used($months)
+        if defined $param->{'real_pkgpart'} 
+        && $cust_pkg->pkgpart == $param->{'real_pkgpart'};
+      die "error discounting: $error" if $error;
 
-    $amount *= $months;
-    $amount = sprintf('%.2f', $amount);
+      $amount = min($amount, $br);
+      $amount *= $months;
+    }
+
+    $amount = sprintf('%.2f', $amount + 0.00000001 ); #so 1.005 rounds to 1.01
 
     next unless $amount > 0;
-            
+
     # transfer remainder of discount, if any, to setup
-    if ( $discount->setup && $discount->amount
+    if ( $discount->setup && $discount->amount > 0
         && (!$discount->months || $discount->months != 1)
-        && !defined $param->{'setup_charge'}) {
-        $discount_left = $br - $amount;
-        $amount = $br if $discount_left < 0;
+        && !defined $param->{'setup_charge'}
+       )
+    {
+      $discount_left = $br - $amount;
+      if ( $discount_left < 0 ) {
+        $amount = $br;
         $param->{'discount_left_setup'}{$discount->discountnum} = 
-                                    0 - $discount_left if $discount_left < 0;
+          0 - $discount_left;
+      }
     }
 
     #record details in cust_bill_pkg_discount
     my $cust_bill_pkg_discount = new FS::cust_bill_pkg_discount {
       'pkgdiscountnum' => $cust_pkg_discount->pkgdiscountnum,
       'amount'         => $amount,
-      'months'         => $months,
+      'months'         => ( defined($param->{'setup_charge'}) ? 0 : $months ),
     };
     push @{ $param->{'discounts'} }, $cust_bill_pkg_discount;
 
     #add details on discount to invoice
-    my $conf = new FS::Conf;
     my $money_char = $conf->config('money_char') || '$';
     $months = sprintf('%.2f', $months) if $months =~ /\./;