projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add more info to (customer-specific) service report, RT#6180
[freeside.git]
/
FS
/
FS
/
cust_refund.pm
diff --git
a/FS/FS/cust_refund.pm
b/FS/FS/cust_refund.pm
index
53c6bac
..
e7c5a82
100644
(file)
--- a/
FS/FS/cust_refund.pm
+++ b/
FS/FS/cust_refund.pm
@@
-1,17
+1,16
@@
package FS::cust_refund;
use strict;
package FS::cust_refund;
use strict;
-use vars qw( @ISA @encrypted_fields );
+use base qw( FS::otaker_Mixin FS::payinfo_transaction_Mixin FS::cust_main_Mixin
+ FS::Record );
+use vars qw( @encrypted_fields );
use Business::CreditCard;
use Business::CreditCard;
-use FS::Record qw( qsearch qsearchs dbh );
use FS::UID qw(getotaker);
use FS::UID qw(getotaker);
+use FS::Record qw( qsearch qsearchs dbh );
use FS::cust_credit;
use FS::cust_credit_refund;
use FS::cust_pay_refund;
use FS::cust_main;
use FS::cust_credit;
use FS::cust_credit_refund;
use FS::cust_pay_refund;
use FS::cust_main;
-use FS::payinfo_Mixin;
-
-@ISA = qw( FS::Record FS::payinfo_Mixin );
@encrypted_fields = ('payinfo');
@encrypted_fields = ('payinfo');
@@
-42,28
+41,50
@@
inherits from FS::Record. The following fields are currently supported:
=over 4
=over 4
-=item refundnum - primary key (assigned automatically for new refunds)
+=item refundnum
+
+primary key (assigned automatically for new refunds)
+
+=item custnum
-
=item custnum -
customer (see L<FS::cust_main>)
+customer (see L<FS::cust_main>)
-=item refund
- Amount of the refund
+=item refund
-
=item reason - Reason for
the refund
+
Amount of
the refund
-=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">. Also see
+=item reason
+
+Reason for the refund
+
+=item _date
+
+specified as a UNIX timestamp; see L<perlfunc/"time">. Also see
L<Time::Local> and L<Date::Parse> for conversion functions.
L<Time::Local> and L<Date::Parse> for conversion functions.
-=item payby - Payment Type (See L<FS::payinfo_Mixin> for valid payby values)
+=item payby
+
+Payment Type (See L<FS::payinfo_Mixin> for valid payby values)
-=item payinfo
- Payment Information (See L<FS::payinfo_Mixin> for data format)
+=item payinfo
-
=item paymask - Masked payinfo (See L<FS::payinfo_Mixin> for how this works
)
+
Payment Information (See L<FS::payinfo_Mixin> for data format
)
-=item pay
batch - text field for tracking card processing
+=item pay
mask
-
=item otaker - order taker (assigned automatically, see L<FS::UID>
)
+
Masked payinfo (See L<FS::payinfo_Mixin> for how this works
)
-=item closed - books closed flag, empty or `Y'
+=item paybatch
+
+text field for tracking card processing
+
+=item usernum
+
+order taker (see L<FS::access_user>
+
+=item closed
+
+books closed flag, empty or `Y'
=back
=back
@@
-216,7
+237,7
@@
sub delete {
=item replace OLD_RECORD
=item replace OLD_RECORD
-
Currently unimplemented (accounting reasons)
.
+
Modifying a refund? Well, don't say I didn't warn you
.
=cut
=cut
@@
-235,10
+256,13
@@
returns the error, otherwise returns false. Called by the insert method.
sub check {
my $self = shift;
sub check {
my $self = shift;
+ $self->otaker(getotaker) unless $self->otaker;
+
my $error =
$self->ut_numbern('refundnum')
|| $self->ut_numbern('custnum')
|| $self->ut_money('refund')
my $error =
$self->ut_numbern('refundnum')
|| $self->ut_numbern('custnum')
|| $self->ut_money('refund')
+ || $self->ut_alphan('otaker')
|| $self->ut_text('reason')
|| $self->ut_numbern('_date')
|| $self->ut_textn('paybatch')
|| $self->ut_text('reason')
|| $self->ut_numbern('_date')
|| $self->ut_textn('paybatch')
@@
-257,8
+281,6
@@
sub check {
$error = $self->payinfo_check;
return $error if $error;
$error = $self->payinfo_check;
return $error if $error;
- $self->otaker(getotaker);
-
$self->SUPER::check;
}
$self->SUPER::check;
}
@@
-271,6
+293,7
@@
refund.
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', { 'refundnum' => $self->refundnum } )
;
sort { $a->_date <=> $b->_date }
qsearch( 'cust_credit_refund', { 'refundnum' => $self->refundnum } )
;
@@
-285,6
+308,7
@@
refund.
sub cust_pay_refund {
my $self = shift;
sub cust_pay_refund {
my $self = shift;
+ map { $_ } #return $self->num_cust_pay_refund unless wantarray;
sort { $a->_date <=> $b->_date }
qsearch( 'cust_pay_refund', { 'refundnum' => $self->refundnum } )
;
sort { $a->_date <=> $b->_date }
qsearch( 'cust_pay_refund', { 'refundnum' => $self->refundnum } )
;
@@
-336,6
+360,12
@@
sub unapplied_sql {
}
}
+# Used by FS::Upgrade to migrate to a new database.
+sub _upgrade_data { # class method
+ my ($class, %opts) = @_;
+ $class->_upgrade_otaker(%opts);
+}
+
=back
=head1 BUGS
=back
=head1 BUGS