From a0d59aeda8f923d13069bae99feaf171cac10990 Mon Sep 17 00:00:00 2001 From: erickson Date: Fri, 11 Mar 2011 21:57:21 +0000 Subject: [PATCH] only append street2 to CC payment address if no address is provided by the caller git-svn-id: svn://svn.open-ils.org/ILS/trunk@19714 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../lib/OpenILS/Application/Circ/CreditCard.pm | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) 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 5704684..6ac63a7 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CreditCard.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/CreditCard.pm @@ -204,9 +204,11 @@ sub prepare_bop_content { # 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; -- 1.7.2.5