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=761d32292c1e56b5c044c0afbf780530ca4813e4;hb=a58af29105ebefb04c0abbcee6d392446fff9eb0;hpb=fe8914c3b55d747fc4c3559b17d8d0ef6ed1a0b3

diff --git a/FS/FS/part_pkg/discount_Mixin.pm b/FS/FS/part_pkg/discount_Mixin.pm
index 761d32292..63909b382 100644
--- a/FS/FS/part_pkg/discount_Mixin.pm
+++ b/FS/FS/part_pkg/discount_Mixin.pm
@@ -34,10 +34,6 @@ Takes all the arguments of calc_recur.  Calculates and returns  the amount
 by which to reduce the recurring fee; also increments months used on the 
 discount and generates an invoice detail describing it.
 
-If the configuration option 'discount-show_available' is enabled, and this 
-package is eligible for a prepayment discount but doesn't have one, an 
-invoice detail will be generated to describe the available discounts.
-
 =cut
 
 sub calc_discount {
@@ -46,7 +42,7 @@ sub calc_discount {
 
   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
 
@@ -95,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;
@@ -111,49 +106,56 @@ 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 ) {
+    } 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 = min($amount, $br);
-    $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;
 
@@ -171,46 +173,7 @@ sub calc_discount {
     $tot_discount += $amount;
   }
 
-  if (!@cust_pkg_discount and $conf->exists('discount-show_available') ) {
-    push @$details, $self->available_discounts;
-  }
-
   sprintf('%.2f', $tot_discount);
 }
 
-=item available_discounts
-
-Returns a list of details decribing the available prepayment discounts 
-for this package.
-
-=cut
-
-sub available_discounts {
-  my $self = shift;
-  return if $self->freq ne '1';
-  my @details;
-  my $money_char = FS::Conf->new->config('money_char') || '$';
-  my @discounts = map { $_->discount } $self->part_pkg_discount;
-  # probably the most logical way to arrange these
-  foreach my $discount (sort { $a->months <=> $b->months } @discounts) {
-    my $months = $discount->months;
-    my $amount;
-    if ( $discount->amount > 0 ) {
-      $amount = $money_char . sprintf('%.2f', $discount->amount);
-    }
-    elsif ( $discount->percent ) {
-      $amount = $discount->percent .'%';
-    }
-    else { #?
-      next;
-    }
-    push @details, "Prepay $months months for $amount discount."
-      # better way to display this?
-      # if it's a problem, we'll add discount.invoice_text or something
-      # for the customer-visible text line.
-    }
-  return @details;
-}
-
-
 1;