X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_pay.pm;h=156887097078d53f7f4883911a5be3a891d70cd2;hb=15a02054fe0f91eda70003b8d1cf29497d19aa91;hp=5ba5b0a7d118a6f60a199f39472987cc6bb03560;hpb=8e003fd0a8d49800d4a7211cbc2aeeacc72928a4;p=freeside.git

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 5ba5b0a7d..156887097 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -12,14 +12,14 @@ use FS::Misc qw( send_email );
 use FS::Record qw( dbh qsearch qsearchs );
 use FS::payby;
 use FS::cust_main_Mixin;
-use FS::payinfo_Mixin;
+use FS::payinfo_transaction_Mixin;
 use FS::cust_bill;
 use FS::cust_bill_pay;
 use FS::cust_pay_refund;
 use FS::cust_main;
 use FS::cust_pay_void;
 
-@ISA = qw(FS::Record FS::cust_main_Mixin FS::payinfo_Mixin  );
+@ISA = qw( FS::payinfo_transaction_Mixin FS::cust_main_Mixin FS::Record );
 
 $DEBUG = 0;
 
@@ -432,8 +432,6 @@ sub check {
 #           " already exists";
 #  }
 
-  $self->otaker(getotaker);
-
   $self->SUPER::check;
 }
 
@@ -552,86 +550,6 @@ sub unrefunded {
   sprintf("%.2f", $amount );
 }
 
-
-=item cust_main
-
-Returns the parent customer object (see L<FS::cust_main>).
-
-=cut
-
-sub cust_main {
-  my $self = shift;
-  qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
-}
-
-=item payby_name
-
-Returns a name for the payby field.
-
-=cut
-
-sub payby_name {
-  my $self = shift;
-  FS::payby->shortname( $self->payby );
-}
-
-=item gatewaynum
-
-Returns a gatewaynum for the processing gateway.
-
-=item processor
-
-Returns a name for the processing gateway.
-
-=item authorization
-
-Returns a name for the processing gateway.
-
-=item order_number
-
-Returns a name for the processing gateway.
-
-=cut
-
-sub gatewaynum    { shift->_parse_paybatch->{'gatewaynum'}; }
-sub processor     { shift->_parse_paybatch->{'processor'}; }
-sub authorization { shift->_parse_paybatch->{'authorization'}; }
-sub order_number  { shift->_parse_paybatch->{'order_number'}; }
-
-#sucks that this stuff is in paybatch like this in the first place,
-#but at least other code can start to use new field names
-#(code nicked from FS::cust_main::realtime_refund_bop)
-sub _parse_paybatch {
-  my $self = shift;
-
-  $self->paybatch =~ /^((\d+)\-)?(\w+):\s*([\w\-\/ ]*)(:([\w\-]+))?$/
-    or return {};
-              #"Can't parse paybatch for paynum $options{'paynum'}: ".
-              #  $cust_pay->paybatch;
-
-  my( $gatewaynum, $processor, $auth, $order_number ) = ( $2, $3, $4, $6 );
-
-  if ( $gatewaynum ) { #gateway for the payment to be refunded
-
-    my $payment_gateway =
-      qsearchs('payment_gateway', { 'gatewaynum' => $gatewaynum } );
-
-    die "payment gateway $gatewaynum not found" #?
-      unless $payment_gateway;
-
-    $processor = $payment_gateway->gateway_module;
-
-  }
-
-  {
-    'gatewaynum'    => $gatewaynum,
-    'processor'     => $processor,
-    'authorization' => $auth,
-    'order_number'  => $order_number,
-  };
-
-}
-
 =back
 
 =head1 CLASS METHODS
@@ -675,8 +593,11 @@ sub _upgrade_data {  #class method
 
   #not the most efficient, but hey, it only has to run once
 
-  my $count_sql =
-    "SELECT COUNT(*) FROM cust_pay WHERE otaker IS NULL OR otaker = ''";
+  my $where = "WHERE ( otaker IS NULL OR otaker = '' OR otaker = 'ivan' ) ".
+              "  AND 0 < ( SELECT COUNT(*) FROM cust_main                 ".
+              "              WHERE cust_main.custnum = cust_pay.custnum ) ";
+
+  my $count_sql = "SELECT COUNT(*) FROM cust_pay $where";
 
   my $sth = dbh->prepare($count_sql) or die dbh->errstr;
   $sth->execute or die $sth->errstr;
@@ -686,25 +607,34 @@ sub _upgrade_data {  #class method
 
   my $count = 0;
   my $lastprog = 0;
-  while (1) {
 
-    my $cust_pay = qsearchs( {
+  my @cust_pay = qsearch( {
       'table'     => 'cust_pay',
       'hashref'   => {},
-      'extra_sql' => "WHERE otaker IS NULL OR otaker = ''",
-      'order_by'  => 'ORDER BY paynum LIMIT 1',
-    } );
+      'extra_sql' => $where,
+      'order_by'  => 'ORDER BY paynum',
+  } );
 
-    return unless $cust_pay;
+  foreach my $cust_pay (@cust_pay) {
 
     my $h_cust_pay = $cust_pay->h_search('insert');
     if ( $h_cust_pay ) {
+      next if $cust_pay->otaker eq $h_cust_pay->history_user;
       $cust_pay->otaker($h_cust_pay->history_user);
     } else {
       $cust_pay->otaker('legacy');
     }
+
+    delete $FS::payby::hash{'COMP'}->{cust_pay}; #quelle kludge
     my $error = $cust_pay->replace;
-    die $error if $error;
+
+    if ( $error ) {
+      warn " *** WARNING: Error updaating order taker for payment paynum".
+           $cust_pay->paynun. ": $error\n";
+      next;
+    }
+
+    $FS::payby::hash{'COMP'}->{cust_pay} = ''; #restore it
 
     $count++;
     if ( $DEBUG > 1 && $lastprog + 30 < time ) {