From 75e32b95be18e042247ac7711c3e203c5fdb2cde Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 16 Feb 2009 17:18:38 +0000
Subject: [PATCH] If the user's addressbook is empty, go directly to add an
 address.

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

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 5008b7bd4..56959404b 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -6,6 +6,7 @@
  - fixed #9739: Gallery Delete Album Template [TEMPLATE]
  - fixed #9737: Upgrade Missed a Config Option
  - fixed #9169: E-mail to Collab System creates invalid asset
+ - fixed #9746: Shop: Add a new address unneeded extra click
 
 7.6.11
  - fixed: Asset Manager can generate URLs that are too long
diff --git a/lib/WebGUI/Shop/AddressBook.pm b/lib/WebGUI/Shop/AddressBook.pm
index a471b79c8..c2e7dcfe0 100644
--- a/lib/WebGUI/Shop/AddressBook.pm
+++ b/lib/WebGUI/Shop/AddressBook.pm
@@ -509,7 +509,11 @@ sub www_view {
     }
     my $i18n = WebGUI::International->new($session, "Shop");
     my @addresses = ();
-    foreach my $address (@{$self->getAddresses}) {
+    my @availableAddresses = @{ $self->getAddresses };
+    if (! @availableAddresses ) {
+        return $self->www_editAddress;
+    }
+    foreach my $address (@availableAddresses) {
         push(@addresses, {
             %{$address->get},
             address         => $address->getHtmlFormatted,