svnno****@sourc*****
svnno****@sourc*****
2007年 9月 8日 (土) 22:54:46 JST
Revision: 550
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=550
Author: shinsuke
Date: 2007-09-08 22:54:46 +0900 (Sat, 08 Sep 2007)
Log Message:
-----------
added userInfoEdit page. modified method name.
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/admin/customer/CustomerListAction.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListAction.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java
pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql
pompei/portlets/pompei-core/trunk/src/main/webapp/view/index.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/UserInfoEditAction.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java
-------------- 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-07 22:57:23 UTC (rev 549)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/CustomerDxo.java 2007-09-08 13:54:46 UTC (rev 550)
@@ -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.UserInfoEditPage;
import org.seasar.extension.dxo.annotation.ConversionRule;
@@ -27,7 +28,7 @@
+ ",entryCity : addressBook.entryCity"
+ ",entryState : addressBook.entryState"
+ ",entryCompany : addressBook.entryCompany")
- List<Map> conbertMap(List memberItems);
+ List<Map<String, Object>> convertMap(List memberItems);
void convert(Customers customers, CustomerEditPage memberEditPage);
@@ -35,4 +36,14 @@
void convert(CustomerConfirmPage memberConfirmPage, AddressBook book);
+ //TODO above methods might not be needed..
+
+ public void convert(Customers customers, UserInfoEditPage page);
+
+ public void convert(AddressBook addressBook, UserInfoEditPage page);
+
+ public void convert(UserInfoEditPage page, Customers customers);
+
+ public void convert(UserInfoEditPage 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-07 22:57:23 UTC (rev 549)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/CustomerService.java 2007-09-08 13:54:46 UTC (rev 550)
@@ -6,19 +6,29 @@
import jp.sf.pal.pompei.exentity.AddressBook;
import jp.sf.pal.pompei.exentity.Customers;
+import jp.sf.pal.pompei.exentity.Zones;
public interface CustomerService extends Serializable {
void addCustomer(AddressBook addressBook);
- List getCustomerList();
+ List<Customers> getCustomerList();
Customers getCustomer(BigDecimal customersId);
- Customers getCustomer(String portalId);
- void updateCustomer(Customers customers);
-
void deleteCustomer(BigDecimal customersId);
+ //TODO above methods might not be needed..
+ public AddressBook getAddressBook(BigDecimal addressBookId);
+
+ public void addAddressBook(AddressBook addressBook);
+
+ public void addCustomers(Customers customers);
+
+ public Zones getZones(BigDecimal zoneId);
+
+ 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-07 22:57:23 UTC (rev 549)
+++ 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)
@@ -5,11 +5,14 @@
import jp.sf.pal.pompei.cbean.AddressBookCB;
import jp.sf.pal.pompei.cbean.CustomersCB;
+import jp.sf.pal.pompei.cbean.ZonesCB;
import jp.sf.pal.pompei.exbhv.AddressBookBhv;
import jp.sf.pal.pompei.exbhv.CustomersBhv;
import jp.sf.pal.pompei.exbhv.CustomersInfoBhv;
+import jp.sf.pal.pompei.exbhv.ZonesBhv;
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;
public class CustomerServiceImpl implements CustomerService {
@@ -25,6 +28,8 @@
private AddressBookBhv addressBookBhv;
+ private ZonesBhv zonesBhv;
+
public void addCustomer(Customers customers) {
}
@@ -73,6 +78,20 @@
this.customersInfoBhv = customersInfoBhv;
}
+ /**
+ * @return zonesBhv
+ */
+ public ZonesBhv getZonesBhv() {
+ return zonesBhv;
+ }
+
+ /**
+ * @param zonesBhv 設定する zonesBhv
+ */
+ public void setZonesBhv(ZonesBhv zonesBhv) {
+ this.zonesBhv = zonesBhv;
+ }
+
public List getCustomerList() {
CustomersCB customersCB = new CustomersCB();
// customersCB.setupSelect_AddressBook();
@@ -87,23 +106,15 @@
Customers customers = customersBhv.selectEntity(customersCB);
return customers;
}
- public Customers getCustomer(String portalId) {
+
+ public Customers getCustomers(String portalId) {
CustomersCB cb = new CustomersCB();
-// cb.setupSelect_CustomersInfoAsOne();
+ // cb.setupSelect_CustomersInfoAsOne();
cb.query().setCustomersPortalId_Equal(portalId);
Customers customers = customersBhv.selectEntity(cb);
return customers;
}
- public void updateCustomer(Customers customers) {
-
- customersBhv.update(customers);
-
- // AddressBook addressBook = customers.getAddressBook();
- // addressBookBhv.update(addressBook);
-
- }
-
public void deleteCustomer(BigDecimal customersId) {
Customers customers = getCustomer(customersId);
customers.setCustomersDefaultAddressId(new BigDecimal("0"));
@@ -116,4 +127,33 @@
customersBhv.delete(customers);
}
+ public AddressBook getAddressBook(BigDecimal addressBookId) {
+ AddressBookCB cb = new AddressBookCB();
+ cb.setupSelect_Customers();
+ //TODO needed?
+ cb.setupSelect_Countries();
+ //TODO needed?
+ cb.setupSelect_Zones();
+ cb.query().setAddressBookId_Equal(addressBookId);
+ return getAddressBookBhv().selectEntity(cb);
+ }
+
+ public void addCustomers(Customers customers) {
+ getCustomersBhv().insert(customers);
+ }
+
+ public Zones getZones(BigDecimal zoneId) {
+ ZonesCB cb = new ZonesCB();
+ cb.setupSelect_Countries();
+ cb.query().setZoneId_Equal(zoneId);
+ return getZonesBhv().selectEntity(cb);
+ }
+
+ public void addAddressBook(AddressBook addressBook) {
+ getAddressBookBhv().insert(addressBook);
+ }
+
+ public void updateCustomers(Customers customers) {
+ customersBhv.update(customers);
+ }
}
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListAction.java 2007-09-07 22:57:23 UTC (rev 549)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/customer/CustomerListAction.java 2007-09-08 13:54:46 UTC (rev 550)
@@ -36,7 +36,7 @@
List memberItems = memberService.getCustomerList();
- List<Map> items = memberDxo.conbertMap(memberItems);
+ List<Map> items = memberDxo.convertMap(memberItems);
memberListPage.setCustomerItems(items);
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListAction.java 2007-09-07 22:57:23 UTC (rev 549)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/cart/ProductListAction.java 2007-09-08 13:54:46 UTC (rev 550)
@@ -135,7 +135,7 @@
return null;
}
- Customers customers = getCustomerService().getCustomer(remoteUser);
+ Customers customers = getCustomerService().getCustomers(remoteUser);
if (customers == null) {
// TODO put message
return null;
Added: 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-07 22:57:23 UTC (rev 549)
+++ 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)
@@ -0,0 +1,145 @@
+package jp.sf.pal.pompei.web.user.checkout;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Date;
+
+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;
+
+public class UserInfoEditAction implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8211846393931284507L;
+
+ /**
+ *
+ */
+ private UserInfoEditPage userInfoEditPage;
+
+ 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) {
+ getUserInfoEditPage().setIsLogin(false);
+ getUserInfoEditPage().setIsUser(false);
+ return null;
+ }
+ getUserInfoEditPage().setIsLogin(true);
+ getUserInfoEditPage().setCustomersPortalId(remoteUser);
+
+ Customers customers = getCustomerService().getCustomers(remoteUser);
+ if (customers == null) {
+ getUserInfoEditPage().setIsUser(false);
+ return null;
+ }
+ getUserInfoEditPage().setIsUser(true);
+
+ getCustomerDxo().convert(customers, getUserInfoEditPage());
+ AddressBook defaultAddressBook = getCustomerService().getAddressBook(
+ customers.getCustomersDefaultAddressId());
+ if (defaultAddressBook != null) {
+ getCustomerDxo().convert(defaultAddressBook, getUserInfoEditPage());
+ }
+
+ // render FacesMessages
+ FacesMessageUtil.renderMessages();
+ return null;
+ }
+
+ public Class<?> doRegister() {
+ Customers customers = new Customers();
+ AddressBook addressBook = new AddressBook();
+ getCustomerDxo().convert(getUserInfoEditPage(), customers);
+ getCustomerDxo().convert(getUserInfoEditPage(), addressBook);
+
+ //TODO enable date of birth
+ customers.setCustomersDob(new Timestamp(new Date().getTime()));
+ getCustomerService().addCustomers(customers);
+
+ 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);
+
+ customers.setCustomersDefaultAddressId(addressBook.getAddressBookId());
+ getCustomerService().updateCustomers(customers);
+
+ //TODO put message
+ return UserInfoEditPage.class;
+ }
+
+ public Class<?> doNext() {
+ //TODO next
+ return null;
+ }
+
+ public Class<?> doModify() {
+ //TODO modify info
+ return null;
+ }
+
+ /**
+ * @return userInfoEditPage
+ */
+ public UserInfoEditPage getUserInfoEditPage() {
+ return userInfoEditPage;
+ }
+
+ /**
+ * @param userInfoEditPage 設定する userInfoEditPage
+ */
+ public void setUserInfoEditPage(UserInfoEditPage userInfoEditPage) {
+ this.userInfoEditPage = userInfoEditPage;
+ }
+
+ /**
+ * @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/UserInfoEditAction.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: 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-07 22:57:23 UTC (rev 549)
+++ 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)
@@ -0,0 +1,198 @@
+package jp.sf.pal.pompei.web.user.checkout;
+
+import java.io.Serializable;
+
+public class UserInfoEditPage implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 6147467672052826988L;
+
+ private String customersCellphone;
+
+ private String customersEmailAddress;
+
+ private String customersFax;
+
+ private String customersFirstname;
+
+ private String customersGender;
+
+ private String customersLastname;
+
+ private String customersTelephone;
+
+ private String entryCity;
+
+ private String entryCompany;
+
+ private String entryDepartment;
+
+ private String entryPostcode;
+
+ private String entryState;
+
+ private String entryStreetAddress;
+
+ private String customersPortalId;
+
+ private boolean isUser;
+
+ private boolean isLogin;
+
+ /**
+ * @return portalId
+ */
+ public String getCustomersPortalId() {
+ return customersPortalId;
+ }
+
+ /**
+ * @param portalId 設定する portalId
+ */
+ public void setCustomersPortalId(String portalId) {
+ this.customersPortalId = portalId;
+ }
+
+ public String getCustomersCellphone() {
+ return customersCellphone;
+ }
+
+ public void setCustomersCellphone(String customersCellphone) {
+ this.customersCellphone = customersCellphone;
+ }
+
+ public String getCustomersEmailAddress() {
+ return customersEmailAddress;
+ }
+
+ public void setCustomersEmailAddress(String customersEmailAddress) {
+ this.customersEmailAddress = customersEmailAddress;
+ }
+
+ public String getCustomersFax() {
+ return customersFax;
+ }
+
+ public void setCustomersFax(String customersFax) {
+ this.customersFax = customersFax;
+ }
+
+ public String getCustomersFirstname() {
+ return customersFirstname;
+ }
+
+ public void setCustomersFirstname(String customersFirstname) {
+ this.customersFirstname = customersFirstname;
+ }
+
+ public String getCustomersGender() {
+ return customersGender;
+ }
+
+ public void setCustomersGender(String customersGender) {
+ this.customersGender = customersGender;
+ }
+
+ public String getCustomersLastname() {
+ return customersLastname;
+ }
+
+ public void setCustomersLastname(String customersLastname) {
+ this.customersLastname = customersLastname;
+ }
+
+ public String getCustomersTelephone() {
+ return customersTelephone;
+ }
+
+ public void setCustomersTelephone(String customersTelephone) {
+ this.customersTelephone = customersTelephone;
+ }
+
+ 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 getEntryDepartment() {
+ return entryDepartment;
+ }
+
+ public void setEntryDepartment(String entryDepartment) {
+ this.entryDepartment = entryDepartment;
+ }
+
+ 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 boolean isUser() {
+ return isUser;
+ }
+
+ public void setIsUser(boolean flag) {
+ isUser = flag;
+ }
+
+ public String getEntryFax() {
+ return customersFax;
+ }
+
+ public String getEntryFirstname() {
+ return customersFirstname;
+ }
+
+ public String getEntryGender() {
+ return customersGender;
+ }
+
+ public String getEntryLastname() {
+ return customersLastname;
+ }
+
+ public String getEntryTelephone() {
+ return customersTelephone;
+ }
+
+ public boolean isLogin() {
+ return isLogin;
+ }
+
+ public void setIsLogin(boolean flag) {
+ isLogin = flag;
+ }
+
+}
Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java 2007-09-07 22:57:23 UTC (rev 549)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java 2007-09-08 13:54:46 UTC (rev 550)
@@ -71,7 +71,7 @@
return null;
}
- Customers customers = getCustomerService().getCustomer(remoteUser);
+ Customers customers = getCustomerService().getCustomers(remoteUser);
if (customers == null) {
// TODO put message
return null;
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql 2007-09-07 22:57:23 UTC (rev 549)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql 2007-09-08 13:54:46 UTC (rev 550)
@@ -330,6 +330,8 @@
INSERT INTO zones VALUES (64,223,'WI','Wisconsin');
INSERT INTO zones VALUES (65,223,'WY','Wyoming');
+INSERT INTO zones VALUES (130,107,'JP','Japan');
+
INSERT INTO tax_class VALUES (1, 'Taxable Goods', 'The following types of products are included non-food, services, etc', '2007-01-01 00:00:00', '2007-01-01 00:00:00');
INSERT INTO tax_rates VALUES (1, 1, 1, 1, 7.0, 'FL TAX 7.0%', '2007-01-01 00:00:00', '2007-01-01 00:00:00');
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/index.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/index.html 2007-09-07 22:57:23 UTC (rev 549)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/index.html 2007-09-08 13:54:46 UTC (rev 550)
@@ -25,7 +25,7 @@
<li><a href="#">会員登録(未)</a></li>
<li><a href="./user/product/productList.html">商品一覧</a></li>
<li><a href="./user/cart/productList.html">カート確認</a></li>
-<li><a href="./user/checkout/checkoutEdit.html">注文</a></li>
+<li><a href="./user/checkout/userInfoEdit.html">注文</a></li>
</ul>
</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-07 22:57:23 UTC (rev 549)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html 2007-09-08 13:54:46 UTC (rev 550)
@@ -7,6 +7,7 @@
</head>
<body>
<form id="Form">
+ <input id="customersPortalId-hidden" type="hidden"/>
<div>
<span id="messages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
</div>
@@ -16,6 +17,7 @@
<label>カートに入れた商品を注文していただくには、ログインする必要があります。</label>
</span>
</div>
+ <div id="isLogin">
<div id="isNotUser">
<div class="portlet-section-header">ユーザー情報登録</div>
<table>
@@ -250,8 +252,10 @@
</tbody>
</table>
<!-- Term of Licence -->
+ <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>
</form>
</body>
</html>