[freeside-commits] freeside/FS/FS cust_pkg.pm, 1.167, 1.168 cust_pay.pm, 1.82, 1.83 cust_pay_void.pm, 1.9, 1.10 cust_refund.pm, 1.36, 1.37 cust_credit.pm, 1.43, 1.44 cust_main.pm, 1.542, 1.543 banned_pay.pm, 1.2, 1.3
Ivan,,,
ivan at wavetail.420.am
Mon Aug 23 19:27:48 PDT 2010
Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv12185
Modified Files:
cust_pkg.pm cust_pay.pm cust_pay_void.pm cust_refund.pm
cust_credit.pm cust_main.pm banned_pay.pm
Log Message:
fix otaker still getting assigned and usernum missing after otaker->usernum upgrade, causes credit report to barf, RT#9712
Index: cust_pay.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pay.pm,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -w -d -r1.82 -r1.83
--- cust_pay.pm 24 Aug 2010 00:55:48 -0000 1.82
+++ cust_pay.pm 24 Aug 2010 02:27:46 -0000 1.83
@@ -12,6 +12,7 @@
use FS::UID qw( getotaker );
use FS::Misc qw( send_email );
use FS::Record qw( dbh qsearch qsearchs );
+use FS::CurrentUser;
use FS::payby;
use FS::cust_main_Mixin;
use FS::payinfo_transaction_Mixin;
@@ -374,7 +375,7 @@
sub check {
my $self = shift;
- $self->otaker(getotaker) unless ($self->otaker);
+ $self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;
my $error =
$self->ut_numbern('paynum')
Index: cust_refund.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_refund.pm,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -w -d -r1.36 -r1.37
--- cust_refund.pm 11 Jun 2010 21:17:47 -0000 1.36
+++ cust_refund.pm 24 Aug 2010 02:27:46 -0000 1.37
@@ -7,6 +7,7 @@
use Business::CreditCard;
use FS::UID qw(getotaker);
use FS::Record qw( qsearch qsearchs dbh );
+use FS::CurrentUser;
use FS::cust_credit;
use FS::cust_credit_refund;
use FS::cust_pay_refund;
@@ -256,7 +257,7 @@
sub check {
my $self = shift;
- $self->otaker(getotaker) unless $self->otaker;
+ $self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;
my $error =
$self->ut_numbern('refundnum')
Index: cust_credit.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_credit.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -w -d -r1.43 -r1.44
--- cust_credit.pm 5 Jun 2010 17:31:33 -0000 1.43
+++ cust_credit.pm 24 Aug 2010 02:27:46 -0000 1.44
@@ -7,6 +7,7 @@
use FS::UID qw( dbh getotaker );
use FS::Misc qw(send_email);
use FS::Record qw( qsearch qsearchs dbdef );
+use FS::CurrentUser;
use FS::cust_main;
use FS::cust_pkg;
use FS::cust_refund;
@@ -290,7 +291,7 @@
sub check {
my $self = shift;
- $self->otaker(getotaker) unless ($self->otaker);
+ $self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;
my $error =
$self->ut_numbern('crednum')
Index: cust_pay_void.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pay_void.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -d -r1.9 -r1.10
--- cust_pay_void.pm 4 Apr 2010 23:37:33 -0000 1.9
+++ cust_pay_void.pm 24 Aug 2010 02:27:46 -0000 1.10
@@ -6,6 +6,7 @@
use Business::CreditCard;
use FS::UID qw(getotaker);
use FS::Record qw(qsearchs dbh fields); # qsearch );
+use FS::CurrentUser;
use FS::cust_pay;
#use FS::cust_bill;
#use FS::cust_bill_pay;
@@ -221,7 +222,7 @@
return $error if $error;
}
- $self->otaker(getotaker) unless $self->otaker;
+ $self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;
$self->SUPER::check;
}
Index: cust_pkg.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pkg.pm,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -w -d -r1.167 -r1.168
--- cust_pkg.pm 9 Aug 2010 01:03:49 -0000 1.167
+++ cust_pkg.pm 24 Aug 2010 02:27:45 -0000 1.168
@@ -13,6 +13,7 @@
use FS::UID qw( getotaker dbh );
use FS::Misc qw( send_email );
use FS::Record qw( qsearch qsearchs );
+use FS::CurrentUser;
use FS::cust_svc;
use FS::part_pkg;
use FS::cust_main;
@@ -563,7 +564,7 @@
}
- $self->otaker(getotaker) unless $self->otaker;
+ $self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;
if ( $self->dbdef_table->column('manual_flag') ) {
$self->manual_flag('') if $self->manual_flag eq ' ';
Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -w -d -r1.542 -r1.543
--- cust_main.pm 24 Aug 2010 01:59:31 -0000 1.542
+++ cust_main.pm 24 Aug 2010 02:27:46 -0000 1.543
@@ -31,6 +31,7 @@
use FS::Record qw( qsearchs qsearch dbdef regexp_sql );
use FS::Misc qw( generate_email send_email generate_ps do_print );
use FS::Msgcat qw(gettext);
+use FS::CurrentUser;
use FS::payby;
use FS::cust_pkg;
use FS::cust_svc;
@@ -2073,7 +2074,7 @@
$self->$flag($1);
}
- $self->otaker(getotaker) unless $self->otaker;
+ $self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;
warn "$me check AFTER: \n". $self->_dump
if $DEBUG > 2;
Index: banned_pay.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/banned_pay.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- banned_pay.pm 29 Mar 2010 00:23:07 -0000 1.2
+++ banned_pay.pm 24 Aug 2010 02:27:46 -0000 1.3
@@ -4,6 +4,7 @@
use base qw( FS::otaker_Mixin FS::Record );
use FS::Record qw( qsearch qsearchs );
use FS::UID qw( getotaker );
+use FS::CurrentUser;
=head1 NAME
@@ -41,7 +42,7 @@
=item _date - specified as a UNIX timestamp; see L<perlfunc/"time">. Also see
L<Time::Local> and L<Date::Parse> for conversion functions.
-=item otaker - order taker (assigned automatically, see L<FS::UID>)
+=item usernum - order taker (assigned automatically, see L<FS::access_user>)
=item reason - reason (text)
@@ -115,7 +116,7 @@
$self->_date(time) unless $self->_date;
- $self->otaker(getotaker) unless $self->otaker;
+ $self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum;
$self->SUPER::check;
}
More information about the freeside-commits
mailing list