projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hide start date on package order for specific package definitions, RT#13783
[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
78c5764
..
0049bd7
100644
(file)
--- a/
FS/FS/part_pkg/flat.pm
+++ b/
FS/FS/part_pkg/flat.pm
@@
-25,7
+25,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
+56,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
+79,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
+101,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);
@@
-107,8
+115,12
@@
sub calc_setup {
my $charge = $quantity * $self->unit_setup($cust_pkg, $sdate, $details);
my $charge = $quantity * $self->unit_setup($cust_pkg, $sdate, $details);
- my $param = { 'setup_charge' => $charge };
- my $discount = $self->calc_discount($cust_pkg, $sdate, $details, $param);
+ 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);
}
sprintf('%.2f', $charge - $discount);
}
@@
-207,6
+219,8
@@
sub is_free_options {
sub is_prepaid { 0; } #no, we're postpaid
sub is_prepaid { 0; } #no, we're postpaid
+sub can_start_date { ! shift->option('start_1st', 1) }
+
#XXX discounts only on recurring fees for now (no setup/one-time or usage)
sub can_discount {
my $self = shift;
#XXX discounts only on recurring fees for now (no setup/one-time or usage)
sub can_discount {
my $self = shift;