[open-ils-commits] [GIT] Evergreen ILS branch rel_2_9 updated. 338ff97d2667921d68831779fa2925ee52574ce9

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_9 has been updated
       via  338ff97d2667921d68831779fa2925ee52574ce9 (commit)
      from  8adbe84b5ba98cd1970d73c14a650d031f7b1a2d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 338ff97d2667921d68831779fa2925ee52574ce9
Author: Bill Erickson <berickxx at gmail.com>
Date:   Fri Mar 6 17:18:21 2015 -0500

    LP#1429268 credit card payment address fall-thru
    
    When a patron has no mailing address linked, attempt to read address
    data from the patron's billing address.  Similarly, if all address
    fields are properly set by the API caller, except the country, and the
    patron has no addresses, attempt to determine the country from org unit
    settings.
    
    If insufficient address data is provided or divined, return an invalid
    params Event (similar to other CC failures).
    
    To test:
    
    [1] Create a patron record that has no mailing address but does
        have a billing address.  Perform or simulate a credit card
        payment; it shoudl fail with an internal error.
    [2] Apply the patch and repeat step 1; this time, the payment
        attempt should succeed and use the billing address.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CreditCard.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CreditCard.pm
index 2c61830..e4c9946 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CreditCard.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CreditCard.pm
@@ -119,7 +119,8 @@ sub process_payment {
             $argshash->{patron_id},
             {
                 flesh        => 1,
-                flesh_fields => { au => ["mailing_address", "card"] }
+                flesh_fields => { au => 
+                    ["mailing_address", "billing_address", "card"] }
             }
         ]
     ) or return $e->event;
@@ -165,19 +166,38 @@ sub prepare_bop_content {
     my $bc = ($patron->card) ? $patron->card->barcode : '';
     $content{description}  = "$bc " . ($content{description} || '');
 
+    my $addr = $patron->mailing_address || $patron->billing_address;
+
+    if (!$addr) {
+        # patron has no linked addresses.  See if we have enough data
+        # provided and/or from settings to complete the transaction
+
+        return () unless $content{address} and 
+            $content{city} and $content{state} and $content{zip};
+
+        if (!$content{country}) {
+            # Assume if all other fields are set, that the patron's
+            # country is the same as their home org unit.
+
+            $content{country} = $U->ou_ancestor_setting_value(
+               $patron->home_ou, 'ui.patron.default_country'); 
+
+            return () unless $content{country}; # time to renew passport
+        }
+    }
+
     # Especially for the following fields, do we need to support different
     # mapping of fields for different payment processors, particularly ones
     # in other countries?
     if(!$content{address}) {
-        $content{address}  = $patron->mailing_address->street1;
-        $content{address} .= ", " . $patron->mailing_address->street2
-            if $patron->mailing_address->street2;
+        $content{address}  = $addr->street1;
+        $content{address} .= ", " . $addr->street2 if $addr->street2;
     }
 
-    $content{city}       ||= $patron->mailing_address->city;
-    $content{state}      ||= $patron->mailing_address->state;
-    $content{zip}        ||= $patron->mailing_address->post_code;
-    $content{country}    ||= $patron->mailing_address->country;
+    $content{city}      ||= $addr->city;
+    $content{state}     ||= $addr->state;
+    $content{zip}       ||= $addr->post_code;
+    $content{country}   ||= $addr->country;
 
     # Yet another fantastic kludge. country2code() comes from Locale::Country.
     # PayPal must have 2 letter country field (ISO 3166) that's uppercase.
@@ -233,6 +253,11 @@ sub dispatch {
     );
 
     my %content = prepare_bop_content($argshash, $patron, $cardtype);
+
+    return OpenILS::Event->new(
+        'CREDIT_PROCESSOR_BAD_PARAMS', note => "Missing address fields")
+        if keys(%content) == 0;
+
     $transaction->content(%content);
 
     # submit() does not return a value, although crashing is possible here

-----------------------------------------------------------------------

Summary of changes:
 .../lib/OpenILS/Application/Circ/CreditCard.pm     |   41 ++++++++++++++++----
 1 files changed, 33 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Evergreen ILS