From f01b5cb7e1ec563a0d9aafe2865617863c62eb45 Mon Sep 17 00:00:00 2001
From: Matthew Wilson <matt@plainblack.com>
Date: Sun, 7 May 2006 04:04:03 +0000
Subject: [PATCH] more selectBox fixes

---
 lib/WebGUI/Commerce/Payment/Cash.pm      | 3 +--
 lib/WebGUI/Commerce/Payment/ITransact.pm | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/WebGUI/Commerce/Payment/Cash.pm b/lib/WebGUI/Commerce/Payment/Cash.pm
index 9d58e7922..846b76a68 100644
--- a/lib/WebGUI/Commerce/Payment/Cash.pm
+++ b/lib/WebGUI/Commerce/Payment/Cash.pm
@@ -339,8 +339,7 @@ sub checkoutForm {
 	$f->selectBox(
 		-name=>"country",
 		-label=>$i18n->get("country"),
-		-value=>$self->session->form->process("country"),
-		-defaultValue=>$u->profileField("homeCountry"),
+		-value=>($self->session->form->process("country") || $u->profileField("homeCountry")),
 		-options=>\%countries
 		);
 	$f->phone(
diff --git a/lib/WebGUI/Commerce/Payment/ITransact.pm b/lib/WebGUI/Commerce/Payment/ITransact.pm
index 56e788e03..684317cca 100644
--- a/lib/WebGUI/Commerce/Payment/ITransact.pm
+++ b/lib/WebGUI/Commerce/Payment/ITransact.pm
@@ -409,8 +409,7 @@ sub checkoutForm {
 	$f->selectBox(
 		-name=>"country",
 		-label=>$i18n->get("country"),
-		-value=>$self->session->form->process("country"),
-		-defaultValue=>$u->profileField("homeCountry"),
+		-value=>($self->session->form->process("country") || $u->profileField("homeCountry")),
 		-options=>\%countries
 		);
     #For some odd reason, defaultValue needs to come before value here or value displays the text "-defaultValue".  Bug is reported.