projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pkg_cancel event action, RT#10141
[freeside.git]
/
FS
/
FS
/
part_event
/
Action
/
pkg_referral_credit.pm
diff --git
a/FS/FS/part_event/Action/pkg_referral_credit.pm
b/FS/FS/part_event/Action/pkg_referral_credit.pm
index
98d9820
..
e7c92d6
100644
(file)
--- a/
FS/FS/part_event/Action/pkg_referral_credit.pm
+++ b/
FS/FS/part_event/Action/pkg_referral_credit.pm
@@
-22,9
+22,8
@@
sub option_fields {
}
}
-#a little false laziness w/pkg_referral_credit_pkg
sub do_action {
sub do_action {
- my( $self, $cust_pkg ) = @_;
+ my( $self, $cust_pkg
, $cust_event
) = @_;
my $cust_main = $self->cust_main($cust_pkg);
my $cust_main = $self->cust_main($cust_pkg);
@@
-36,14
+35,17
@@
sub do_action {
return 'Referring customer is cancelled'
if $referring_cust_main->status eq 'cancelled';
return 'Referring customer is cancelled'
if $referring_cust_main->status eq 'cancelled';
- my $amount = $self->_calc_referral_credit($cust_pkg);
+ my $amount = $self->_calc_credit($cust_pkg);
+ return '' unless $amount > 0;
+
my $reasonnum = $self->option('reasonnum');
my $error = $referring_cust_main->credit(
$amount,
\$reasonnum,
my $reasonnum = $self->option('reasonnum');
my $error = $referring_cust_main->credit(
$amount,
\$reasonnum,
- 'addlinfo' =>
- 'for customer #'. $cust_main->display_custnum. ': '.$cust_main->name,
+ 'eventnum' => $cust_event->eventnum,
+ 'addlinfo' => 'for customer #'. $cust_main->display_custnum.
+ ': '.$cust_main->name,
);
die "Error crediting customer ". $cust_main->referral_custnum.
" for referral: $error"
);
die "Error crediting customer ". $cust_main->referral_custnum.
" for referral: $error"
@@
-51,7
+53,7
@@
sub do_action {
}
}
-sub _calc_
referral_
credit {
+sub _calc_credit {
my( $self, $cust_pkg ) = @_;
$self->option('amount');
my( $self, $cust_pkg ) = @_;
$self->option('amount');