svnno****@sourc*****
svnno****@sourc*****
2007年 10月 5日 (金) 21:25:53 JST
Revision: 607
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=607
Author: shinsuke
Date: 2007-10-05 21:25:52 +0900 (Fri, 05 Oct 2007)
Log Message:
-----------
modified navigation links
Modified 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
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html
-------------- next part --------------
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-10-05 09:10:11 UTC (rev 606)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditAction.java 2007-10-05 12:25:52 UTC (rev 607)
@@ -17,7 +17,9 @@
import jp.sf.pal.pompei.dxo.CustomerDxo;
import jp.sf.pal.pompei.exentity.AddressBook;
import jp.sf.pal.pompei.exentity.Customer;
+import jp.sf.pal.pompei.exentity.CustomerBasket;
import jp.sf.pal.pompei.exentity.Zone;
+import jp.sf.pal.pompei.service.CartService;
import jp.sf.pal.pompei.service.CustomerService;
import jp.sf.pal.pompei.service.LanguageService;
import jp.sf.pal.pompei.util.SessionUtil;
@@ -41,6 +43,8 @@
private LanguageService languageService;
+ private CartService cartService;
+
private CustomerDxo customerDxo;
public Class<?> initialize() {
@@ -125,6 +129,19 @@
postprocessingForRender();
}
+ // check cart
+ if (customer != null) {
+ List<CustomerBasket> customerBasketList = getCartService()
+ .getCustomerBasketList(customer.getCustomerId());
+ if (customerBasketList != null && !customerBasketList.isEmpty()) {
+ getUserInfoEditPage().setBasket(true);
+ } else {
+ getUserInfoEditPage().setBasket(false);
+ }
+ } else {
+ getUserInfoEditPage().setBasket(false);
+ }
+
// render FacesMessages
FacesMessageUtil.renderMessages();
return null;
@@ -329,4 +346,18 @@
this.languageService = languageService;
}
+ /**
+ * @return cartService
+ */
+ public CartService getCartService() {
+ return cartService;
+ }
+
+ /**
+ * @param cartService 設定する cartService
+ */
+ public void setCartService(CartService cartService) {
+ this.cartService = cartService;
+ }
+
}
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-10-05 09:10:11 UTC (rev 606)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java 2007-10-05 12:25:52 UTC (rev 607)
@@ -7,6 +7,7 @@
import java.util.Map;
import jp.sf.pal.pompei.PompeiConstants;
+import jp.sf.pal.pompei.util.UrlBuilderUtil;
import org.seasar.teeda.extension.annotation.convert.DateTimeConverter;
import org.seasar.teeda.extension.annotation.validator.Required;
@@ -99,6 +100,8 @@
private boolean login;
+ private boolean basket;
+
private String mode;
/**
@@ -509,4 +512,22 @@
public void setMode(String mode) {
this.mode = mode;
}
+
+ /**
+ * @return basket
+ */
+ public boolean isBasket() {
+ return basket;
+ }
+
+ /**
+ * @param basket 設定する basket
+ */
+ public void setBasket(boolean basket) {
+ this.basket = basket;
+ }
+
+ public String getProductListLinkHref() {
+ return UrlBuilderUtil.createProductListUrl();
+ }
}
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java 2007-10-05 09:10:11 UTC (rev 606)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java 2007-10-05 12:25:52 UTC (rev 607)
@@ -4,6 +4,7 @@
import java.math.BigDecimal;
import jp.sf.pal.pompei.PompeiConstants;
+import jp.sf.pal.pompei.util.UrlBuilderUtil;
import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter;
@@ -232,4 +233,8 @@
public void setDetailsImageUrl(String detailsImageUrl) {
this.detailsImageUrl = detailsImageUrl;
}
+
+ public String getOrderLinkHref() {
+ return UrlBuilderUtil.createOrderUrl();
+ }
}
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html 2007-10-05 09:10:11 UTC (rev 606)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html 2007-10-05 12:25:52 UTC (rev 607)
@@ -13,7 +13,7 @@
<div style="font-size: 14pt;">
<label>ショッピングカート</label>
</div>
- <table border="1" style="width: 100%;">
+ <table border="1" style="width: 100%;" cellspacing="0">
<thead>
<tr style="dummy">
<th align="center">
@@ -108,7 +108,7 @@
</label>
<br />
<br />
- <a id="orderLink" href="">会員登録へ進む</a>
+ <a id="orderLink" href="">会員情報登録へ進む</a>
</center>
</div>
<div id="isNotLogin" style="width: 100%;">
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html 2007-10-05 09:10:11 UTC (rev 606)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html 2007-10-05 12:25:52 UTC (rev 607)
@@ -73,7 +73,7 @@
<span id="quantity">1</span>
</td>
<td align="right">
- <span id="finalPrice">30,000</span>
+ <b style="color: #990000;"><span id="finalPrice">30,000</span></b>
</td>
</tr>
</tbody>
@@ -81,28 +81,28 @@
<tr>
<td colspan="4" align="right">小計</td>
<td colspan="2" align="right">
- <span id="subTotalPrice">30,000</span>
+ <b style="color: #990000;"><span id="subTotalPrice">30,000</span></b>
<input type="hidden" id="subTotalPrice-hidden" />
</td>
</tr>
<tr>
<td colspan="4" align="right">送料</td>
<td colspan="2" align="right">
- <span id="deliveryPrice">1000</span>
+ <b style="color: #990000;"><span id="deliveryPrice">1000</span></b>
<input type="hidden" id="deliveryPrice-hidden" />
</td>
</tr>
<tr>
<td colspan="4" align="right">消費税</td>
<td colspan="2" align="right">
- <span id="tax">50</span>
+ <b style="color: #990000;"><span id="tax">50</span></b>
<input type="hidden" id="tax-hidden" />
</td>
</tr>
<tr>
<td colspan="4" align="right">合計</td>
<td colspan="2" align="right">
- <span id="totalPrice">31,050</span>
+ <b style="color: #990000;"><span id="totalPrice">31,050</span></b>
<input type="hidden" id="totalPrice-hidden" />
</td>
</tr>
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-10-05 09:10:11 UTC (rev 606)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html 2007-10-05 12:25:52 UTC (rev 607)
@@ -240,7 +240,6 @@
<br />
<div id="isNotUser" style="text-align: center;">
<input id="doUpdate-create" type="button" value="上記の会員情報を登録します" onclick="location.href='./userInfoEdit.html'" />
- <a id="goUserInfoEdit-create" href="./userInfoEdit.html?fixed_mode=none">会員情報の登録を取り消します</a>
</div>
<div id="isUser" style="text-align: center;">
<input id="doUpdate-update" type="button" value="上記の会員情報で更新します" onclick="location.href='./userInfoEdit.html'" />
@@ -415,7 +414,14 @@
<input id="customerId-hidden" type="hidden" />
<div style="text-align: center;width: 100%;">
<input id="doModify" type="button" value="上記の会員情報を修正する" onclick="location.href='./userInfoEdit.html'" />
- <input id="doNext" type="button" value="お届け先の選択へ" onclick="location.href='./userAddressSelect.html'" />
+ <div id="isBasket" style="display: inline;">
+ <input id="doNext" type="button" value="お届け先の選択へ" onclick="location.href='./userAddressSelect.html'" />
+ </div>
+ <div id="isNotBasket" style="margin: 10px;">
+ <hr style="border-top: 1px dashed #999999;height: 1px;color: #ffffff;" size="1" noshade="noshade" />
+ <div>カートに商品が入っていません。<br/>
+ <a id="productListLink" href="">お買物を続ける</a></div>
+ </div>
</div>
</div>
</div>
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html 2007-10-05 09:10:11 UTC (rev 606)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html 2007-10-05 12:25:52 UTC (rev 607)
@@ -48,6 +48,8 @@
</div>
<div id="isNotUser">
<label>商品をカートに入れるには、本サービスにユーザー登録が必要になります。</label>
+ <br/>
+ <a id="orderLink" href="">会員情報登録へ進む</a>
</div>
</div>
<div id="isNotLogin">