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
d4b95b5
..
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;
@@
-25,7
+24,7
@@
tie my %contract_years, 'Tie::IxHash', (
%info = (
'name' => 'Flat rate (anniversary billing)',
'shortname' => 'Anniversary',
%info = (
'name' => 'Flat rate (anniversary billing)',
'shortname' => 'Anniversary',
- 'inherit_fields' => [ 'usage_Mixin', 'global_Mixin' ],
+ 'inherit_fields' => [ '
prorate_Mixin', '
usage_Mixin', 'global_Mixin' ],
'fields' => {
#false laziness w/voip_cdr.pm
'recur_temporality' => { 'name' => 'Charge recurring fee for period',
'fields' => {
#false laziness w/voip_cdr.pm
'recur_temporality' => { 'name' => 'Charge recurring fee for period',
@@
-56,6
+55,13
@@
tie my %contract_years, 'Tie::IxHash', (
'the customer\'s next bill date',
'type' => 'checkbox',
},
'the customer\'s next bill date',
'type' => 'checkbox',
},
+ 'prorate_round_day' => {
+ 'name' => 'When synchronizing, round the prorated '.
+ 'period to the nearest full day',
+ 'type' => 'checkbox',
+ },
+ 'add_full_period' => { 'disabled' => 1 }, # doesn't make sense with sync?
+
'suspend_bill' => { 'name' => 'Continue recurring billing while suspended',
'type' => 'checkbox',
},
'suspend_bill' => { 'name' => 'Continue recurring billing while suspended',
'type' => 'checkbox',
},
@@
-72,7
+78,8
@@
tie my %contract_years, 'Tie::IxHash', (
'fieldorder' => [ qw( recur_temporality
expire_months adjourn_months
contract_end_months
'fieldorder' => [ qw( recur_temporality
expire_months adjourn_months
contract_end_months
- start_1st sync_bill_date prorate_defer_bill
+ start_1st
+ sync_bill_date prorate_defer_bill prorate_round_day
suspend_bill unsuspend_adjust_bill
externalid ),
],
suspend_bill unsuspend_adjust_bill
externalid ),
],
@@
-93,7
+100,7
@@
sub price_info {
}
sub calc_setup {
}
sub calc_setup {
- my($self, $cust_pkg, $sdate, $details ) = @_;
+ my($self, $cust_pkg, $sdate, $details
, $param
) = @_;
return 0 if $self->prorate_setup($cust_pkg, $sdate);
return 0 if $self->prorate_setup($cust_pkg, $sdate);
@@
-106,7
+113,15
@@
sub calc_setup {
my $quantity = $cust_pkg->quantity || 1;
my $charge = $quantity * $self->unit_setup($cust_pkg, $sdate, $details);
my $quantity = $cust_pkg->quantity || 1;
my $charge = $quantity * $self->unit_setup($cust_pkg, $sdate, $details);
- sprintf('%.2f', $charge);
+
+ my $discount = 0;
+ if ( $charge > 0 ) {
+ $param->{'setup_charge'} = $charge;
+ $discount = $self->calc_discount($cust_pkg, $sdate, $details, $param);
+ delete $param->{'setup_charge'};
+ }
+
+ sprintf('%.2f', $charge - $discount);
}
sub unit_setup {
}
sub unit_setup {
@@
-123,11
+138,11
@@
sub calc_recur {
my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
return 0
my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
return 0
- if $self->
option('recur_temporality', 1)
eq 'preceding' && $last_bill == 0;
+ if $self->
recur_temporality
eq 'preceding' && $last_bill == 0;
my $charge = $self->base_recur($cust_pkg, $sdate);
my $charge = $self->base_recur($cust_pkg, $sdate);
- if ( my $cutoff_day = $self->
flat_
cutoff_day($cust_pkg) ) {
- $charge = $self->calc_prorate(@_);
+ if ( my $cutoff_day = $self->cutoff_day($cust_pkg) ) {
+ $charge = $self->calc_prorate(@_
, $cutoff_day
);
}
elsif ( $param->{freq_override} ) {
# XXX not sure if this should be mutually exclusive with sync_bill_date.
}
elsif ( $param->{freq_override} ) {
# XXX not sure if this should be mutually exclusive with sync_bill_date.
@@
-140,7
+155,7
@@
sub calc_recur {
return sprintf('%.2f', $charge - $discount);
}
return sprintf('%.2f', $charge - $discount);
}
-sub
flat_
cutoff_day {
+sub cutoff_day {
my $self = shift;
my $cust_pkg = shift;
if ( $self->option('sync_bill_date',1) ) {
my $self = shift;
my $cust_pkg = shift;
if ( $self->option('sync_bill_date',1) ) {
@@
-203,10
+218,13
@@
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 {
+sub can_start_date { ! shift->option('start_1st', 1) }
+
+sub can_discount { 1; }
+
+sub recur_temporality {
my $self = shift;
my $self = shift;
- $self->
freq =~ /^\d+$/ && $self->freq > 0
;
+ $self->
option('recur_temporality', 1)
;
}
sub usage_valuehash {
}
sub usage_valuehash {