[pal-cvs 2807] [551] added address selection page.

svnno****@sourc***** svnno****@sourc*****
2007年 9月 9日 (日) 08:02:18 JST


Revision: 551
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=551
Author:   shinsuke
Date:     2007-09-09 08:02:17 +0900 (Sun, 09 Sep 2007)

Log Message:
-----------
added address selection page.

Modified Paths:
--------------
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/CustomerService.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html

Added Paths:
-----------
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectPage.java
    pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/
    pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/label.properties


-------------- next part --------------
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java	2007-09-08 13:54:46 UTC (rev 550)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java	2007-09-08 23:02:17 UTC (rev 551)
@@ -8,6 +8,7 @@
 import jp.sf.pal.pompei.exentity.Customers;
 import jp.sf.pal.pompei.web.admin.customer.CustomerConfirmPage;
 import jp.sf.pal.pompei.web.admin.customer.CustomerEditPage;
+import jp.sf.pal.pompei.web.user.checkout.UserAddressSelectPage;
 import jp.sf.pal.pompei.web.user.checkout.UserInfoEditPage;
 
 import org.seasar.extension.dxo.annotation.ConversionRule;
@@ -46,4 +47,6 @@
 
     public void convert(UserInfoEditPage page, AddressBook addressBook);
 
+    public void convert(UserAddressSelectPage page, AddressBook addressBook);
+
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/CustomerService.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/CustomerService.java	2007-09-08 13:54:46 UTC (rev 550)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/CustomerService.java	2007-09-08 23:02:17 UTC (rev 551)
@@ -16,7 +16,6 @@
 
     Customers getCustomer(BigDecimal customersId);
 
-
     void deleteCustomer(BigDecimal customersId);
 
     //TODO above methods might not be needed..
@@ -24,11 +23,15 @@
 
     public void addAddressBook(AddressBook addressBook);
 
+    public void deleteAddressBook(AddressBook addressBook);
+
+    public List<AddressBook> getAddressBookList(BigDecimal customersId);
+
     public void addCustomers(Customers customers);
 
     public Zones getZones(BigDecimal zoneId);
 
-   public  Customers getCustomers(String portalId);
+    public Customers getCustomers(String portalId);
 
     public void updateCustomers(Customers customers);
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java	2007-09-08 13:54:46 UTC (rev 550)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/CustomerServiceImpl.java	2007-09-08 23:02:17 UTC (rev 551)
@@ -156,4 +156,20 @@
     public void updateCustomers(Customers customers) {
         customersBhv.update(customers);
     }
+
+    public List<AddressBook> getAddressBookList(BigDecimal customersId) {
+        AddressBookCB cb = new AddressBookCB();
+        //TODO needed?
+        //        cb.setupSelect_Customers();
+        //TODO needed?
+        //        cb.setupSelect_Zones();
+        //TODO needed?
+        //        cb.setupSelect_Countries();
+        cb.query().setCustomersId_Equal(customersId);
+        return getAddressBookBhv().selectList(cb);
+    }
+
+    public void deleteAddressBook(AddressBook addressBook) {
+        getAddressBookBhv().delete(addressBook);
+    }
 }

Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java	2007-09-08 13:54:46 UTC (rev 550)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java	2007-09-08 23:02:17 UTC (rev 551)
@@ -0,0 +1,214 @@
+package jp.sf.pal.pompei.web.user.checkout;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+
+import jp.sf.pal.common.util.FacesMessageUtil;
+import jp.sf.pal.pompei.dxo.CustomerDxo;
+import jp.sf.pal.pompei.exentity.AddressBook;
+import jp.sf.pal.pompei.exentity.Customers;
+import jp.sf.pal.pompei.exentity.Zones;
+import jp.sf.pal.pompei.service.CustomerService;
+
+import org.seasar.teeda.extension.annotation.takeover.TakeOver;
+import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
+
+public class UserAddressSelectAction implements Serializable {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 761671774909133184L;
+
+    /**
+     * 
+     */
+    private UserAddressSelectPage userAddressSelectPage;
+
+    private CustomerService customerService;
+
+    private CustomerDxo customerDxo;
+
+    public Class<?> initialize() {
+        return null;
+    }
+
+    public Class<?> prerender() {
+        // check login
+        String remoteUser = FacesContext.getCurrentInstance()
+                .getExternalContext().getRemoteUser();
+        if (remoteUser == null) {
+            return UserInfoEditPage.class;
+        }
+
+        // check user info
+        Customers customers = getCustomerService().getCustomers(remoteUser);
+        if (customers == null) {
+            return UserInfoEditPage.class;
+        }
+
+        // set default address book
+        if (customers.getCustomersDefaultAddressId() != null) {
+            getUserAddressSelectPage().setAddressBookId(
+                    customers.getCustomersDefaultAddressId().toString());
+        }
+
+        List<Map<String, String>> list = new ArrayList<Map<String, String>>();
+        List<AddressBook> addressBookList = getCustomerService()
+                .getAddressBookList(customers.getCustomersId());
+        //TODO Dxo??
+        for (AddressBook addressBook : addressBookList) {
+            Map<String, String> map = new HashMap<String, String>();
+            map.put("value", addressBook.getAddressBookId().toString());
+            //TODO address format
+            map.put("label", addressBook.getEntryPostcode() + " "
+                    + addressBook.getEntryState() + addressBook.getEntryCity()
+                    + addressBook.getEntryStreetAddress() + " "
+                    + addressBook.getEntryLastname()
+                    + addressBook.getEntryFirstname());
+            list.add(map);
+        }
+        getUserAddressSelectPage().setAddressBookIdItems(list);
+
+        // render FacesMessages
+        FacesMessageUtil.renderMessages();
+        return null;
+    }
+
+    public Class<?> doEdit() {
+        //TODO move to edit page
+        return null;
+    }
+
+    @TakeOver(type = TakeOverType.NEVER)
+    public Class<?> doAdd() {
+        // check login
+        String remoteUser = FacesContext.getCurrentInstance()
+                .getExternalContext().getRemoteUser();
+        if (remoteUser == null) {
+            return UserInfoEditPage.class;
+        }
+
+        // check user info
+        Customers customers = getCustomerService().getCustomers(remoteUser);
+        if (customers == null) {
+            return UserInfoEditPage.class;
+        }
+
+        AddressBook addressBook = new AddressBook();
+        getCustomerDxo().convert(getUserAddressSelectPage(), addressBook);
+        addressBook.setAddressBookId(null);
+        addressBook.setCustomersId(customers.getCustomersId());
+        //TODO zone and check if it's null
+        Zones zones = getCustomerService().getZones(new BigDecimal(130));
+        addressBook.setEntryZoneId(zones.getZoneId());
+        //TODO countries and check if it's null
+        addressBook.setEntryCountryId(zones.getCountries().getCountriesId());
+        getCustomerService().addAddressBook(addressBook);
+
+        // TODO put message
+        return UserAddressSelectPage.class;
+    }
+
+    public Class<?> doDelete() {
+        // check login
+        String remoteUser = FacesContext.getCurrentInstance()
+                .getExternalContext().getRemoteUser();
+        if (remoteUser == null) {
+            return UserInfoEditPage.class;
+        }
+
+        // check user info
+        Customers customers = getCustomerService().getCustomers(remoteUser);
+        if (customers == null) {
+            return UserInfoEditPage.class;
+        }
+
+        if (getUserAddressSelectPage().getAddressBookId() == null) {
+            //TODO put message
+            return UserAddressSelectPage.class;
+        }
+
+        BigDecimal addressBookId = null;
+        try {
+            addressBookId = new BigDecimal(getUserAddressSelectPage()
+                    .getAddressBookId());
+        } catch (NumberFormatException e) {
+            //TODO put message
+            return UserAddressSelectPage.class;
+        }
+
+        // check if address book is default
+        if (addressBookId.equals(customers.getCustomersDefaultAddressId())) {
+            //TODO put message (can not deletea a default value)
+            return UserAddressSelectPage.class;
+        }
+
+        AddressBook addressBook = getCustomerService().getAddressBook(
+                addressBookId);
+        if (addressBook == null) {
+            //TODO put message
+            return UserAddressSelectPage.class;
+        }
+        getCustomerService().deleteAddressBook(addressBook);
+
+        //TODO put message
+        return null;
+    }
+
+    @TakeOver(type = TakeOverType.NEVER)
+    public Class<?> doNext() {
+        //TODO
+        return null;
+    }
+
+    /**
+     * @return userAddressSelectPage
+     */
+    public UserAddressSelectPage getUserAddressSelectPage() {
+        return userAddressSelectPage;
+    }
+
+    /**
+     * @param userAddressSelectPage 設定する userAddressSelectPage
+     */
+    public void setUserAddressSelectPage(
+            UserAddressSelectPage userAddressSelectPage) {
+        this.userAddressSelectPage = userAddressSelectPage;
+    }
+
+    /**
+     * @return customerService
+     */
+    public CustomerService getCustomerService() {
+        return customerService;
+    }
+
+    /**
+     * @param customerService 設定する customerService
+     */
+    public void setCustomerService(CustomerService customerService) {
+        this.customerService = customerService;
+    }
+
+    /**
+     * @return customerDxo
+     */
+    public CustomerDxo getCustomerDxo() {
+        return customerDxo;
+    }
+
+    /**
+     * @param customerDxo 設定する customerDxo
+     */
+    public void setCustomerDxo(CustomerDxo customerDxo) {
+        this.customerDxo = customerDxo;
+    }
+
+}


Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectAction.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectPage.java	2007-09-08 13:54:46 UTC (rev 550)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectPage.java	2007-09-08 23:02:17 UTC (rev 551)
@@ -0,0 +1,173 @@
+package jp.sf.pal.pompei.web.user.checkout;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+public class UserAddressSelectPage implements Serializable {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -2196818928662366687L;
+
+    private int addressBookIdIndex;
+
+    private List<Map<String, String>> addressBookIdItems;
+
+    private String addressBookId;
+
+    private String entryCellphone;
+
+    private String entryCity;
+
+    private String entryCompany;
+
+    private String entryFax;
+
+    private String entryFirstname;
+
+    private String entryLastname;
+
+    private String entryPostcode;
+
+    private String entryState;
+
+    private String entryStreetAddress;
+
+    private String entryTelephone;
+
+    private String entryGender;
+
+    /**
+     * @return addressBookIdIndex
+     */
+    public int getAddressBookIdIndex() {
+        return addressBookIdIndex;
+    }
+
+    /**
+     * @param addressBookIdIndex 設定する addressBookIdIndex
+     */
+    public void setAddressBookIdIndex(int addressBookIdIndex) {
+        this.addressBookIdIndex = addressBookIdIndex;
+    }
+
+    /**
+     * @return addressBookIdItems
+     */
+    public List<Map<String, String>> getAddressBookIdItems() {
+        return addressBookIdItems;
+    }
+
+    /**
+     * @param addressBookIdItems 設定する addressBookIdItems
+     */
+    public void setAddressBookIdItems(
+            List<Map<String, String>> addressBookIdItems) {
+        this.addressBookIdItems = addressBookIdItems;
+    }
+
+    public String getAddressBookId() {
+        return addressBookId;
+    }
+
+    public void setAddressBookId(String addressBookId) {
+        this.addressBookId = addressBookId;
+    }
+
+    public String getEntryCellphone() {
+        return entryCellphone;
+    }
+
+    public void setEntryCellphone(String entryCellphone) {
+        this.entryCellphone = entryCellphone;
+    }
+
+    public String getEntryCity() {
+        return entryCity;
+    }
+
+    public void setEntryCity(String entryCity) {
+        this.entryCity = entryCity;
+    }
+
+    public String getEntryCompany() {
+        return entryCompany;
+    }
+
+    public void setEntryCompany(String entryCompany) {
+        this.entryCompany = entryCompany;
+    }
+
+    public String getEntryFax() {
+        return entryFax;
+    }
+
+    public void setEntryFax(String entryFax) {
+        this.entryFax = entryFax;
+    }
+
+    public String getEntryFirstname() {
+        return entryFirstname;
+    }
+
+    public void setEntryFirstname(String entryFirstname) {
+        this.entryFirstname = entryFirstname;
+    }
+
+    public String getEntryLastname() {
+        return entryLastname;
+    }
+
+    public void setEntryLastname(String entryLastname) {
+        this.entryLastname = entryLastname;
+    }
+
+    public String getEntryPostcode() {
+        return entryPostcode;
+    }
+
+    public void setEntryPostcode(String entryPostcode) {
+        this.entryPostcode = entryPostcode;
+    }
+
+    public String getEntryState() {
+        return entryState;
+    }
+
+    public void setEntryState(String entryState) {
+        this.entryState = entryState;
+    }
+
+    public String getEntryStreetAddress() {
+        return entryStreetAddress;
+    }
+
+    public void setEntryStreetAddress(String entryStreetAddress) {
+        this.entryStreetAddress = entryStreetAddress;
+    }
+
+    public String getEntryTelephone() {
+        return entryTelephone;
+    }
+
+    public void setEntryTelephone(String entryTelephone) {
+        this.entryTelephone = entryTelephone;
+    }
+
+    /**
+     * @return entryGender
+     */
+    public String getEntryGender() {
+        return entryGender;
+    }
+
+    /**
+     * @param entryGender 設定する entryGender
+     */
+    public void setEntryGender(String entryGender) {
+        this.entryGender = entryGender;
+    }
+
+}


Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectPage.java
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java	2007-09-08 13:54:46 UTC (rev 550)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java	2007-09-08 23:02:17 UTC (rev 551)
@@ -14,6 +14,9 @@
 import jp.sf.pal.pompei.exentity.Zones;
 import jp.sf.pal.pompei.service.CustomerService;
 
+import org.seasar.teeda.extension.annotation.takeover.TakeOver;
+import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
+
 public class UserInfoEditAction implements Serializable {
 
     /**
@@ -90,9 +93,9 @@
         return UserInfoEditPage.class;
     }
 
+    @TakeOver(type = TakeOverType.NEVER)
     public Class<?> doNext() {
-        //TODO next
-        return null;
+        return UserAddressSelectPage.class;
     }
 
     public Class<?> doModify() {

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java	2007-09-08 13:54:46 UTC (rev 550)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java	2007-09-08 23:02:17 UTC (rev 551)
@@ -2,6 +2,8 @@
 
 import java.io.Serializable;
 
+import org.seasar.teeda.extension.util.LabelHelper;
+
 public class UserInfoEditPage implements Serializable {
 
     /**
@@ -9,6 +11,8 @@
      */
     private static final long serialVersionUID = 6147467672052826988L;
 
+    private LabelHelper labelHelper;
+
     private String customersCellphone;
 
     private String customersEmailAddress;
@@ -42,6 +46,20 @@
     private boolean isLogin;
 
     /**
+     * @return labelHelper
+     */
+    public LabelHelper getLabelHelper() {
+        return labelHelper;
+    }
+
+    /**
+     * @param labelHelper 設定する labelHelper
+     */
+    public void setLabelHelper(LabelHelper labelHelper) {
+        this.labelHelper = labelHelper;
+    }
+
+    /**
      * @return portalId
      */
     public String getCustomersPortalId() {
@@ -195,4 +213,7 @@
         isLogin = flag;
     }
 
+    public String getCustomersGenderString() {
+        return getLabelHelper().getLabelValue(getCustomersGender());
+    }
 }

Added: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/label.properties
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/label.properties	2007-09-08 13:54:46 UTC (rev 550)
+++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/label.properties	2007-09-08 23:02:17 UTC (rev 551)
@@ -0,0 +1,2 @@
+M=\u7537\u6027
+F=\u5973\u6027


Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/user/checkout/label.properties
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html	2007-09-08 13:54:46 UTC (rev 550)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html	2007-09-08 23:02:17 UTC (rev 551)
@@ -14,90 +14,121 @@
       <h3 class="portlet-section-header">
         <label>お届け先情報の入力</label>
       </h3>
-      <span id="addressConfig">
-        <table>
-          <tr>
-            <td valign="top"><input type="radio" name="addressConfig" value="SELECT" />登録した届け先を使用</td>
+      <h4 class="portlet-section-subheader">
+        <label>登録した届け先から選択</label>
+      </h4>
+      <div>
+        <span id="addressBookId">
+          <input type="radio" name="addressBookId" value="0" checked="checked" />会員住所<br/>
+          <input type="radio" name="addressBookId" value="1" />届け先1<br/>
+          <input type="radio" name="addressBookId" value="2" />届け先2<br/>
+        </span>
+      </div>
+      <div>
+        <input id="doEdit" type="button" value="編集(TBD)" onclick="location.href='./userAddressSelection.html'" />
+        <input id="doDelete" type="button" value="削除" onclick="location.href='./userAddressSelection.html'" />
+      </div>
+      <div>
+        <input id="doNext" type="button" value="次へ" onclick="location.href='./userAddressSelection.html'" />
+      </div>
+      <h4 class="portlet-section-subheader">
+        <label>届け先の追加</label>
+      </h4>
+      <div>
+        <table border="1">
+          <tr style="dummy" height="20px">
+            <th>
+              <label>氏名(姓)</label>
+            </th>
             <td>
-              <select id="selectedAddress">
-                <option>届け先を選択して下さい。</option>
-                <option>会員住所</option>
-                <option>届け先</option>
-              </select>
-              <br />
+              <input type="text" id="entryLastname" />
             </td>
           </tr>
+          <tr style="dummy" height="20px">
+            <th>
+              <label>氏名(名)</label>
+            </th>
+            <td>
+              <input type="text" id="entryFirstname" />
+            </td>
+          </tr>
           <tr>
-            <td valign="top"><input type="radio" name="addressConfig" value="NEW" />個別の届け先を設定</td>
+            <th>
+              <label>性別:</label>
+            </th>
             <td>
-              <table border="1">
-                <tr style="dummy" height="20px">
-                  <th><label>氏名(姓)</label></th>
-                  <td>
-                    <input type="text" id="entryLastname" />
-                  </td>
-                </tr>
-                <tr style="dummy" height="20px">
-                  <th><label>氏名(名)</label></th>
-                  <td>
-                    <input type="text" id="entryFirstname" />
-                  </td>
-                </tr>
-                <tr style="dummy" height="20px">
-                  <th><label>郵便番号</label></th>
-                  <td>
-                    <input type="text" id="entryPostcode" size="4" maxlength="7" />
-                  </td>
-                </tr>
-                <tr style="dummy" height="20px">
-                  <th><label>都道府県</label></th>
-                  <td>
-                    <input type="text" id="entryState" />
-                    <!-- TODO pulldown -->
-                  </td>
-                </tr>
-                <tr style="dummy" height="20px">
-                  <th><label>郡市区 (島、国)</label></th>
-                  <td>
-                    <input type="text" id="entryCity" />
-                  </td>
-                </tr>
-                <tr style="dummy" height="20px">
-                  <th>それ以降の住所</th>
-                  <td>
-                    <input type="text" id="entryStreetAddress" />
-                  </td>
-                </tr>
-                <tr style="dummy" height="20px">
-                  <th><label>会社名・団体名</label></th>
-                  <td>
-                    <input type="text" id="entryCompany" />
-                  </td>
-                </tr>
-                <tr style="dummy" height="20px">
-                  <th><label>電話番号</label></th>
-                  <td>
-                    <input type="text" id="entryTelephone" />
-                  </td>
-                </tr>
-                <tr style="dummy" height="20px">
-                  <th><label>FAX番号</label></th>
-                  <td>
-                    <input type="text" id="entryFax" />
-                  </td>
-                </tr>
-                <tr style="dummy" height="20px">
-                  <th><label>携帯電話番号</label></th>
-                  <td>
-                    <input type="text" id="entryCellphone" />
-                  </td>
-                </tr>
-              </table>
+              <span id="entryGender">
+                <input type="radio" name="entryGender" value="M" class="portlet-form-field-label" />男性
+                <input type="radio" name="entryGender" value="F" class="portlet-form-field-label" />女性
+              </span>
             </td>
           </tr>
+          <tr style="dummy" height="20px">
+            <th>
+              <label>郵便番号</label>
+            </th>
+            <td>
+              <input type="text" id="entryPostcode" size="8" maxlength="8" />
+            </td>
+          </tr>
+          <tr style="dummy" height="20px">
+            <th>
+              <label>都道府県</label>
+            </th>
+            <td>
+              <input type="text" id="entryState" />
+<!-- TODO pulldown -->
+            </td>
+          </tr>
+          <tr style="dummy" height="20px">
+            <th>
+              <label>郡市区 (島、国)</label>
+            </th>
+            <td>
+              <input type="text" id="entryCity" />
+            </td>
+          </tr>
+          <tr style="dummy" height="20px">
+            <th>それ以降の住所</th>
+            <td>
+              <input type="text" id="entryStreetAddress" />
+            </td>
+          </tr>
+          <tr style="dummy" height="20px">
+            <th>
+              <label>会社名・団体名</label>
+            </th>
+            <td>
+              <input type="text" id="entryCompany" />
+            </td>
+          </tr>
+          <tr style="dummy" height="20px">
+            <th>
+              <label>電話番号</label>
+            </th>
+            <td>
+              <input type="text" id="entryTelephone" />
+            </td>
+          </tr>
+          <tr style="dummy" height="20px">
+            <th>
+              <label>FAX番号</label>
+            </th>
+            <td>
+              <input type="text" id="entryFax" />
+            </td>
+          </tr>
+          <tr style="dummy" height="20px">
+            <th>
+              <label>携帯電話番号</label>
+            </th>
+            <td>
+              <input type="text" id="entryCellphone" />
+            </td>
+          </tr>
         </table>
-      </span>
-      <input id="doNext" type="button" value="次へ" onclick="location.href='./userAddressSelection.html'" />
-    </div>
+        <input id="doAdd" type="button" value="追加" onclick="location.href='./userAddressSelection.html'" />
+      </div>
+    </form>
   </body>
 </html>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html	2007-09-08 13:54:46 UTC (rev 550)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html	2007-09-08 23:02:17 UTC (rev 551)
@@ -161,10 +161,7 @@
                 <label>性別:</label>
               </th>
               <td>
-                <span id="customersGender">
-                  <input type="radio" name="customersGender" value="M" class="portlet-form-field-label" />男性
-                  <input type="radio" name="customersGender" value="F" class="portlet-form-field-label" />女性
-                </span>
+                <span id="customersGenderString">性別</span>
               </td>
             </tr>
 <!-- TODO: customers_dob -->
@@ -252,7 +249,7 @@
           </tbody>
         </table>
 <!-- Term of Licence -->
-        <input id="doModify" type="button" value="TBD" onclick="location.href='./userInfoEdit.html'" />
+        <input id="doModify" type="button" value="登録情報の修正(TBD)" onclick="location.href='./userInfoEdit.html'" />
         <input id="doNext" type="button" value="次へ" onclick="location.href='./userAddressSelect.html'" />
       </div>
       </div>


pal-cvs メーリングリストの案内