Portal Application Laboratory

[pal-cvs 2856] [601] updated teeda.

svnno****@sourc***** svnno****@sourc*****
2007年 10月 2日 (火) 16:48:43 JST

• 前の記事 [pal-cvs 2855] [600] removed no border.
• 次の記事 [pal-cvs 2857] [602] added pompei decorator.
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 601
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=601
Author:   shinsuke
Date:     2007-10-02 16:48:42 +0900 (Tue, 02 Oct 2007)

Log Message:
-----------
updated teeda. put order status on pages. check if order complete page is displayed.

Modified Paths:
--------------
    pompei/portlets/pompei-core/trunk/.classpath
    pompei/portlets/pompei-core/trunk/pom.xml
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java
    pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html
    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
    pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html


-------------- next part --------------
Modified: pompei/portlets/pompei-core/trunk/.classpath
===================================================================
--- pompei/portlets/pompei-core/trunk/.classpath	2007-10-02 06:51:33 UTC (rev 600)
+++ pompei/portlets/pompei-core/trunk/.classpath	2007-10-02 07:48:42 UTC (rev 601)
@@ -9,8 +9,8 @@
 
   <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/seasar/dao/s2-dao/1.0.46/s2-dao-1.0.46.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-core/1.0.11-RC2/teeda-core-1.0.11-RC2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-extension/2.4.17/s2-extension-2.4.17.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-ajax/1.0.11/teeda-ajax-1.0.11.jar"/>
   <classpathentry kind="var" path="M2_REPO/portlet-api/portlet-api/1.0/portlet-api-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/jp/sf/pal/common-utils/0.3/common-utils-0.3.jar" sourcepath="M2_REPO/jp/sf/pal/common-utils/0.3/common-utils-0.3-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar" sourcepath="M2_REPO/javax/servlet/jstl/1.1.2/jstl-1.1.2-sources.jar"/>
@@ -21,30 +21,27 @@
   <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-framework/2.4.17/s2-framework-2.4.17.jar"/>
   <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jp/sf/pal/portlet-output-optimizer/0.2/portlet-output-optimizer-0.2.jar" sourcepath="M2_REPO/jp/sf/pal/portlet-output-optimizer/0.2/portlet-output-optimizer-0.2-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-ajax/1.0.11-RC2/teeda-ajax-1.0.11-RC2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-tiger/1.0.9/teeda-tiger-1.0.9.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.0/geronimo-jta_1.1_spec-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-tiger/1.0.11/teeda-tiger-1.0.11.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-tiger/1.0.11/teeda-tiger-1.0.11-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jp/sf/pal/faces-response-filter/0.2/faces-response-filter-0.2.jar" sourcepath="M2_REPO/jp/sf/pal/faces-response-filter/0.2/faces-response-filter-0.2-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-extension/1.0.11-RC2/teeda-extension-1.0.11-RC2.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.4.ga/javassist-3.4.ga.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-tiger/2.4.17/s2-tiger-2.4.17.jar"/>
-  <classpathentry kind="var" path="M2_REPO/com/h2database/h2/1.0.20070304/h2-1.0.20070304.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.0/xmlunit-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.0.4/mysql-connector-java-5.0.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.0/xmlunit-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/jp/sf/pal/faces-dev-filter/0.2-SNAPSHOT/faces-dev-filter-0.2-SNAPSHOT.jar" sourcepath="M2_REPO/jp/sf/pal/faces-dev-filter/0.2-SNAPSHOT/faces-dev-filter-0.2-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.9/log4j-1.2.9.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.0/geronimo-servlet_2.4_spec-1.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-core/1.0.11/teeda-core-1.0.11.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jsp_2.0_spec/1.0/geronimo-jsp_2.0_spec-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.9-patch-20070624/ognl-2.6.9-patch-20070624.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.2.0/derby-10.2.2.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/seasar/dao/s2-dao-tiger/1.0.46/s2-dao-tiger-1.0.46.jar"/>
   <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.1.1/commons-fileupload-1.1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.0-FINAL/poi-3.0-FINAL.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/seasar/portlet/s2-portlet/1.0.7/s2-portlet-1.0.7.jar" sourcepath="M2_REPO/org/seasar/portlet/s2-portlet/1.0.7/s2-portlet-1.0.7-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/3.0-FINAL/poi-3.0-FINAL.jar"/>
   <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-extension/1.0.11/teeda-extension-1.0.11.jar"/>
   <classpathentry kind="var" path="M2_REPO/jp/sf/pal/jsf4portlet/0.2-SNAPSHOT/jsf4portlet-0.2-SNAPSHOT.jar" sourcepath="M2_REPO/jp/sf/pal/jsf4portlet/0.2-SNAPSHOT/jsf4portlet-0.2-SNAPSHOT-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_2.1_spec/1.0/geronimo-ejb_2.1_spec-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-xmlunit/0.1.0/teeda-xmlunit-0.1.0.jar"/>

Modified: pompei/portlets/pompei-core/trunk/pom.xml
===================================================================
--- pompei/portlets/pompei-core/trunk/pom.xml	2007-10-02 06:51:33 UTC (rev 600)
+++ pompei/portlets/pompei-core/trunk/pom.xml	2007-10-02 07:48:42 UTC (rev 601)
@@ -207,17 +207,17 @@
     <dependency>
       <groupId>org.seasar.teeda</groupId>
       <artifactId>teeda-extension</artifactId>
-      <version>1.0.11-RC2</version>
+      <version>1.0.11</version>
     </dependency>
     <dependency>
       <groupId>org.seasar.teeda</groupId>
       <artifactId>teeda-ajax</artifactId>
-      <version>1.0.11-RC2</version>
+      <version>1.0.11</version>
     </dependency>
     <dependency>
       <groupId>org.seasar.teeda</groupId>
       <artifactId>teeda-tiger</artifactId>
-      <version>1.0.9</version>
+      <version>1.0.11</version>
     </dependency>
     <dependency>
       <groupId>org.seasar.teeda</groupId>

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java	2007-10-02 06:51:33 UTC (rev 600)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java	2007-10-02 07:48:42 UTC (rev 601)
@@ -94,4 +94,6 @@
     public static final String THUMBNAIL_IMAGE_URL = "thumbnailImageUrl";
 
     public static final String DETAILS_IMAGE_URL = "detailsImageUrl";
+
+    public static final String DISPLAYED_ORDER_COMPLETION = "DisplayedOrderCompletion";
 }

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java	2007-10-02 06:51:33 UTC (rev 600)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutCompleteAction.java	2007-10-02 07:48:42 UTC (rev 601)
@@ -4,8 +4,10 @@
 
 import javax.faces.context.FacesContext;
 
+import jp.sf.pal.pompei.PompeiConstants;
 import jp.sf.pal.pompei.exentity.Customer;
 import jp.sf.pal.pompei.service.CustomerService;
+import jp.sf.pal.pompei.util.SessionUtil;
 
 public class CheckoutCompleteAction implements Serializable {
 
@@ -44,6 +46,15 @@
             return UserInfoEditPage.class;
         }
 
+        if (SessionUtil
+                .getFromLocalScope(PompeiConstants.DISPLAYED_ORDER_COMPLETION) != null) {
+            SessionUtil
+                    .removeFromLocalScope(PompeiConstants.DISPLAYED_ORDER_COMPLETION);
+            return UserInfoEditPage.class;
+        }
+        SessionUtil.putToLocalScope(PompeiConstants.DISPLAYED_ORDER_COMPLETION,
+                Boolean.TRUE);
+
         return null;
     }
 

Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java	2007-10-02 06:51:33 UTC (rev 600)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java	2007-10-02 07:48:42 UTC (rev 601)
@@ -336,6 +336,10 @@
             return null;
         }
 
+        // remove order process id
+        SessionUtil.removeFromLocalScope(getCheckoutConfirmPage()
+                .getOrderProcessId());
+
         return CheckoutCompletePage.class;
     }
 

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-02 06:51:33 UTC (rev 600)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html	2007-10-02 07:48:42 UTC (rev 601)
@@ -6,6 +6,23 @@
     <title id="title-head">注文確認画面</title>
   </head>
   <body>
+<div style="width:100%;">
+<center>
+<table border="0" width="80%">
+  <tr>
+    <td align="center" bgcolor="#a7a596">1. 会員情報の確認</td>
+    <td>&gt;</td>
+    <td align="center" bgcolor="#a7a596">2. お届け先の選択</td>
+    <td>&gt;</td>
+    <td align="center" bgcolor="#a7a596">3. 支払方法とお届け方法の選択</td>
+    <td>&gt;</td>
+    <td align="center" bgcolor="#ffd153">4. ご注文内容の確認</td>
+    <td>&gt;</td>
+    <td align="center" bgcolor="#e1de81">5. ご注文完了</td>
+  </tr>
+</table>
+</center>
+</div>
     <form id="checkoutConfirmForm">
       <input id="orderProcessId" type="hidden"/>
       <div>

Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html	2007-10-02 06:51:33 UTC (rev 600)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/paymentSelect.html	2007-10-02 07:48:42 UTC (rev 601)
@@ -18,6 +18,23 @@
 }
  -->
 </script>
+<div style="width:100%;">
+<center>
+<table border="0" width="80%">
+  <tr>
+    <td align="center" bgcolor="#a7a596">1. 会員情報の確認</td>
+    <td>&gt;</td>
+    <td align="center" bgcolor="#a7a596">2. お届け先の選択</td>
+    <td>&gt;</td>
+    <td align="center" bgcolor="#ffd153">3. 支払方法とお届け方法の選択</td>
+    <td>&gt;</td>
+    <td align="center" bgcolor="#e1de81">4. ご注文内容の確認</td>
+    <td>&gt;</td>
+    <td align="center" bgcolor="#e1de81">5. ご注文完了</td>
+  </tr>
+</table>
+</center>
+</div>
     <form id="paymentSelectForm"><input type="hidden" id="targetPaymentMethodId-hidden"/><input type="hidden" id="targetDeliveryMethodId-hidden"/>
       <input id="orderProcessId" type="hidden"/>
       <div>

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-10-02 06:51:33 UTC (rev 600)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html	2007-10-02 07:48:42 UTC (rev 601)
@@ -6,6 +6,23 @@
     <title id="title-head">注文画面: ユーザー情報確認</title>
   </head>
   <body>
+<div style="width:100%;">
+<center>
+<table border="0" width="80%">
+  <tr>
+    <td align="center" bgcolor="#a7a596">1. 会員情報の確認</td>
+    <td>&gt;</td>
+    <td align="center" bgcolor="#ffd153">2. お届け先の選択</td>
+    <td>&gt;</td>
+    <td align="center" bgcolor="#e1de81">3. 支払方法とお届け方法の選択</td>
+    <td>&gt;</td>
+    <td align="center" bgcolor="#e1de81">4. ご注文内容の確認</td>
+    <td>&gt;</td>
+    <td align="center" bgcolor="#e1de81">5. ご注文完了</td>
+  </tr>
+</table>
+</center>
+</div>
     <form id="Form">
       <input id="orderProcessId" type="hidden"/>
       <div>
@@ -26,7 +43,7 @@
         </span>
       </div>
       <div>
-        <input id="doEdit" type="button" value="編集(TBD)" onclick="location.href='./userAddressSelection.html'" />
+        <!-- TODO 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>

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-02 06:51:33 UTC (rev 600)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html	2007-10-02 07:48:42 UTC (rev 601)
@@ -6,6 +6,23 @@
     <title id="title-head">注文画面: ユーザー情報確認</title>
   </head>
   <body>
+<div style="width:100%;">
+<center>
+<table border="0" width="80%">
+  <tr>
+    <td align="center" bgcolor="#ffd153">1. 会員情報の確認</td>
+    <td>&gt;</td>
+    <td align="center" bgcolor="#e1de81">2. お届け先の選択</td>
+    <td>&gt;</td>
+    <td align="center" bgcolor="#e1de81">3. 支払方法とお届け方法の選択</td>
+    <td>&gt;</td>
+    <td align="center" bgcolor="#e1de81">4. ご注文内容の確認</td>
+    <td>&gt;</td>
+    <td align="center" bgcolor="#e1de81">5. ご注文完了</td>
+  </tr>
+</table>
+</center>
+</div>
     <form id="Form">
       <input id="portalId-hidden" type="hidden"/>
       <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-02 06:51:33 UTC (rev 600)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html	2007-10-02 07:48:42 UTC (rev 601)
@@ -42,11 +42,13 @@
         </tr>
       </table>
       <hr style="border-top: 1px dashed #999999;height: 1px;color: #ffffff;" size="1" noshade="noshade"/>
-      <div id="isUser">
-        <input type="submit" id="doAddCart" value="カートに追加" />
-      </div>
       <div id="isLogin">
-        <label>商品をカートに入れるには、本サービスにユーザー登録が必要になります。</label>
+        <div id="isUser">
+          <input type="submit" id="doAddCart" value="カートに追加" />
+        </div>
+        <div id="isNotUser">
+          <label>商品をカートに入れるには、本サービスにユーザー登録が必要になります。</label>
+        </div>
       </div>
       <div id="isNotLogin">
         <label>商品をカートに入れるには、本サービスにログインしてください。</label>

• 前の記事 [pal-cvs 2855] [600] removed no border.
• 次の記事 [pal-cvs 2857] [602] added pompei decorator.
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]