[open-ils-commits] r19712 - branches/rel_2_1/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2011-03-11 16:51:16 -0500 (Fri, 11 Mar 2011)
New Revision: 19712

Modified:
   branches/rel_2_1/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CreditCard.pm
Log:
only append street2 to CC payment address if no address is provided by the caller

Modified: branches/rel_2_1/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CreditCard.pm
===================================================================
--- branches/rel_2_1/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CreditCard.pm	2011-03-11 20:46:07 UTC (rev 19711)
+++ branches/rel_2_1/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CreditCard.pm	2011-03-11 21:51:16 UTC (rev 19712)
@@ -204,9 +204,11 @@
     # Especially for the following fields, do we need to support different
     # mapping of fields for different payment processors, particularly ones
     # in other countries?
-    $content{address}    ||= $patron->mailing_address->street1;
-    $content{address} .= ", " . $patron->mailing_address->street2
-        if $patron->mailing_address->street2;
+    if(!$content{address}) {
+        $content{address}  = $patron->mailing_address->street1;
+        $content{address} .= ", " . $patron->mailing_address->street2
+            if $patron->mailing_address->street2;
+    }
 
     $content{city}       ||= $patron->mailing_address->city;
     $content{state}      ||= $patron->mailing_address->state;