projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import torrus 1.0.9
[freeside.git]
/
FS
/
FS
/
part_event
/
Action
/
fee.pm
diff --git
a/FS/FS/part_event/Action/fee.pm
b/FS/FS/part_event/Action/fee.pm
index
bc12828
..
68288d0
100644
(file)
--- a/
FS/FS/part_event/Action/fee.pm
+++ b/
FS/FS/part_event/Action/fee.pm
@@
-10,17
+10,24
@@
sub event_stage { 'pre-bill'; }
sub option_fields {
(
'charge' => { label=>'Amount', type=>'money', }, # size=>7, },
sub option_fields {
(
'charge' => { label=>'Amount', type=>'money', }, # size=>7, },
- 'reason' => 'Reason',
+ 'reason' => 'Reason (invoice line item)',
+ 'classnum' => { label=>'Package class' => type=>'select-pkg_class', },
'taxclass' => { label=>'Tax class', type=>'select-taxclass', },
'taxclass' => { label=>'Tax class', type=>'select-taxclass', },
- 'nextbill' => { label=>'Hold late fee until next invoice',
- type=>'checkbox', value=>'Y' },
'setuptax' => { label=>'Late fee is tax exempt',
type=>'checkbox', value=>'Y' },
'setuptax' => { label=>'Late fee is tax exempt',
type=>'checkbox', value=>'Y' },
+ 'nextbill' => { label=>'Hold late fee until next invoice',
+ type=>'checkbox', value=>'Y' },
);
}
sub default_weight { 10; }
);
}
sub default_weight { 10; }
+sub _calc_fee {
+ #my( $self, $cust_object ) = @_;
+ my $self = shift;
+ $self->option('charge');
+}
+
sub do_action {
my( $self, $cust_object ) = @_;
sub do_action {
my( $self, $cust_object ) = @_;
@@
-29,14
+36,16
@@
sub do_action {
my $conf = new FS::Conf;
my %charge = (
my $conf = new FS::Conf;
my %charge = (
- 'amount' => $self->
option('charge'
),
+ 'amount' => $self->
_calc_fee($cust_object
),
'pkg' => $self->option('reason'),
'taxclass' => $self->option('taxclass'),
'pkg' => $self->option('reason'),
'taxclass' => $self->option('taxclass'),
- 'classnum' => scalar($conf->config('finance_pkgclass')),
+ 'classnum' => ( $self->option('classnum')
+ || scalar($conf->config('finance_pkgclass')) ),
'setuptax' => $self->option('setuptax'),
);
'setuptax' => $self->option('setuptax'),
);
- $charge{'start_date'} = $cust_main->next_bill_date #unless its more than N months away?
+ #unless its more than N months away?
+ $charge{'start_date'} = $cust_main->next_bill_date
if $self->option('nextbill');
my $error = $cust_main->charge( \%charge );
if $self->option('nextbill');
my $error = $cust_main->charge( \%charge );