projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cb38d7a
)
prevent bug causing 'Error crediting customer for service remaining: FS::cust_pkg...
author
ivan
<ivan>
Wed, 2 Mar 2005 00:03:48 +0000
(
00:03
+0000)
committer
ivan
<ivan>
Wed, 2 Mar 2005 00:03:48 +0000
(
00:03
+0000)
FS/FS/cust_pkg.pm
patch
|
blob
|
history
FS/FS/part_pkg.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_pkg.pm
b/FS/FS/cust_pkg.pm
index
a6115a0
..
cd808d4
100644
(file)
--- a/
FS/FS/cust_pkg.pm
+++ b/
FS/FS/cust_pkg.pm
@@
-396,12
+396,16
@@
sub cancel {
}
# Add a credit for remaining service
}
# Add a credit for remaining service
- my $remaining_value= $self->calc_remain();
- if ($remaining_value > 0) {
- my $error = $self->credit($remaining_value, 'Credit for service remaining');
+ my $remaining_value = $self->calc_remain();
+ if ( $remaining_value > 0 ) {
+ my $error = $self->cust_main->credit(
+ $remaining_value,
+ 'Credit for unused time on'. $self->part_pkg->pkg,
+ );
if ($error) {
$dbh->rollback if $oldAutoCommit;
if ($error) {
$dbh->rollback if $oldAutoCommit;
- return "Error crediting customer for service remaining: $error";
+ return "Error crediting customer \$$remaining_value for unused time on".
+ $self->part_pkg->pkg. ": $error";
}
}
}
}
diff --git
a/FS/FS/part_pkg.pm
b/FS/FS/part_pkg.pm
index
a0683c8
..
faaf485
100644
(file)
--- a/
FS/FS/part_pkg.pm
+++ b/
FS/FS/part_pkg.pm
@@
-672,6
+672,11
@@
sub _calc_eval {
$value;
}
$value;
}
+#fallback that return 0 for old legacy packages with no plan
+
+sub calc_remain { 0; }
+sub calc_cancel { 0; }
+
=back
=head1 SUBROUTINES
=back
=head1 SUBROUTINES