projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix discounts not appearing for one-time charge packages, RT#13654
[freeside.git]
/
FS
/
FS
/
part_pkg
/
flat.pm
diff --git
a/FS/FS/part_pkg/flat.pm
b/FS/FS/part_pkg/flat.pm
index
c1690f8
..
d59c694
100644
(file)
--- a/
FS/FS/part_pkg/flat.pm
+++ b/
FS/FS/part_pkg/flat.pm
@@
-1,14
+1,13
@@
package FS::part_pkg::flat;
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::discount_Mixin
+ FS::part_pkg
);
);
+
+use strict;
use vars qw( %info %usage_recharge_fields @usage_recharge_fieldorder );
use Tie::IxHash;
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;
use FS::UI::bytecount;
use FS::Conf;
@@
-219,11
+218,9
@@
sub is_free_options {
sub is_prepaid { 0; } #no, we're postpaid
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;
sub recur_temporality {
my $self = shift;