[freeside-commits] freeside/FS/FS/part_pkg discount_Mixin.pm, 1.11, 1.12

[Ivan,,,]

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

Modified Files:
	discount_Mixin.pm 
Log Message:
fix discounting setup when recur < setup, RT#11512

Index: discount_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/discount_Mixin.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -d -r1.11 -r1.12
--- discount_Mixin.pm	1 Oct 2011 02:25:05 -0000	1.11
+++ discount_Mixin.pm	24 Oct 2011 22:56:18 -0000	1.12
@@ -94,11 +94,10 @@
     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;
@@ -107,42 +106,49 @@
             # 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 ) {
+    } elsif (    $discount->setup
+              && $discount->months == 1
+              && $discount->amount > 0
+            ) {
         next;
     }
 
+    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'} 
-            && ! defined $param->{'setup_charge'});
+        if defined $param->{'real_pkgpart'} 
+        && $cust_pkg->pkgpart == $param->{'real_pkgpart'};
     die "error discounting: $error" if $error;
 
     $amount = min($amount, $br);
     $amount *= $months;
+    }
+
     $amount = sprintf('%.2f', $amount);
 
     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'}) {
+        && !defined $param->{'setup_charge'}
+       )
+    {
         $discount_left = $br - $amount;
-        $amount = $br if $discount_left < 0;
+      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