X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_pkg%2Fflat.pm;h=d59c694b1eaa788eb2c7ba0485b170632b88e0ba;hp=c1690f87d26a3af03783c7f09f2d2cbbb71647a0;hb=b79a8cb932946c849328a3c117c35821d9d21e66;hpb=90dfd05877a331fb13ba50389e3d8a3105465bc7 diff --git a/FS/FS/part_pkg/flat.pm b/FS/FS/part_pkg/flat.pm index c1690f87d..d59c694b1 100644 --- a/FS/FS/part_pkg/flat.pm +++ b/FS/FS/part_pkg/flat.pm @@ -1,14 +1,13 @@ package FS::part_pkg::flat; - -use strict; -use base qw( FS::part_pkg - FS::part_pkg::prorate_Mixin +use base qw( FS::part_pkg::prorate_Mixin FS::part_pkg::discount_Mixin + FS::part_pkg ); + +use strict; use vars qw( %info %usage_recharge_fields @usage_recharge_fieldorder ); use Tie::IxHash; -use List::Util qw(min); # max); -#use FS::Record qw(qsearch); +use List::Util qw( min ); use FS::UI::bytecount; use FS::Conf; @@ -219,11 +218,9 @@ sub is_free_options { sub is_prepaid { 0; } #no, we're postpaid -#XXX discounts only on recurring fees for now (no setup/one-time or usage) -sub can_discount { - my $self = shift; - $self->freq =~ /^\d+$/ && $self->freq > 0; -} +sub can_start_date { ! shift->option('start_1st', 1) } + +sub can_discount { 1; } sub recur_temporality { my $self = shift;