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

[Mark Wells]

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

Modified Files:
	discount_Mixin.pm 
Log Message:
show available term discounts on invoice, #14210

Index: discount_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/discount_Mixin.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -d -r1.10 -r1.11
--- discount_Mixin.pm	8 Sep 2011 22:09:56 -0000	1.10
+++ discount_Mixin.pm	1 Oct 2011 02:25:05 -0000	1.11
@@ -34,10 +34,6 @@
 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 {
@@ -171,46 +167,7 @@
     $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;