From f7fbc546f56403e0aae5ff55d7ed93cc1e546873 Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 8 Oct 2009 20:53:36 +0000
Subject: [PATCH] made CC payment arguments more flexible
git-svn-id: svn://svn.open-ils.org/ILS/trunk@14317 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
.../src/perlmods/OpenILS/Application/Circ/Money.pm | 33 ++++++++++------------
1 file changed, 15 insertions(+), 18 deletions(-)
diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Money.pm b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Money.pm
index b19ef270a3..be909d59b3 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Circ/Money.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Circ/Money.pm
@@ -44,11 +44,13 @@ __PACKAGE__->register_method(
userid
patron_credit
note
- cc_type
- cc_number
- cc_expire_month
- cc_expire_year
- cc_approval_code
+ cc_args : {
+ type
+ number
+ expire_month
+ expire_year
+ approval_code
+ }
check_number
payments: [
[trans_id, amt],
@@ -71,12 +73,8 @@ sub make_payments {
my $credit = $payments->{patron_credit} || 0;
my $drawer = $e->requestor->wsid;
my $note = $payments->{note};
- my $cc_type = $payments->{cc_type};
- my $cc_number = $payments->{cc_number};
- my $cc_expire_month = $payments->{cc_expire_month};
- my $cc_expire_year = $payments->{cc_expire_year};
- my $cc_approval_code = $payments->{cc_approval_code};
my $check_number = $payments->{check_number};
+ my $cc_args = $payments->{cc_args};
my $total_paid = 0;
my %orgs;
@@ -88,7 +86,6 @@ sub make_payments {
return $e->die_event unless $e->allowed('CREATE_PAYMENT', $patron->home_ou);
}
-
# first collect the transactions and make sure the transaction
# user matches the requested user
my %xacts;
@@ -163,15 +160,14 @@ sub make_payments {
if ($payobj->has_field('accepting_usr')) { $payobj->accepting_usr($e->requestor->id); }
if ($payobj->has_field('cash_drawer')) { $payobj->cash_drawer($drawer); }
- if ($payobj->has_field('cc_type')) { $payobj->cc_type($cc_type); }
+ if ($payobj->has_field('cc_type')) { $payobj->cc_type($cc_args->{type}); }
+ if ($payobj->has_field('check_number')) { $payobj->check_number($check_number); }
# Store the last 4 digits?
- #if ($payobj->has_field('cc_number')) { $payobj->cc_number($cc_number); }
- #if ($payobj->has_field('approval_code')) { $payobj->approval_code($cc_approval_code); }
-
- if ($payobj->has_field('expire_month')) { $payobj->expire_month($cc_expire_month); }
- if ($payobj->has_field('expire_year')) { $payobj->expire_year($cc_expire_year); }
- if ($payobj->has_field('check_number')) { $payobj->check_number($check_number); }
+ #if ($payobj->has_field('cc_number')) { $payobj->cc_number($cc_args->{number}); }
+ #if ($payobj->has_field('approval_code')) { $payobj->approval_code($cc_args->{approval_code}); }
+ if ($payobj->has_field('expire_month')) { $payobj->expire_month($cc_args->{expire_month}); }
+ if ($payobj->has_field('expire_year')) { $payobj->expire_year($cc_args->{expire_year}); }
# update the transaction if it's done
if( (my $cred = ($trans->balance_owed - $amount)) <= 0 ) {
@@ -198,6 +194,7 @@ sub make_payments {
# TODO send to credit card processor
# amount == $total_paid
# user == $user_id
+ # other args == $cc_args (hash)
# $e->rollback if processing fails. This will undo everything.
}
--
2.11.0