projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix otaker upgrade
[freeside.git]
/
FS
/
FS
/
cust_credit.pm
diff --git
a/FS/FS/cust_credit.pm
b/FS/FS/cust_credit.pm
index
d5b6ff4
..
b87b0db
100644
(file)
--- a/
FS/FS/cust_credit.pm
+++ b/
FS/FS/cust_credit.pm
@@
-1,20
+1,21
@@
package FS::cust_credit;
use strict;
package FS::cust_credit;
use strict;
-use vars qw( @ISA $conf $unsuspendauto $me $DEBUG );
+use base qw( FS::otaker_Mixin FS::cust_main_Mixin FS::Record );
+use vars qw( $conf $unsuspendauto $me $DEBUG );
use Date::Format;
use FS::UID qw( dbh getotaker );
use FS::Misc qw(send_email);
use FS::Record qw( qsearch qsearchs dbdef );
use Date::Format;
use FS::UID qw( dbh getotaker );
use FS::Misc qw(send_email);
use FS::Record qw( qsearch qsearchs dbdef );
-use FS::cust_main_Mixin;
use FS::cust_main;
use FS::cust_main;
+use FS::cust_pkg;
use FS::cust_refund;
use FS::cust_credit_bill;
use FS::part_pkg;
use FS::reason_type;
use FS::reason;
use FS::cust_refund;
use FS::cust_credit_bill;
use FS::part_pkg;
use FS::reason_type;
use FS::reason;
+use FS::cust_event;
-@ISA = qw( FS::cust_main_Mixin FS::Record );
$me = '[ FS::cust_credit ]';
$DEBUG = 0;
$me = '[ FS::cust_credit ]';
$DEBUG = 0;
@@
-75,9
+76,9
@@
Amount of the credit
Specified as a UNIX timestamp; see L<perlfunc/"time">. Also see
L<Time::Local> and L<Date::Parse> for conversion functions.
Specified as a UNIX timestamp; see L<perlfunc/"time">. Also see
L<Time::Local> and L<Date::Parse> for conversion functions.
-=item
otaker
+=item
usernum
-Order taker (
assigned automatically, see L<FS::UID
>)
+Order taker (
see L<FS::access_user
>)
=item reason
=item reason
@@
-87,10
+88,18
@@
Text ( deprecated )
Reason (see L<FS::reason>)
Reason (see L<FS::reason>)
+=item addlinfo
+
+Text
+
=item closed
Books closed flag, empty or `Y'
=item closed
Books closed flag, empty or `Y'
+=item pkgnum
+
+Desired pkgnum when using experimental package balances.
+
=back
=head1 METHODS
=back
=head1 METHODS
@@
-143,7
+152,7
@@
sub insert {
);
unless($result) {
$dbh->rollback if $oldAutoCommit;
);
unless($result) {
$dbh->rollback if $oldAutoCommit;
- return "failed to set reason for $me: ". $dbh->errstr;
+ return "failed to set reason for $me
"; #
: ". $dbh->errstr;
}
}
}
}
@@
-225,7
+234,8
@@
sub delete {
my $cust_main = $self->cust_main;
my $error = send_email(
my $cust_main = $self->cust_main;
my $error = send_email(
- 'from' => $conf->config('invoice_from'), #??? well as good as any
+ 'from' => $conf->config('invoice_from', $self->cust_main->agentnum),
+ #invoice_from??? well as good as any
'to' => $conf->config('deletecredits'),
'subject' => 'FREESIDE NOTIFICATION: Credit deleted',
'body' => [
'to' => $conf->config('deletecredits'),
'subject' => 'FREESIDE NOTIFICATION: Credit deleted',
'body' => [
@@
-285,15
+295,21
@@
sub check {
|| $self->ut_number('custnum')
|| $self->ut_numbern('_date')
|| $self->ut_money('amount')
|| $self->ut_number('custnum')
|| $self->ut_numbern('_date')
|| $self->ut_money('amount')
- || $self->ut_alpha('otaker')
+ || $self->ut_alpha
n
('otaker')
|| $self->ut_textn('reason')
|| $self->ut_foreign_key('reasonnum', 'reason', 'reasonnum')
|| $self->ut_textn('reason')
|| $self->ut_foreign_key('reasonnum', 'reason', 'reasonnum')
+ || $self->ut_textn('addlinfo')
|| $self->ut_enum('closed', [ '', 'Y' ])
|| $self->ut_enum('closed', [ '', 'Y' ])
+ || $self->ut_foreign_keyn('pkgnum', 'cust_pkg', 'pkgnum')
+ || $self->ut_foreign_keyn('eventnum', 'cust_event', 'eventnum')
;
return $error if $error;
return "amount must be > 0 " if $self->amount <= 0;
;
return $error if $error;
return "amount must be > 0 " if $self->amount <= 0;
+ return "amount must be greater or equal to amount applied"
+ if $self->unapplied < 0;
+
return "Unknown customer"
unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
return "Unknown customer"
unless qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
@@
-310,6
+326,7
@@
Returns all refund applications (see L<FS::cust_credit_refund>) for this credit.
sub cust_credit_refund {
my $self = shift;
sub cust_credit_refund {
my $self = shift;
+ map { $_ } #return $self->num_cust_credit_refund unless wantarray;
sort { $a->_date <=> $b->_date }
qsearch( 'cust_credit_refund', { 'crednum' => $self->crednum } )
;
sort { $a->_date <=> $b->_date }
qsearch( 'cust_credit_refund', { 'crednum' => $self->crednum } )
;
@@
-324,6
+341,7
@@
credit.
sub cust_credit_bill {
my $self = shift;
sub cust_credit_bill {
my $self = shift;
+ map { $_ } #return $self->num_cust_credit_bill unless wantarray;
sort { $a->_date <=> $b->_date }
qsearch( 'cust_credit_bill', { 'crednum' => $self->crednum } )
;
sort { $a->_date <=> $b->_date }
qsearch( 'cust_credit_bill', { 'crednum' => $self->crednum } )
;
@@
-401,7
+419,11
@@
sub reason {
'reason' => $value,
'disabled' => 'Y',
} );
'reason' => $value,
'disabled' => 'Y',
} );
- $reason->insert and $reason = undef;
+ my $error = $reason->insert;
+ if ( $error ) {
+ warn "error inserting reason: $error\n";
+ $reason = undef;
+ }
}
$self->reasonnum($reason ? $reason->reasonnum : '') ;
}
$self->reasonnum($reason ? $reason->reasonnum : '') ;
@@
-412,7
+434,8
@@
sub reason {
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
$dbh->commit or die $dbh->errstr if $oldAutoCommit;
- $reason ? $reason->reason : '';
+ ( $reason ? $reason->reason : '' ).
+ ( $self->addlinfo ? ' '.$self->addlinfo : '' );
}
# _upgrade_data
}
# _upgrade_data
@@
-525,7
+548,7
@@
sub _upgrade_data { # class method
}
}
}
}
-
''
;
+
$class->_upgrade_otaker(%opts)
;
}
}