svnno****@sourc*****
svnno****@sourc*****
2007年 11月 6日 (火) 15:36:19 JST
Revision: 690
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=690
Author: shinsuke
Date: 2007-11-06 15:36:18 +0900 (Tue, 06 Nov 2007)
Log Message:
-----------
added validators, changed to including tax, modified messages.
Modified Paths:
--------------
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/CheckoutConfirmPage.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.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/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/ProductDetailsAction.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/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompletePage.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditPage.java
pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html
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/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
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html
-------------- next part --------------
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-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-11-06 06:36:18 UTC (rev 690)
@@ -11,7 +11,7 @@
public static final String VALUE = "value";
- public static final int DEFULAT_PAGE_SIZE = 25;
+ public static final int DEFULAT_PAGE_SIZE = 15;
public static final int DEFULAT_PAGE_RANGE_SIZE = 5;
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java 2007-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java 2007-11-06 06:36:18 UTC (rev 690)
@@ -5,6 +5,8 @@
import java.util.List;
import java.util.Map;
+import jp.sf.pal.pompei.util.UrlBuilderUtil;
+
import org.seasar.teeda.extension.annotation.convert.BigDecimalConverter;
import org.seasar.teeda.extension.util.LabelHelper;
@@ -341,4 +343,8 @@
public void setPaymentFee(BigDecimal paymentFee) {
this.paymentFee = paymentFee;
}
+
+ public String getMoveProductListOnclick() {
+ return "location.href='" + UrlBuilderUtil.createProductListUrl() + "'";
+ }
}
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java 2007-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/PaymentSelectAction.java 2007-11-06 06:36:18 UTC (rev 690)
@@ -127,6 +127,21 @@
.getCardTypeDescriptionList();
getPaymentSelectPage().setCardCodeItems(getCardTypeDxo().convert(ctd));
+ // set default value
+ if (getPaymentSelectPage().getPaymentMethodItems() != null
+ && getPaymentSelectPage().getPaymentMethodItems().size() == 1) {
+ getPaymentSelectPage().setPaymentMethodId(
+ (BigDecimal) getPaymentSelectPage().getPaymentMethodItems()
+ .get(0).get("paymentMethodId"));
+ }
+ if (getPaymentSelectPage().getDeliveryMethodItems() != null
+ && getPaymentSelectPage().getDeliveryMethodItems().size() == 1) {
+ getPaymentSelectPage().setDeliveryMethodId(
+ (BigDecimal) getPaymentSelectPage()
+ .getDeliveryMethodItems().get(0).get(
+ "deliveryMethodId"));
+ }
+
// render FacesMessage
FacesMessageUtil.renderMessages();
return null;
Modified: 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-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserAddressSelectPage.java 2007-11-06 06:36:18 UTC (rev 690)
@@ -4,6 +4,8 @@
import java.util.List;
import java.util.Map;
+import org.seasar.teeda.extension.annotation.validator.Length;
+import org.seasar.teeda.extension.annotation.validator.RegularExpression;
import org.seasar.teeda.extension.annotation.validator.Required;
import org.seasar.teeda.extension.util.LabelHelper;
@@ -24,45 +26,60 @@
private String addressBookId;
+ @RegularExpression(pattern = "[0-9]{1,4}-?[0-9]{1,4}-?[0-9]{1,4}")
private String cellphone;
@Required
+ @Length(maximum = 64)
private String city;
+ @Length(maximum = 128)
private String company;
+ @RegularExpression(pattern = "[0-9]{1,4}-?[0-9]{1,4}-?[0-9]{1,4}")
private String fax;
@Required
+ @Length(maximum = 40)
private String firstname;
@Required
+ @Length(maximum = 40)
private String firstnameDescription;
@Required
+ @Length(maximum = 40)
private String lastname;
@Required
+ @Length(maximum = 40)
private String lastnameDescription;
private String postcode;
@Required
+ @RegularExpression(pattern = "[0-9]{3}")
private String primaryPostcode;
@Required
+ @RegularExpression(pattern = "[0-9]{4}")
private String secondaryPostcode;
private List<Map<String, String>> stateItems;
@Required
+ @Length(maximum = 32)
private String state;
@Required
+ @Length(maximum = 255)
private String streetAddress;
+ @Required
+ @RegularExpression(pattern = "[0-9]{1,4}-?[0-9]{1,4}-?[0-9]{1,4}")
private String telephone;
+ @Length(maximum = 64)
private String department;
/**
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-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/UserInfoEditPage.java 2007-11-06 06:36:18 UTC (rev 690)
@@ -10,6 +10,10 @@
import jp.sf.pal.pompei.util.UrlBuilderUtil;
import org.seasar.teeda.extension.annotation.convert.DateTimeConverter;
+import org.seasar.teeda.extension.annotation.validator.Email;
+import org.seasar.teeda.extension.annotation.validator.Equal;
+import org.seasar.teeda.extension.annotation.validator.Length;
+import org.seasar.teeda.extension.annotation.validator.RegularExpression;
import org.seasar.teeda.extension.annotation.validator.Required;
import org.seasar.teeda.extension.util.LabelHelper;
@@ -24,54 +28,75 @@
private String orderProcessId;
+ @RegularExpression(pattern = "[0-9]{1,4}-?[0-9]{1,4}-?[0-9]{1,4}")
private String cellphone;
@Required
+ @Length(maximum = 128)
+ @Email
private String emailAddress;
@Required
+ @Email
+ @Length(maximum = 129)
+ @Equal(targetId = "emailAddress")
private String emailAddressConfirm;
+ @RegularExpression(pattern = "[0-9]{1,4}-?[0-9]{1,4}-?[0-9]{1,4}")
private String fax;
@Required
+ @Length(maximum = 40)
private String firstname;
@Required
+ @Length(maximum = 40)
private String firstnameDescription;
@Required
+ @Length(maximum = 1)
private String gender;
@Required
+ @Length(maximum = 40)
private String lastname;
@Required
+ @Length(maximum = 40)
private String lastnameDescription;
+ @Required
+ @RegularExpression(pattern = "[0-9]{1,4}-?[0-9]{1,4}-?[0-9]{1,4}")
private String telephone;
@Required
+ @Length(maximum = 64)
private String city;
+ @Length(maximum = 128)
private String company;
+ @Length(maximum = 64)
private String department;
private String postcode;
@Required
+ @RegularExpression(pattern = "[0-9]{3}")
private String primaryPostcode;
@Required
+ @RegularExpression(pattern = "[0-9]{4}")
private String secondaryPostcode;
private List<Map<String, String>> stateItems;
@Required
+ @Length(maximum = 32)
private String state;
@Required
+ @Length(maximum = 255)
private String streetAddress;
private String portalId;
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-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsAction.java 2007-11-06 06:36:18 UTC (rev 690)
@@ -21,6 +21,7 @@
import jp.sf.pal.pompei.service.ProductService;
import jp.sf.pal.pompei.util.SessionUtil;
import jp.sf.pal.pompei.util.UploadedFileUtil;
+import jp.sf.pal.pompei.util.UrlBuilderUtil;
public class ProductDetailsAction implements Serializable {
@@ -164,6 +165,18 @@
FacesMessageUtil.addInfoMessage("added.product.to.cart");
}
+ // jump to cart page
+ StringBuilder buf = new StringBuilder();
+ buf.append("<script type=\"text/javascript\"><!--\n");
+ buf.append("setTimeout(\"jumpToCart()\", 1000);\n");
+ buf.append("function jumpToCart(){\n");
+ buf.append("location.href = \"").append(UrlBuilderUtil.createCartUrl())
+ .append("\";\n");
+ buf.append("}\n");
+ buf.append("//-->\n");
+ buf.append("</script>\n");
+ getProductDetailsPage().setJumpToCart(buf.toString());
+
return null;
}
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-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductDetailsPage.java 2007-11-06 06:36:18 UTC (rev 690)
@@ -3,7 +3,6 @@
import java.io.Serializable;
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;
@@ -47,6 +46,8 @@
@BigDecimalConverter(pattern = "###,###")
private BigDecimal price;
+ private String jumpToCart;
+
public String getManufacturersName() {
return manufacturersName;
}
@@ -237,4 +238,25 @@
public String getOrderLinkHref() {
return UrlBuilderUtil.createOrderUrl();
}
+
+ public String getSignupLinkHref() {
+ return UrlBuilderUtil.createSignupUrl();
+ }
+
+ /**
+ * @return the cartUrl
+ */
+ public String getJumpToCart() {
+ // return jumpToCart;
+ String buf = jumpToCart;
+ jumpToCart = null;
+ return buf;
+ }
+
+ /**
+ * @param cartUrl the cartUrl to set
+ */
+ public void setJumpToCart(String cartUrl) {
+ this.jumpToCart = cartUrl;
+ }
}
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java 2007-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/product/ProductListPage.java 2007-11-06 06:36:18 UTC (rev 690)
@@ -196,4 +196,5 @@
public String getThumbnailByListWithImageSrc() {
return getThumbnailSrc();
}
+
}
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java 2007-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompleteAction.java 2007-11-06 06:36:18 UTC (rev 690)
@@ -10,19 +10,26 @@
*
*/
private static final long serialVersionUID = 2689633390570340463L;
+
/**
*
*/
private SignupCompletePage signupCompletePage;
+
public Class<?> initialize() {
return null;
}
public Class<?> prerender() {
+ getSignupCompletePage().setNotifiedEmailAddress(
+ getSignupCompletePage().getEmailAddress());
+ getSignupCompletePage().setEmailAddress(null);
+
// render faces messages
FacesMessageUtil.renderMessages();
return null;
}
+
/**
* @return the signupCompletePage
*/
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompletePage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompletePage.java 2007-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupCompletePage.java 2007-11-06 06:36:18 UTC (rev 690)
@@ -10,8 +10,24 @@
*/
private static final long serialVersionUID = 1424283975909978739L;
+ private String notifiedEmailAddress;
+
public boolean isSendEmail() {
- return getEmailAddress() != null;
+ return getNotifiedEmailAddress() != null;
}
+ /**
+ * @return the notifiedEmailAddress
+ */
+ public String getNotifiedEmailAddress() {
+ return notifiedEmailAddress;
+ }
+
+ /**
+ * @param notifiedEmailAddress the notifiedEmailAddress to set
+ */
+ public void setNotifiedEmailAddress(String notifiedEmailAddress) {
+ this.notifiedEmailAddress = notifiedEmailAddress;
+ }
+
}
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java 2007-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupConfirmAction.java 2007-11-06 06:36:18 UTC (rev 690)
@@ -65,7 +65,7 @@
}
@TakeOver(type = TakeOverType.INCLUDE, properties = "emailAddress")
- public Class<?> doCreate() {
+ public Class<?> doOnceCreate() {
// message digest
try {
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditPage.java 2007-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditPage.java 2007-11-06 06:36:18 UTC (rev 690)
@@ -4,6 +4,10 @@
import java.util.List;
import java.util.Map;
+import org.seasar.teeda.extension.annotation.validator.Email;
+import org.seasar.teeda.extension.annotation.validator.Equal;
+import org.seasar.teeda.extension.annotation.validator.Length;
+import org.seasar.teeda.extension.annotation.validator.RegularExpression;
import org.seasar.teeda.extension.annotation.validator.Required;
public class SignupEditPage extends AbstractUsersignupPage implements
@@ -102,6 +106,7 @@
* @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setCity(java.lang.String)
*/
@Required
+ @Length(maximum = 64)
@Override
public void setCity(String city) {
// TODO Auto-generated method stub
@@ -122,6 +127,8 @@
* @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setEmailAddress(java.lang.String)
*/
@Required
+ @Length(maximum = 128)
+ @Email
@Override
public void setEmailAddress(String emailAddress) {
// TODO Auto-generated method stub
@@ -132,6 +139,9 @@
* @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setEmailAddressConfirm(java.lang.String)
*/
@Required
+ @Email
+ @Length(maximum = 129)
+ @Equal(targetId = "emailAddress")
@Override
public void setEmailAddressConfirm(String emailAddressConfirm) {
// TODO Auto-generated method stub
@@ -142,6 +152,7 @@
* @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setFirstname(java.lang.String)
*/
@Required
+ @Length(maximum = 40)
@Override
public void setFirstname(String firstname) {
// TODO Auto-generated method stub
@@ -152,6 +163,7 @@
* @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setFirstnameDescription(java.lang.String)
*/
@Required
+ @Length(maximum = 40)
@Override
public void setFirstnameDescription(String firstnameDescription) {
// TODO Auto-generated method stub
@@ -162,6 +174,7 @@
* @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setGender(java.lang.String)
*/
@Required
+ @Length(maximum = 1)
@Override
public void setGender(String gender) {
// TODO Auto-generated method stub
@@ -172,6 +185,7 @@
* @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setLastname(java.lang.String)
*/
@Required
+ @Length(maximum = 40)
@Override
public void setLastname(String lastname) {
// TODO Auto-generated method stub
@@ -182,6 +196,7 @@
* @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setLastnameDescription(java.lang.String)
*/
@Required
+ @Length(maximum = 40)
@Override
public void setLastnameDescription(String lastnameDescription) {
// TODO Auto-generated method stub
@@ -202,6 +217,7 @@
* @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setPrimaryPostcode(java.lang.String)
*/
@Required
+ @RegularExpression(pattern = "[0-9]{3}")
@Override
public void setPrimaryPostcode(String primaryPostcode) {
// TODO Auto-generated method stub
@@ -212,6 +228,7 @@
* @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setSecondaryPostcode(java.lang.String)
*/
@Required
+ @RegularExpression(pattern = "[0-9]{4}")
@Override
public void setSecondaryPostcode(String secondaryPostcode) {
// TODO Auto-generated method stub
@@ -222,6 +239,7 @@
* @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setState(java.lang.String)
*/
@Required
+ @Length(maximum = 32)
@Override
public void setState(String state) {
// TODO Auto-generated method stub
@@ -232,6 +250,7 @@
* @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setStreetAddress(java.lang.String)
*/
@Required
+ @Length(maximum = 255)
@Override
public void setStreetAddress(String streetAddress) {
// TODO Auto-generated method stub
@@ -242,6 +261,8 @@
* @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setUserName(java.lang.String)
*/
@Required
+ @Length(minimum = 6, maximum = 32)
+ @RegularExpression(pattern = "[a-zA-Z0-9]+")
@Override
public void setUserName(String userName) {
// TODO Auto-generated method stub
@@ -252,6 +273,7 @@
* @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setUserSecretAnswer(java.lang.String)
*/
@Required
+ @Length(maximum = 255)
@Override
public void setUserSecretAnswer(String userSecretAnswer) {
// TODO Auto-generated method stub
@@ -268,4 +290,65 @@
super.setYearOfDayOfBirth(yearOfDayOfBirth);
}
+ /* (non-Javadoc)
+ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setCellphone(java.lang.String)
+ */
+ @Override
+ @RegularExpression(pattern = "[0-9]{1,4}-?[0-9]{1,4}-?[0-9]{1,4}")
+ public void setCellphone(String cellphone) {
+ // TODO Auto-generated method stub
+ super.setCellphone(cellphone);
+ }
+
+ /* (non-Javadoc)
+ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setFax(java.lang.String)
+ */
+ @RegularExpression(pattern = "[0-9]{1,4}-?[0-9]{1,4}-?[0-9]{1,4}")
+ @Override
+ public void setFax(String fax) {
+ // TODO Auto-generated method stub
+ super.setFax(fax);
+ }
+
+ /* (non-Javadoc)
+ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setTelephone(java.lang.String)
+ */
+ @Required
+ @RegularExpression(pattern = "[0-9]{1,4}-?[0-9]{1,4}-?[0-9]{1,4}")
+ @Override
+ public void setTelephone(String telephone) {
+ // TODO Auto-generated method stub
+ super.setTelephone(telephone);
+ }
+
+ /* (non-Javadoc)
+ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setCompany(java.lang.String)
+ */
+ @Length(maximum = 128)
+ @Override
+ public void setCompany(String company) {
+ // TODO Auto-generated method stub
+ super.setCompany(company);
+ }
+
+ /* (non-Javadoc)
+ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setDepartment(java.lang.String)
+ */
+ @Length(maximum = 64)
+ @Override
+ public void setDepartment(String department) {
+ // TODO Auto-generated method stub
+ super.setDepartment(department);
+ }
+
+ /* (non-Javadoc)
+ * @see jp.sf.pal.pompei.web.user.signup.AbstractUsersignupPage#setUserSecretQuestion(java.lang.String)
+ */
+ @Length(maximum = 255)
+ @Override
+ public void setUserSecretQuestion(String userSecretQuestion) {
+ // TODO Auto-generated method stub
+ super.setUserSecretQuestion(userSecretQuestion);
+ }
+
}
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-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql 2007-11-06 06:36:18 UTC (rev 690)
@@ -27,9 +27,11 @@
INSERT INTO ZONE VALUES (130,107,'JP','Japan');
-INSERT INTO TAX_CLASS VALUES (1, '消費税', '商品・製品の販売やサービスの提供などの取引に対して課税される税金', '2007-01-01 00:00:00', '2007-01-01 00:00:00');
+--INSERT INTO TAX_CLASS VALUES (1, '消費税', '商品・製品の販売やサービスの提供などの取引に対して課税される税金', '2007-01-01 00:00:00', '2007-01-01 00:00:00');
+INSERT INTO TAX_CLASS VALUES (1, '内税', '商品・製品の販売やサービスの提供などの取引に対して課税される税金', '2007-01-01 00:00:00', '2007-01-01 00:00:00');
-INSERT INTO TAX_RATE VALUES (1, 130, 1, 1, 5.0, '税率5.0%', '2007-01-01 00:00:00', '2007-01-01 00:00:00');
+--INSERT INTO TAX_RATE VALUES (1, 130, 1, 1, 5.0, '税率5.0%', '2007-01-01 00:00:00', '2007-01-01 00:00:00');
+INSERT INTO TAX_RATE VALUES (1, 130, 1, 1, 0, '税率5.0%', '2007-01-01 00:00:00', '2007-01-01 00:00:00');
INSERT INTO CATEGORY VALUES (1, '', null, 1, '2007-01-01 00:00:00', '2007-01-01 00:00:00');
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html 2007-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html 2007-11-06 06:36:18 UTC (rev 690)
@@ -70,12 +70,14 @@
<input type="text" id="subTotalPrice" size="14"/>
</td>
</tr>
+<!--
<tr>
<th>税:</th>
<td>
<input type="text" id="tax" size="14"/>
</td>
</tr>
+ -->
<tr>
<th>配送料金:</th>
<td>
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-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/cart/productList.html 2007-11-06 06:36:18 UTC (rev 690)
@@ -28,9 +28,11 @@
<th align="center" width="100" style="color: black;background-color: #fff1a1;">
<label>小計</label>
</th>
+<!--
<th align="center" width="50" style="color: black;background-color: #fff1a1;">
<label>消費税</label>
</th>
+-->
<th align="center" width="40" style="color: black;background-color: #fff1a1;">
<label>送料</label>
</th>
@@ -63,9 +65,11 @@
<th align="center">
<label>別</label>
</th>
+<!--
<th align="center">
<label>別</label>
</th>
+-->
<th align="center">
<label>別</label>
</th>
@@ -77,14 +81,14 @@
<tfoot>
<tr>
<td colspan="3" align="right">
- <label>商品代金小計</label>
+ <label>商品代金小計(税込)</label>
</td>
<td align="right">
<b style="color: #990000;">
<span id="totalPrice">10000</span>
</b>
</td>
- <td colspan="4" align="right">
+ <td colspan="3" align="right">
<input type="submit" id="doUpdate" value="カートを更新する" />
</td>
</tr>
@@ -129,7 +133,7 @@
</label>
<br />
<br />
- <a id="signupLink" href="">ユーザー登録へ進む</a>
+ <a id="signupLink" href="">ログインへ進む</a>
</center>
</div>
</div>
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-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html 2007-11-06 06:36:18 UTC (rev 690)
@@ -85,6 +85,7 @@
<input type="hidden" id="subTotalPrice-hidden" />
</td>
</tr>
+<!--
<tr>
<td colspan="4" align="right">消費税</td>
<td colspan="2" align="right">
@@ -92,6 +93,7 @@
<input type="hidden" id="tax-hidden" />
</td>
</tr>
+-->
<tr>
<td colspan="4" align="right">送料</td>
<td colspan="2" align="right">
@@ -241,7 +243,8 @@
<br />
<br />
<div style="width: 100%;text-align: center;">
- <input id="doCancel" type="button" value="注文を取り消します" onclick="location.href='./checkoutEdit.html'" />
+ <input id="doCancel" type="button" value="注文手続きを取り消す" onclick="location.href='./checkoutEdit.html'" />
+ <input id="moveProductList" type="button" value="お買い物に戻る" onclick="" />
<input id="doConfirm" type="button" value="注文を完了する" onclick="location.href='./checkoutComplete.html'" />
</div>
</form>
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-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userAddressSelect.html 2007-11-06 06:36:18 UTC (rev 690)
@@ -49,7 +49,7 @@
<br />
<div style="width:100%;text-align: right;">
<!-- TODO input id="doEdit" type="button" value="編集(TBD)" onclick="location.href='./userAddressSelection.html'" / -->
- <input id="doDelete" type="button" value="選択したお届け先を削除します" onclick="location.href='./userAddressSelection.html'" />
+ <input id="doDelete" type="button" value="選択したお届け先を削除する" onclick="location.href='./userAddressSelection.html'" />
</div>
<br />
<div style="width:100%;text-align: center;">
@@ -149,6 +149,7 @@
<tr>
<th align="left">
<label>電話番号:</label>
+ <font color="#009900">[必須]</font>
</th>
<td>
<input id="telephone" type="text" class="portlet-form-input-field" size="13" />
@@ -192,7 +193,7 @@
</table>
<br />
<div style="width: 100%;text-align: center;">
- <input id="doAdd" type="button" value="上記の会員情報を追加します" onclick="location.href='./userAddressSelection.html'" />
+ <input id="doAdd" type="button" value="上記の会員情報を追加する" onclick="location.href='./userAddressSelection.html'" />
</div>
</form>
</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-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/userInfoEdit.html 2007-11-06 06:36:18 UTC (rev 690)
@@ -192,6 +192,7 @@
<tr>
<th align="left">
<label>電話番号:</label>
+ <font color="#009900">[必須]</font>
</th>
<td>
<input id="telephone" type="text" class="portlet-form-input-field" size="13" />
@@ -239,11 +240,11 @@
<br />
<br />
<div id="isNotUser" style="text-align: center;">
- <input id="doUpdate-create" type="button" value="上記の会員情報を登録します" onclick="location.href='./userInfoEdit.html'" />
+ <input id="doUpdate-create" type="button" value="上記の会員情報を登録する" onclick="location.href='./userInfoEdit.html'" />
</div>
<div id="isUser" style="text-align: center;">
- <input id="doUpdate-update" type="button" value="上記の会員情報で更新します" onclick="location.href='./userInfoEdit.html'" />
- <a id="goUserInfoEdit-update" href="./userInfoEdit.html?fixed_mode=none">会員情報の更新を取り消します</a>
+ <input id="doUpdate-update" type="button" value="上記の会員情報で更新する" onclick="location.href='./userInfoEdit.html'" />
+ <a id="goUserInfoEdit-update" href="./userInfoEdit.html?fixed_mode=none">会員情報の更新を取り消す</a>
</div>
</div>
<div id="isNotEdit">
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-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/product/productDetails.html 2007-11-06 06:36:18 UTC (rev 690)
@@ -6,9 +6,9 @@
<title id="title-head">商品詳細画面</title>
</head>
<body>
-<form id="productDetailsForm">
+<form id="productDetailsForm"><input id="cartUrl" type="hidden"/>
<div class="portlet-msg">
- <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
+ <span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span>
</div>
<input id="productId" type="hidden" />
<table style="width: 95%;">
@@ -36,7 +36,7 @@
</tr>
<tr>
<th align="right"><label>価格</label></th>
- <td><b style="color: #990000;"><span id="price">100</span> 円</b></td>
+ <td><b style="color: #990000;"><span id="price">100</span> 円 (税込)</b></td>
</tr>
<tr>
<th align="right"><label>在庫数</label></th>
@@ -56,6 +56,8 @@
</div>
<div id="isNotLogin">
<label>商品をカートに入れるには、本サービスにログインしてください。</label>
+ <br/>
+ <a id="signupLink" href="">ログインへ進む</a>
</div>
</td>
</tr>
@@ -66,6 +68,7 @@
<span id="description" te:escape="false">説明</span>
</div>
<hr style="border-top: 1px dashed #999999;height: 1px;color: #ffffff;" size="1" noshade="noshade"/>
-<input type="submit" id="jumpProductList" value="一覧に戻る" />
+<input type="submit" id="jumpProductList" value="一覧に戻る" />
+ <span id="jumpToCart" te:omittag="true" te:escape="false"></span>
</form>
</body></html>
\ No newline at end of file
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html 2007-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupComplete.html 2007-11-06 06:36:18 UTC (rev 690)
@@ -27,7 +27,7 @@
</div>
<div id="isSendEmail" style="margin: 5px;">
<strong>
- <span id="emailAddress">mail</span> 宛に会員情報を送信しました。
+ <span id="notifiedEmailAddress">mail</span> 宛に会員情報を送信しました。
</strong>
<br/>
メールに記述されている会員情報でログインして、ご利用ください。
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html 2007-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupConfirm.html 2007-11-06 06:36:18 UTC (rev 690)
@@ -219,7 +219,7 @@
<br/>
<br/>
<div style="text-align:center;">
- <input type="button" id="doCreate" value="上記の情報を登録する" onclick="location.href='signupComplete.html'" />
+ <input type="button" id="doOnceCreate" value="上記の情報を登録する" onclick="location.href='signupComplete.html'" />
<input type="button" id="doCancel" value="再編集する" onclick="location.href='signupComplete.html'" />
</div>
</center>
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html 2007-11-06 06:27:08 UTC (rev 689)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/signup/signupEdit.html 2007-11-06 06:36:18 UTC (rev 690)
@@ -29,7 +29,7 @@
<font color="#009900">[必須]</font>
</th>
<td>
- <input id="userName" type="text" class="portlet-form-input-field" size="24" />
+ <input id="userName" type="text" class="portlet-form-input-field" size="24" /><br/>
<label id="userIdConditionLabel" class="portlet-form-label">（6〜32字の半角英数字）</label>
</td>
</tr>
@@ -177,6 +177,7 @@
<tr>
<th align="left">
<label>電話番号:</label>
+ <font color="#009900">[必須]</font>
</th>
<td>
<input id="telephone" type="text" class="portlet-form-input-field" size="13" />