From 5d17c43ff3b957508b9cf4585e62cd10e6fbf226 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 20 Jul 2009 21:54:05 +0000
Subject: [PATCH] Bypass default value in the Country form so that other values
 can be used if set.  ITransace getCredentials.

---
 docs/changelog/7.x.x.txt               | 1 +
 lib/WebGUI/Shop/PayDriver/ITransact.pm | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 1a62252d9..c88d8d29a 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -13,6 +13,7 @@
  - fixed #10676: Settings>Account Tab: typos
  - WebGUI::Shop::PayDriver::PayPal moved to WebGUI::Shop::PayDriver::PayPal::ExpressCheckout.
  - WebGUI::Shop::PayDriver::PayPal::PayPalStd is back, now functional.
+ - fixed #10671: shop checkout address copy broken
 
 7.7.15
  - fixed #10629: WebGUI::ProfileField create new field bug
diff --git a/lib/WebGUI/Shop/PayDriver/ITransact.pm b/lib/WebGUI/Shop/PayDriver/ITransact.pm
index 74a7bdd9f..ad0adbf34 100644
--- a/lib/WebGUI/Shop/PayDriver/ITransact.pm
+++ b/lib/WebGUI/Shop/PayDriver/ITransact.pm
@@ -766,9 +766,11 @@ sub www_getCredentials {
         name  => 'zipcode',
         value => $form->process("zipcode") || $addressData->{ code } || $u->profileField('homeZip'),
     });
+    $session->log->warn("form: ". $form->process("country",'country'));
+    $session->log->warn("addressData: ". $addressData->{country});
     $var->{countryField} = WebGUI::Form::country($session, {
         name  => 'country',
-        value => ($form->process("country",'country') || $addressData->{ country } || $u->profileField("homeCountry") || 'United States'),
+        value => ($form->process("country",'country', '') || $addressData->{ country } || $u->profileField("homeCountry") || 'United States of A'),
     });
     $var->{phoneField} = WebGUI::Form::phone($session, {
         name  => 'phone',