[freeside-commits] freeside/FS/FS cust_refund.pm, 1.32, 1.33 cust_pay.pm, 1.66, 1.67 payinfo_Mixin.pm, 1.10, 1.11 payinfo_transaction_Mixin.pm, NONE, 1.1

Ivan,,, ivan at wavetail.420.am
Sun Jun 1 15:48:16 PDT 2008


Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv3210/FS/FS

Modified Files:
	cust_refund.pm cust_pay.pm payinfo_Mixin.pm 
Added Files:
	payinfo_transaction_Mixin.pm 
Log Message:
refactor payment history slightly, add refund receipts, have "unapplied" refunds show like other unapplied/open things, RT#3545

--- NEW FILE: payinfo_transaction_Mixin.pm ---
package FS::payinfo_transaction_Mixin;

use strict;
use vars qw( @ISA );
use FS::payby;
use FS::payinfo_Mixin;

@ISA = qw( FS::payinfo_Mixin );

=head1 NAME

FS::payinfo_transaction_Mixin - Mixin class for records in tables that represent transactions.

=head1 SYNOPSIS

package FS::some_table;
use vars qw(@ISA);
@ISA = qw( FS::payinfo_transaction_Mixin FS::Record );

=head1 DESCRIPTION

This is a mixin class for records that represent transactions: that contain
payinfo and paybatch.  Currently FS::cust_pay and FS::cust_refund

=head1 METHODS

=over 4


=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;
  if ( $self->payby eq 'BILL' ) { #kludge
    'Check';
  } else {
    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 SEE ALSO

L<FS::payinfo_Mixin>

=back

Index: cust_pay.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pay.pm,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- cust_pay.pm	1 Jun 2008 07:08:46 -0000	1.66
+++ cust_pay.pm	1 Jun 2008 22:48:14 -0000	1.67
@@ -12,14 +12,14 @@
 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;
 
- at ISA = qw( FS::Record FS::cust_main_Mixin FS::payinfo_Mixin );
+ at ISA = qw( FS::payinfo_transaction_Mixin FS::cust_main_Mixin FS::Record );
 
 $DEBUG = 0;
 
@@ -550,90 +550,6 @@
   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;
-  if ( $self->payby eq 'BILL' ) { #kludge
-    'Check';
-  } else {
-    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

Index: payinfo_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/payinfo_Mixin.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- payinfo_Mixin.pm	19 May 2008 04:07:01 -0000	1.10
+++ payinfo_Mixin.pm	1 Jun 2008 22:48:14 -0000	1.11
@@ -271,6 +271,8 @@
   }
 }
 
+=back
+
 =head1 BUGS
 
 Future items?

Index: cust_refund.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_refund.pm,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- cust_refund.pm	19 May 2008 04:07:02 -0000	1.32
+++ cust_refund.pm	1 Jun 2008 22:48:14 -0000	1.33
@@ -3,15 +3,16 @@
 use strict;
 use vars qw( @ISA @encrypted_fields );
 use Business::CreditCard;
-use FS::Record qw( qsearch qsearchs dbh );
 use FS::UID qw(getotaker);
+use FS::Record qw( qsearch qsearchs dbh );
+use FS::cust_main_Mixin;
+use FS::payinfo_transaction_Mixin;
 use FS::cust_credit;
 use FS::cust_credit_refund;
 use FS::cust_pay_refund;
 use FS::cust_main;
-use FS::payinfo_Mixin;
 
- at ISA = qw( FS::payinfo_Mixin FS::cust_main_Mixin FS::Record );
+ at ISA = qw( FS::payinfo_transaction_Mixin FS::cust_main_Mixin FS::Record );
 
 @encrypted_fields = ('payinfo');
 



More information about the freeside-commits mailing list