svnno****@sourc*****
svnno****@sourc*****
2007年 10月 14日 (日) 07:48:10 JST
Revision: 628
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=628
Author: shinsuke
Date: 2007-10-14 07:48:08 +0900 (Sun, 14 Oct 2007)
Log Message:
-----------
updated db, added payment fee, added delivery number, added order notification.
Modified Paths:
--------------
pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml
pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay
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/bsbhv/BsOrderFormBhv.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsPaymentMethodBhv.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsPaymentMethodDao.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethod.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDbm.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsPaymentMethodCQ.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsPaymentMethodCQ.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/PaymentMethodCIQ.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ProductDxo.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.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/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java
pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties
pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/label.properties
pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql
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/orderConfirm.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html
pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html
Added Paths:
-----------
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Order.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Product.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/VelocityUtil.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectAction.java
pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectPage.java
pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties
pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/
pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/
pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/completed-order-to-admin.vm
pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/completed-order-to-customer.vm
pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/new-order-to-admin.vm
pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/new-order-to-customer.vm
pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderNotificationSelect.html
-------------- next part --------------
Modified: pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml
===================================================================
--- pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/dbflute/schema/project-schema-pompei.xml 2007-10-13 22:48:08 UTC (rev 628)
@@ -510,6 +510,8 @@
name="DELIVERY_METHOD_ID" type="INTEGER"/>
<column dbType="VARCHAR" javaType="String"
name="DELIVERY_METHOD_CODE" required="true" size="16" type="VARCHAR"/>
+ <column dbType="VARCHAR" javaType="String"
+ name="DELIVERY_NUMBER" size="32" type="VARCHAR"/>
<column dbType="TIMESTAMP" javaType="java.sql.Timestamp"
name="LAST_MODIFIED" required="true" type="TIMESTAMP"/>
<column dbType="INTEGER" javaType="java.math.BigDecimal"
@@ -523,12 +525,14 @@
<column dbType="CHAR" javaType="String" name="CURRENCY_CODE"
required="true" size="3" type="CHAR"/>
<column dbType="DECIMAL" javaType="java.math.BigDecimal"
- name="DELIVERY_PRICE" size="14" type="DECIMAL"/>
- <column dbType="DECIMAL" javaType="java.math.BigDecimal"
name="SUB_TOTAL_PRICE" size="14" type="DECIMAL"/>
<column dbType="DECIMAL" javaType="java.math.BigDecimal"
name="TAX" size="14" type="DECIMAL"/>
<column dbType="DECIMAL" javaType="java.math.BigDecimal"
+ name="DELIVERY_PRICE" size="14" type="DECIMAL"/>
+ <column dbType="DECIMAL" javaType="java.math.BigDecimal"
+ name="PAYMENT_FEE" size="14" type="DECIMAL"/>
+ <column dbType="DECIMAL" javaType="java.math.BigDecimal"
name="TOTAL_PRICE" required="true" size="14" type="DECIMAL"/>
<foreign-key foreignTable="CURRENCY" name="FK_ORDERS_6">
<reference foreign="CURRENCY_ID" local="CURRENCY_ID"/>
@@ -701,6 +705,8 @@
primaryKey="true" required="true" type="INTEGER"/>
<column dbType="VARCHAR" javaType="String" name="CODE"
required="true" size="16" type="VARCHAR"/>
+ <column dbType="DECIMAL" javaType="java.math.BigDecimal"
+ name="FEE" required="true" size="14" type="DECIMAL"/>
<column dbType="INTEGER" javaType="java.math.BigDecimal"
name="SORT_ORDER" required="true" type="INTEGER"/>
<column dbType="TIMESTAMP" javaType="java.sql.Timestamp"
Modified: pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/config/pompei.clay 2007-10-13 22:48:08 UTC (rev 628)
@@ -1156,7 +1156,7 @@
</table>
<table alias="" name="ORDER_FORM" remarks="" uid="1350e24:11525502e7d:-7f7e">
<table-description></table-description>
-<table-figure-bounds height="1102" width="378" x="27" y="910"/>
+<table-figure-bounds height="1128" width="378" x="27" y="910"/>
<column-list>
<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="ORDER_FORM_ID" remarks="" uid="1350e24:11525502e7d:-7f7c">
<column-description></column-description>
@@ -1552,6 +1552,13 @@
<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
</data-type>
</column>
+<column alias="" auto-increment="false" column-size="32" decimal-digits="0" default-value="" mandatory="false" name="DELIVERY_NUMBER" remarks="" uid="cb9718:1159b6c07dd:-7fce">
+<column-description></column-description>
+<data-type jdbc-type="12" literal-prefix="'" literal-suffix="'" name="VARCHAR" selected-variant-pattern="VARCHAR(%n)">
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n)"/>
+<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
+</data-type>
+</column>
<column alias="" auto-increment="false" column-size="26" decimal-digits="0" default-value="" mandatory="true" name="LAST_MODIFIED" remarks="" uid="1350e24:11525502e7d:-7f4e">
<column-description></column-description>
<data-type jdbc-type="93" literal-prefix="'" literal-suffix="'" name="TIMESTAMP" selected-variant-pattern="TIMESTAMP(%n)">
@@ -1607,7 +1614,7 @@
<variant precision-max="255" precision-min="0" precision-variable="%n" type-name-pattern="CHAR(%n) BINARY"/>
</data-type>
</column>
-<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="false" name="DELIVERY_PRICE" remarks="" uid="1350e24:11525502e7d:-7f48">
+<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="false" name="SUB_TOTAL_PRICE" remarks="" uid="148ab5c:1152d143877:-7fcc">
<column-description></column-description>
<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
@@ -1621,7 +1628,7 @@
<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
</data-type>
</column>
-<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="false" name="SUB_TOTAL_PRICE" remarks="" uid="148ab5c:1152d143877:-7fcc">
+<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="false" name="TAX" remarks="" uid="1350e24:11525502e7d:-7f46">
<column-description></column-description>
<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
@@ -1635,7 +1642,7 @@
<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
</data-type>
</column>
-<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="false" name="TAX" remarks="" uid="1350e24:11525502e7d:-7f46">
+<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="false" name="DELIVERY_PRICE" remarks="" uid="1350e24:11525502e7d:-7f48">
<column-description></column-description>
<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
@@ -1649,6 +1656,20 @@
<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
</data-type>
</column>
+<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="false" name="PAYMENT_FEE" remarks="" uid="bf544c:1159961299e:-7fc5">
+<column-description></column-description>
+<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
+<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
+<variant type-name-pattern="DECIMAL"/>
+<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
+<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
+<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) ZEROFILL"/>
+<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED"/>
+<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED ZEROFILL"/>
+<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
+</data-type>
+</column>
<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="true" name="TOTAL_PRICE" remarks="" uid="1350e24:11525502e7d:-7f47">
<column-description></column-description>
<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
@@ -3977,7 +3998,7 @@
</table>
<table alias="" name="PAYMENT_METHOD" remarks="" uid="1350e24:11525502e7d:-7e62">
<table-description></table-description>
-<table-figure-bounds height="120" width="276" x="523" y="523"/>
+<table-figure-bounds height="131" width="276" x="611" y="482"/>
<column-list>
<column alias="" auto-increment="true" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PAYMENT_METHOD_ID" remarks="" uid="1350e24:11525502e7d:-7e60">
<column-description></column-description>
@@ -3999,6 +4020,20 @@
<variant precision-max="255" precision-min="1" precision-variable="%n" type-name-pattern="VARCHAR(%n) BINARY"/>
</data-type>
</column>
+<column alias="" auto-increment="false" column-size="14" decimal-digits="6" default-value="" mandatory="true" name="FEE" remarks="" uid="bf544c:1159961299e:-7fcc">
+<column-description></column-description>
+<data-type jdbc-type="3" name="DECIMAL" selected-variant-pattern="DECIMAL(%p, %s)">
+<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s)"/>
+<variant type-name-pattern="DECIMAL"/>
+<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n)"/>
+<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED"/>
+<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) UNSIGNED ZEROFILL"/>
+<variant precision-max="17" precision-min="0" precision-variable="%n" type-name-pattern="DECIMAL(%n) ZEROFILL"/>
+<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED"/>
+<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) UNSIGNED ZEROFILL"/>
+<variant precision-max="17" precision-min="0" precision-variable="%p" scale-max="128" scale-min="0" scale-variable="%s" type-name-pattern="DECIMAL(%p, %s) ZEROFILL"/>
+</data-type>
+</column>
<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="SORT_ORDER" remarks="" uid="1350e24:11525502e7d:-7e5e">
<column-description></column-description>
<data-type jdbc-type="4" name="INTEGER" selected-variant-pattern="INTEGER">
@@ -4037,7 +4072,7 @@
</table>
<table alias="" name="PAYMENT_METHOD_DESCRIPTION" remarks="" uid="1350e24:11525502e7d:-7e5b">
<table-description></table-description>
-<table-figure-bounds height="98" width="330" x="1770" y="602"/>
+<table-figure-bounds height="98" width="330" x="1715" y="583"/>
<column-list>
<column alias="" auto-increment="false" column-size="0" decimal-digits="0" default-value="" mandatory="true" name="PAYMENT_METHOD_ID" remarks="" uid="1350e24:11525502e7d:-7e59">
<column-description></column-description>
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-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/PompeiConstants.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -7,6 +7,10 @@
public class PompeiConstants {
public static final String PREFIX = "jp.sf.pal.pompei.";
+ public static final String LABEL = "label";
+
+ public static final String VALUE = "value";
+
public static final int DEFULAT_PAGE_SIZE = 25;
public static final int DEFULAT_PAGE_RANGE_SIZE = 5;
@@ -89,6 +93,8 @@
public static final BigDecimal DEFAULT_DELIVERY_PRICE = new BigDecimal(0);
+ public static final BigDecimal DEFAULT_PAYMENT_FEE = new BigDecimal(0);
+
public static final String CATEGORY_BREADCRUMB = "CategoryBreadcrumb";
public static final String CURRENT_CATEGORY_ID = "CurrentCategoryId";
@@ -233,4 +239,18 @@
public static final String USER_SECRET_ANSWER = "user.secret.answer";
public static final String EMAIL_SUBJECT_USER_REGISTRATION = "email.subject.registration";
+
+ public static final String ADMINISTRATOR_EMAIL = "administratorEmail";
+
+ public static final String DEFAULT_ADMINISTRATOR_EMAIL = "root****@pal*****";
+
+ public static final String ORDER_NOTIFICATION_PATH = "orderNotificationPath";
+
+ public static final String DEFAULT_ORDER_NOTIFICATION_PATH = "/notification/order/";
+
+ public static final String DEFAULT_TEMPLATE_PATH = "/WEB-INF/template/";
+
+ public static final String SMTP_HOST = "smtpHost";
+
+ public static final String DEFAULT_SMTP_HOST = "localhost";
}
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsOrderFormBhv.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -30,7 +30,7 @@
* ORDER_FORM_ID
*
* [column-property]
- * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE
+ * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, DELIVERY_NUMBER, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE
*
* [foreign-property]
* currency, customer, deliveryMethod, orderStatus, paymentMethod
@@ -1542,15 +1542,17 @@
if (names.contains("orderCardInfoId")) { destinationMyEntity.setOrderCardInfoId(sourceMyEntity.getOrderCardInfoId()); }
if (names.contains("deliveryMethodId")) { destinationMyEntity.setDeliveryMethodId(sourceMyEntity.getDeliveryMethodId()); }
if (names.contains("deliveryMethodCode")) { destinationMyEntity.setDeliveryMethodCode(sourceMyEntity.getDeliveryMethodCode()); }
+ if (names.contains("deliveryNumber")) { destinationMyEntity.setDeliveryNumber(sourceMyEntity.getDeliveryNumber()); }
if (names.contains("lastModified")) { destinationMyEntity.setLastModified(sourceMyEntity.getLastModified()); }
if (names.contains("orderStatusId")) { destinationMyEntity.setOrderStatusId(sourceMyEntity.getOrderStatusId()); }
if (names.contains("purchasedDate")) { destinationMyEntity.setPurchasedDate(sourceMyEntity.getPurchasedDate()); }
if (names.contains("finishedDate")) { destinationMyEntity.setFinishedDate(sourceMyEntity.getFinishedDate()); }
if (names.contains("currencyId")) { destinationMyEntity.setCurrencyId(sourceMyEntity.getCurrencyId()); }
if (names.contains("currencyCode")) { destinationMyEntity.setCurrencyCode(sourceMyEntity.getCurrencyCode()); }
- if (names.contains("deliveryPrice")) { destinationMyEntity.setDeliveryPrice(sourceMyEntity.getDeliveryPrice()); }
if (names.contains("subTotalPrice")) { destinationMyEntity.setSubTotalPrice(sourceMyEntity.getSubTotalPrice()); }
if (names.contains("tax")) { destinationMyEntity.setTax(sourceMyEntity.getTax()); }
+ if (names.contains("deliveryPrice")) { destinationMyEntity.setDeliveryPrice(sourceMyEntity.getDeliveryPrice()); }
+ if (names.contains("paymentFee")) { destinationMyEntity.setPaymentFee(sourceMyEntity.getPaymentFee()); }
if (names.contains("totalPrice")) { destinationMyEntity.setTotalPrice(sourceMyEntity.getTotalPrice()); }
}
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsPaymentMethodBhv.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsPaymentMethodBhv.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsbhv/BsPaymentMethodBhv.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -30,7 +30,7 @@
* PAYMENT_METHOD_ID
*
* [column-property]
- * PAYMENT_METHOD_ID, CODE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED
+ * PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED
*
* [foreign-property]
*
@@ -934,6 +934,7 @@
if (names.contains("paymentMethodId")) { destinationMyEntity.setPaymentMethodId(sourceMyEntity.getPaymentMethodId()); }
if (names.contains("code")) { destinationMyEntity.setCode(sourceMyEntity.getCode()); }
+ if (names.contains("fee")) { destinationMyEntity.setFee(sourceMyEntity.getFee()); }
if (names.contains("sortOrder")) { destinationMyEntity.setSortOrder(sourceMyEntity.getSortOrder()); }
if (names.contains("dateAdded")) { destinationMyEntity.setDateAdded(sourceMyEntity.getDateAdded()); }
if (names.contains("lastModified")) { destinationMyEntity.setLastModified(sourceMyEntity.getLastModified()); }
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsOrderFormDao.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -11,7 +11,7 @@
* ORDER_FORM_ID
*
* [column-property]
- * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE
+ * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, DELIVERY_NUMBER, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE
*
* [foreign-property]
* currency, customer, deliveryMethod, orderStatus, paymentMethod
@@ -51,7 +51,7 @@
public int getCountAll();
/** SQL-Annotation for getListAll(). */
- public static final String getListAll_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE from ORDER_FORM";
+ public static final String getListAll_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, DELIVERY_NUMBER, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE from ORDER_FORM";
/**
* Get list as all.
@@ -61,7 +61,7 @@
public java.util.List<OrderForm> getListAll();
/** SQL-Annotation for getEntity(). */
- public static final String getEntity_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE from ORDER_FORM where ORDER_FORM.ORDER_FORM_ID = /*orderFormId*/null";
+ public static final String getEntity_SQL = "select ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, DELIVERY_NUMBER, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE from ORDER_FORM where ORDER_FORM.ORDER_FORM_ID = /*orderFormId*/null";
/** Args-Annotation for getEntity(). */
public static final String getEntity_ARGS = "orderFormId";
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsPaymentMethodDao.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsPaymentMethodDao.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsdao/BsPaymentMethodDao.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -11,7 +11,7 @@
* PAYMENT_METHOD_ID
*
* [column-property]
- * PAYMENT_METHOD_ID, CODE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED
+ * PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED
*
* [foreign-property]
*
@@ -51,7 +51,7 @@
public int getCountAll();
/** SQL-Annotation for getListAll(). */
- public static final String getListAll_SQL = "select PAYMENT_METHOD_ID, CODE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED from PAYMENT_METHOD";
+ public static final String getListAll_SQL = "select PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED from PAYMENT_METHOD";
/**
* Get list as all.
@@ -61,7 +61,7 @@
public java.util.List<PaymentMethod> getListAll();
/** SQL-Annotation for getEntity(). */
- public static final String getEntity_SQL = "select PAYMENT_METHOD_ID, CODE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED from PAYMENT_METHOD where PAYMENT_METHOD.PAYMENT_METHOD_ID = /*paymentMethodId*/null";
+ public static final String getEntity_SQL = "select PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED from PAYMENT_METHOD where PAYMENT_METHOD.PAYMENT_METHOD_ID = /*paymentMethodId*/null";
/** Args-Annotation for getEntity(). */
public static final String getEntity_ARGS = "paymentMethodId";
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsOrderForm.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -14,7 +14,7 @@
* ORDER_FORM_ID
*
* [column-property]
- * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE
+ * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, DELIVERY_NUMBER, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE
*
* [foreign-property]
* currency, customer, deliveryMethod, orderStatus, paymentMethod
@@ -216,6 +216,9 @@
/** The value of deliveryMethodCode. VARCHAR(16) : NotNull */
protected String _deliveryMethodCode;
+ /** The value of deliveryNumber. VARCHAR(32) */
+ protected String _deliveryNumber;
+
/** The value of lastModified. TIMESTAMP : NotNull */
protected java.sql.Timestamp _lastModified;
@@ -234,15 +237,18 @@
/** The value of currencyCode. CHAR(3) : NotNull */
protected String _currencyCode;
- /** The value of deliveryPrice. DECIMAL(14) */
- protected java.math.BigDecimal _deliveryPrice;
-
/** The value of subTotalPrice. DECIMAL(14) */
protected java.math.BigDecimal _subTotalPrice;
/** The value of tax. DECIMAL(14) */
protected java.math.BigDecimal _tax;
+ /** The value of deliveryPrice. DECIMAL(14) */
+ protected java.math.BigDecimal _deliveryPrice;
+
+ /** The value of paymentFee. DECIMAL(14) */
+ protected java.math.BigDecimal _paymentFee;
+
/** The value of totalPrice. DECIMAL(14) : NotNull */
protected java.math.BigDecimal _totalPrice;
@@ -1583,6 +1589,30 @@
this._deliveryMethodCode = deliveryMethodCode;
}
+ /** Column Annotation for S2Dao. VARCHAR(32) */
+ public static final String deliveryNumber_COLUMN = "DELIVERY_NUMBER";
+
+ /**
+ * Get the value of deliveryNumber. <br />
+ * {VARCHAR(32)}
+ *
+ * @return The value of deliveryNumber. (Nullable)
+ */
+ public String getDeliveryNumber() {
+ return _deliveryNumber;
+ }
+
+ /**
+ * Set the value of deliveryNumber. <br />
+ * {VARCHAR(32)}
+ *
+ * @param deliveryNumber The value of deliveryNumber. (Nullable)
+ */
+ public void setDeliveryNumber(String deliveryNumber) {
+ _modifiedProperties.addPropertyName("deliveryNumber");
+ this._deliveryNumber = deliveryNumber;
+ }
+
/** Column Annotation for S2Dao. TIMESTAMP : NotNull */
public static final String lastModified_COLUMN = "LAST_MODIFIED";
@@ -1728,30 +1758,6 @@
}
/** Column Annotation for S2Dao. DECIMAL(14) */
- public static final String deliveryPrice_COLUMN = "DELIVERY_PRICE";
-
- /**
- * Get the value of deliveryPrice. <br />
- * {DECIMAL(14)}
- *
- * @return The value of deliveryPrice. (Nullable)
- */
- public java.math.BigDecimal getDeliveryPrice() {
- return _deliveryPrice;
- }
-
- /**
- * Set the value of deliveryPrice. <br />
- * {DECIMAL(14)}
- *
- * @param deliveryPrice The value of deliveryPrice. (Nullable)
- */
- public void setDeliveryPrice(java.math.BigDecimal deliveryPrice) {
- _modifiedProperties.addPropertyName("deliveryPrice");
- this._deliveryPrice = deliveryPrice;
- }
-
- /** Column Annotation for S2Dao. DECIMAL(14) */
public static final String subTotalPrice_COLUMN = "SUB_TOTAL_PRICE";
/**
@@ -1799,6 +1805,54 @@
this._tax = tax;
}
+ /** Column Annotation for S2Dao. DECIMAL(14) */
+ public static final String deliveryPrice_COLUMN = "DELIVERY_PRICE";
+
+ /**
+ * Get the value of deliveryPrice. <br />
+ * {DECIMAL(14)}
+ *
+ * @return The value of deliveryPrice. (Nullable)
+ */
+ public java.math.BigDecimal getDeliveryPrice() {
+ return _deliveryPrice;
+ }
+
+ /**
+ * Set the value of deliveryPrice. <br />
+ * {DECIMAL(14)}
+ *
+ * @param deliveryPrice The value of deliveryPrice. (Nullable)
+ */
+ public void setDeliveryPrice(java.math.BigDecimal deliveryPrice) {
+ _modifiedProperties.addPropertyName("deliveryPrice");
+ this._deliveryPrice = deliveryPrice;
+ }
+
+ /** Column Annotation for S2Dao. DECIMAL(14) */
+ public static final String paymentFee_COLUMN = "PAYMENT_FEE";
+
+ /**
+ * Get the value of paymentFee. <br />
+ * {DECIMAL(14)}
+ *
+ * @return The value of paymentFee. (Nullable)
+ */
+ public java.math.BigDecimal getPaymentFee() {
+ return _paymentFee;
+ }
+
+ /**
+ * Set the value of paymentFee. <br />
+ * {DECIMAL(14)}
+ *
+ * @param paymentFee The value of paymentFee. (Nullable)
+ */
+ public void setPaymentFee(java.math.BigDecimal paymentFee) {
+ _modifiedProperties.addPropertyName("paymentFee");
+ this._paymentFee = paymentFee;
+ }
+
/** Column Annotation for S2Dao. DECIMAL(14) : NotNull */
public static final String totalPrice_COLUMN = "TOTAL_PRICE";
@@ -1827,16 +1881,16 @@
// ===================================================================================
// Classify Method
// ===============
-
+
// ===================================================================================
// Classification Determination
// ============================
-
+
// ===================================================================================
// Classification Getter
// =====================
-
+
// ===================================================================================
// Foreign Table
@@ -2449,15 +2503,17 @@
sb.append(delimiter).append(getOrderCardInfoId());
sb.append(delimiter).append(getDeliveryMethodId());
sb.append(delimiter).append(getDeliveryMethodCode());
+ sb.append(delimiter).append(getDeliveryNumber());
sb.append(delimiter).append(getLastModified());
sb.append(delimiter).append(getOrderStatusId());
sb.append(delimiter).append(getPurchasedDate());
sb.append(delimiter).append(getFinishedDate());
sb.append(delimiter).append(getCurrencyId());
sb.append(delimiter).append(getCurrencyCode());
- sb.append(delimiter).append(getDeliveryPrice());
sb.append(delimiter).append(getSubTotalPrice());
sb.append(delimiter).append(getTax());
+ sb.append(delimiter).append(getDeliveryPrice());
+ sb.append(delimiter).append(getPaymentFee());
sb.append(delimiter).append(getTotalPrice());
sb.delete(0, delimiter.length());
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethod.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethod.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/BsPaymentMethod.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -14,7 +14,7 @@
* PAYMENT_METHOD_ID
*
* [column-property]
- * PAYMENT_METHOD_ID, CODE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED
+ * PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED
*
* [foreign-property]
*
@@ -63,6 +63,9 @@
/** The value of code. VARCHAR(16) : NotNull */
protected String _code;
+ /** The value of fee. DECIMAL(14) : NotNull */
+ protected java.math.BigDecimal _fee;
+
/** The value of sortOrder. INTEGER : NotNull */
protected java.math.BigDecimal _sortOrder;
@@ -185,6 +188,30 @@
this._code = code;
}
+ /** Column Annotation for S2Dao. DECIMAL(14) : NotNull */
+ public static final String fee_COLUMN = "FEE";
+
+ /**
+ * Get the value of fee. <br />
+ * {DECIMAL(14) : NotNull}
+ *
+ * @return The value of fee. (Nullable)
+ */
+ public java.math.BigDecimal getFee() {
+ return _fee;
+ }
+
+ /**
+ * Set the value of fee. <br />
+ * {DECIMAL(14) : NotNull}
+ *
+ * @param fee The value of fee. (Nullable)
+ */
+ public void setFee(java.math.BigDecimal fee) {
+ _modifiedProperties.addPropertyName("fee");
+ this._fee = fee;
+ }
+
/** Column Annotation for S2Dao. INTEGER : NotNull */
public static final String sortOrder_COLUMN = "SORT_ORDER";
@@ -261,16 +288,16 @@
// ===================================================================================
// Classify Method
// ===============
-
+
// ===================================================================================
// Classification Determination
// ============================
-
+
// ===================================================================================
// Classification Getter
// =====================
-
+
// ===================================================================================
// Foreign Table
@@ -437,6 +464,7 @@
sb.append(delimiter).append(getPaymentMethodId());
sb.append(delimiter).append(getCode());
+ sb.append(delimiter).append(getFee());
sb.append(delimiter).append(getSortOrder());
sb.append(delimiter).append(getDateAdded());
sb.append(delimiter).append(getLastModified());
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/OrderFormDbm.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -16,7 +16,7 @@
* ORDER_FORM_ID
*
* [column-property]
- * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE
+ * ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, DELIVERY_NUMBER, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE
*
* [foreign-property]
* currency, customer, deliveryMethod, orderStatus, paymentMethod
@@ -199,6 +199,8 @@
public static final String DB_NAME_DELIVERY_METHOD_ID = "DELIVERY_METHOD_ID";
/** Db-name of DELIVERY_METHOD_CODE. VARCHAR(16) : NotNull */
public static final String DB_NAME_DELIVERY_METHOD_CODE = "DELIVERY_METHOD_CODE";
+ /** Db-name of DELIVERY_NUMBER. VARCHAR(32) */
+ public static final String DB_NAME_DELIVERY_NUMBER = "DELIVERY_NUMBER";
/** Db-name of LAST_MODIFIED. TIMESTAMP : NotNull */
public static final String DB_NAME_LAST_MODIFIED = "LAST_MODIFIED";
/** Db-name of ORDER_STATUS_ID. INTEGER : NotNull : FK to ORDER_STATUS */
@@ -211,12 +213,14 @@
public static final String DB_NAME_CURRENCY_ID = "CURRENCY_ID";
/** Db-name of CURRENCY_CODE. CHAR(3) : NotNull */
public static final String DB_NAME_CURRENCY_CODE = "CURRENCY_CODE";
- /** Db-name of DELIVERY_PRICE. DECIMAL(14) */
- public static final String DB_NAME_DELIVERY_PRICE = "DELIVERY_PRICE";
/** Db-name of SUB_TOTAL_PRICE. DECIMAL(14) */
public static final String DB_NAME_SUB_TOTAL_PRICE = "SUB_TOTAL_PRICE";
/** Db-name of TAX. DECIMAL(14) */
public static final String DB_NAME_TAX = "TAX";
+ /** Db-name of DELIVERY_PRICE. DECIMAL(14) */
+ public static final String DB_NAME_DELIVERY_PRICE = "DELIVERY_PRICE";
+ /** Db-name of PAYMENT_FEE. DECIMAL(14) */
+ public static final String DB_NAME_PAYMENT_FEE = "PAYMENT_FEE";
/** Db-name of TOTAL_PRICE. DECIMAL(14) : NotNull */
public static final String DB_NAME_TOTAL_PRICE = "TOTAL_PRICE";
@@ -326,6 +330,8 @@
public static final String COLUMN_DB_NAME_OF_DeliveryMethodId = "DELIVERY_METHOD_ID";
/** @deprecated Deprecated! So use DB_NAME_DeliveryMethodCode. */
public static final String COLUMN_DB_NAME_OF_DeliveryMethodCode = "DELIVERY_METHOD_CODE";
+ /** @deprecated Deprecated! So use DB_NAME_DeliveryNumber. */
+ public static final String COLUMN_DB_NAME_OF_DeliveryNumber = "DELIVERY_NUMBER";
/** @deprecated Deprecated! So use DB_NAME_LastModified. */
public static final String COLUMN_DB_NAME_OF_LastModified = "LAST_MODIFIED";
/** @deprecated Deprecated! So use DB_NAME_OrderStatusId. */
@@ -338,12 +344,14 @@
public static final String COLUMN_DB_NAME_OF_CurrencyId = "CURRENCY_ID";
/** @deprecated Deprecated! So use DB_NAME_CurrencyCode. */
public static final String COLUMN_DB_NAME_OF_CurrencyCode = "CURRENCY_CODE";
- /** @deprecated Deprecated! So use DB_NAME_DeliveryPrice. */
- public static final String COLUMN_DB_NAME_OF_DeliveryPrice = "DELIVERY_PRICE";
/** @deprecated Deprecated! So use DB_NAME_SubTotalPrice. */
public static final String COLUMN_DB_NAME_OF_SubTotalPrice = "SUB_TOTAL_PRICE";
/** @deprecated Deprecated! So use DB_NAME_Tax. */
public static final String COLUMN_DB_NAME_OF_Tax = "TAX";
+ /** @deprecated Deprecated! So use DB_NAME_DeliveryPrice. */
+ public static final String COLUMN_DB_NAME_OF_DeliveryPrice = "DELIVERY_PRICE";
+ /** @deprecated Deprecated! So use DB_NAME_PaymentFee. */
+ public static final String COLUMN_DB_NAME_OF_PaymentFee = "PAYMENT_FEE";
/** @deprecated Deprecated! So use DB_NAME_TotalPrice. */
public static final String COLUMN_DB_NAME_OF_TotalPrice = "TOTAL_PRICE";
@@ -456,6 +464,8 @@
public static final String PROPERTY_NAME_deliveryMethodId = "deliveryMethodId";
/** Prop-name(JavaBeansRule) of deliveryMethodCode. VARCHAR(16) : NotNull */
public static final String PROPERTY_NAME_deliveryMethodCode = "deliveryMethodCode";
+ /** Prop-name(JavaBeansRule) of deliveryNumber. VARCHAR(32) */
+ public static final String PROPERTY_NAME_deliveryNumber = "deliveryNumber";
/** Prop-name(JavaBeansRule) of lastModified. TIMESTAMP : NotNull */
public static final String PROPERTY_NAME_lastModified = "lastModified";
/** Prop-name(JavaBeansRule) of orderStatusId. INTEGER : NotNull : FK to ORDER_STATUS */
@@ -468,12 +478,14 @@
public static final String PROPERTY_NAME_currencyId = "currencyId";
/** Prop-name(JavaBeansRule) of currencyCode. CHAR(3) : NotNull */
public static final String PROPERTY_NAME_currencyCode = "currencyCode";
- /** Prop-name(JavaBeansRule) of deliveryPrice. DECIMAL(14) */
- public static final String PROPERTY_NAME_deliveryPrice = "deliveryPrice";
/** Prop-name(JavaBeansRule) of subTotalPrice. DECIMAL(14) */
public static final String PROPERTY_NAME_subTotalPrice = "subTotalPrice";
/** Prop-name(JavaBeansRule) of tax. DECIMAL(14) */
public static final String PROPERTY_NAME_tax = "tax";
+ /** Prop-name(JavaBeansRule) of deliveryPrice. DECIMAL(14) */
+ public static final String PROPERTY_NAME_deliveryPrice = "deliveryPrice";
+ /** Prop-name(JavaBeansRule) of paymentFee. DECIMAL(14) */
+ public static final String PROPERTY_NAME_paymentFee = "paymentFee";
/** Prop-name(JavaBeansRule) of totalPrice. DECIMAL(14) : NotNull */
public static final String PROPERTY_NAME_totalPrice = "totalPrice";
@@ -586,6 +598,8 @@
public static final String CAP_PROP_NAME_DeliveryMethodId = "DeliveryMethodId";
/** Cap-prop-name of deliveryMethodCode. VARCHAR(16) : NotNull */
public static final String CAP_PROP_NAME_DeliveryMethodCode = "DeliveryMethodCode";
+ /** Cap-prop-name of deliveryNumber. VARCHAR(32) */
+ public static final String CAP_PROP_NAME_DeliveryNumber = "DeliveryNumber";
/** Cap-prop-name of lastModified. TIMESTAMP : NotNull */
public static final String CAP_PROP_NAME_LastModified = "LastModified";
/** Cap-prop-name of orderStatusId. INTEGER : NotNull : FK to ORDER_STATUS */
@@ -598,12 +612,14 @@
public static final String CAP_PROP_NAME_CurrencyId = "CurrencyId";
/** Cap-prop-name of currencyCode. CHAR(3) : NotNull */
public static final String CAP_PROP_NAME_CurrencyCode = "CurrencyCode";
- /** Cap-prop-name of deliveryPrice. DECIMAL(14) */
- public static final String CAP_PROP_NAME_DeliveryPrice = "DeliveryPrice";
/** Cap-prop-name of subTotalPrice. DECIMAL(14) */
public static final String CAP_PROP_NAME_SubTotalPrice = "SubTotalPrice";
/** Cap-prop-name of tax. DECIMAL(14) */
public static final String CAP_PROP_NAME_Tax = "Tax";
+ /** Cap-prop-name of deliveryPrice. DECIMAL(14) */
+ public static final String CAP_PROP_NAME_DeliveryPrice = "DeliveryPrice";
+ /** Cap-prop-name of paymentFee. DECIMAL(14) */
+ public static final String CAP_PROP_NAME_PaymentFee = "PaymentFee";
/** Cap-prop-name of totalPrice. DECIMAL(14) : NotNull */
public static final String CAP_PROP_NAME_TotalPrice = "TotalPrice";
@@ -713,6 +729,8 @@
public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryMethodId = "DeliveryMethodId";
/** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryMethodCode. */
public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryMethodCode = "DeliveryMethodCode";
+ /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryNumber. */
+ public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryNumber = "DeliveryNumber";
/** @deprecated Deprecated! So use CAP_PROP_NAME_LastModified. */
public static final String COLUMN_CAP_PROP_NAME_OF_LastModified = "LastModified";
/** @deprecated Deprecated! So use CAP_PROP_NAME_OrderStatusId. */
@@ -725,12 +743,14 @@
public static final String COLUMN_CAP_PROP_NAME_OF_CurrencyId = "CurrencyId";
/** @deprecated Deprecated! So use CAP_PROP_NAME_CurrencyCode. */
public static final String COLUMN_CAP_PROP_NAME_OF_CurrencyCode = "CurrencyCode";
- /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryPrice. */
- public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryPrice = "DeliveryPrice";
/** @deprecated Deprecated! So use CAP_PROP_NAME_SubTotalPrice. */
public static final String COLUMN_CAP_PROP_NAME_OF_SubTotalPrice = "SubTotalPrice";
/** @deprecated Deprecated! So use CAP_PROP_NAME_Tax. */
public static final String COLUMN_CAP_PROP_NAME_OF_Tax = "Tax";
+ /** @deprecated Deprecated! So use CAP_PROP_NAME_DeliveryPrice. */
+ public static final String COLUMN_CAP_PROP_NAME_OF_DeliveryPrice = "DeliveryPrice";
+ /** @deprecated Deprecated! So use CAP_PROP_NAME_PaymentFee. */
+ public static final String COLUMN_CAP_PROP_NAME_OF_PaymentFee = "PaymentFee";
/** @deprecated Deprecated! So use CAP_PROP_NAME_TotalPrice. */
public static final String COLUMN_CAP_PROP_NAME_OF_TotalPrice = "TotalPrice";
@@ -843,6 +863,8 @@
public static final String UNCAP_PROP_NAME_deliveryMethodId = "deliveryMethodId";
/** Uncap-prop-name of deliveryMethodCode. VARCHAR(16) : NotNull */
public static final String UNCAP_PROP_NAME_deliveryMethodCode = "deliveryMethodCode";
+ /** Uncap-prop-name of deliveryNumber. VARCHAR(32) */
+ public static final String UNCAP_PROP_NAME_deliveryNumber = "deliveryNumber";
/** Uncap-prop-name of lastModified. TIMESTAMP : NotNull */
public static final String UNCAP_PROP_NAME_lastModified = "lastModified";
/** Uncap-prop-name of orderStatusId. INTEGER : NotNull : FK to ORDER_STATUS */
@@ -855,12 +877,14 @@
public static final String UNCAP_PROP_NAME_currencyId = "currencyId";
/** Uncap-prop-name of currencyCode. CHAR(3) : NotNull */
public static final String UNCAP_PROP_NAME_currencyCode = "currencyCode";
- /** Uncap-prop-name of deliveryPrice. DECIMAL(14) */
- public static final String UNCAP_PROP_NAME_deliveryPrice = "deliveryPrice";
/** Uncap-prop-name of subTotalPrice. DECIMAL(14) */
public static final String UNCAP_PROP_NAME_subTotalPrice = "subTotalPrice";
/** Uncap-prop-name of tax. DECIMAL(14) */
public static final String UNCAP_PROP_NAME_tax = "tax";
+ /** Uncap-prop-name of deliveryPrice. DECIMAL(14) */
+ public static final String UNCAP_PROP_NAME_deliveryPrice = "deliveryPrice";
+ /** Uncap-prop-name of paymentFee. DECIMAL(14) */
+ public static final String UNCAP_PROP_NAME_paymentFee = "paymentFee";
/** Uncap-prop-name of totalPrice. DECIMAL(14) : NotNull */
public static final String UNCAP_PROP_NAME_totalPrice = "totalPrice";
@@ -970,6 +994,8 @@
public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryMethodId = "deliveryMethodId";
/** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryMethodCode. */
public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryMethodCode = "deliveryMethodCode";
+ /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryNumber. */
+ public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryNumber = "deliveryNumber";
/** @deprecated Deprecated! So use UNCAP_PROP_NAME_LastModified. */
public static final String COLUMN_UNCAP_PROP_NAME_OF_LastModified = "lastModified";
/** @deprecated Deprecated! So use UNCAP_PROP_NAME_OrderStatusId. */
@@ -982,12 +1008,14 @@
public static final String COLUMN_UNCAP_PROP_NAME_OF_CurrencyId = "currencyId";
/** @deprecated Deprecated! So use UNCAP_PROP_NAME_CurrencyCode. */
public static final String COLUMN_UNCAP_PROP_NAME_OF_CurrencyCode = "currencyCode";
- /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryPrice. */
- public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryPrice = "deliveryPrice";
/** @deprecated Deprecated! So use UNCAP_PROP_NAME_SubTotalPrice. */
public static final String COLUMN_UNCAP_PROP_NAME_OF_SubTotalPrice = "subTotalPrice";
/** @deprecated Deprecated! So use UNCAP_PROP_NAME_Tax. */
public static final String COLUMN_UNCAP_PROP_NAME_OF_Tax = "tax";
+ /** @deprecated Deprecated! So use UNCAP_PROP_NAME_DeliveryPrice. */
+ public static final String COLUMN_UNCAP_PROP_NAME_OF_DeliveryPrice = "deliveryPrice";
+ /** @deprecated Deprecated! So use UNCAP_PROP_NAME_PaymentFee. */
+ public static final String COLUMN_UNCAP_PROP_NAME_OF_PaymentFee = "paymentFee";
/** @deprecated Deprecated! So use UNCAP_PROP_NAME_TotalPrice. */
public static final String COLUMN_UNCAP_PROP_NAME_OF_TotalPrice = "totalPrice";
@@ -1123,15 +1151,17 @@
map.put(DB_NAME_ORDER_CARD_INFO_ID.toLowerCase(), PROPERTY_NAME_orderCardInfoId);
map.put(DB_NAME_DELIVERY_METHOD_ID.toLowerCase(), PROPERTY_NAME_deliveryMethodId);
map.put(DB_NAME_DELIVERY_METHOD_CODE.toLowerCase(), PROPERTY_NAME_deliveryMethodCode);
+ map.put(DB_NAME_DELIVERY_NUMBER.toLowerCase(), PROPERTY_NAME_deliveryNumber);
map.put(DB_NAME_LAST_MODIFIED.toLowerCase(), PROPERTY_NAME_lastModified);
map.put(DB_NAME_ORDER_STATUS_ID.toLowerCase(), PROPERTY_NAME_orderStatusId);
map.put(DB_NAME_PURCHASED_DATE.toLowerCase(), PROPERTY_NAME_purchasedDate);
map.put(DB_NAME_FINISHED_DATE.toLowerCase(), PROPERTY_NAME_finishedDate);
map.put(DB_NAME_CURRENCY_ID.toLowerCase(), PROPERTY_NAME_currencyId);
map.put(DB_NAME_CURRENCY_CODE.toLowerCase(), PROPERTY_NAME_currencyCode);
- map.put(DB_NAME_DELIVERY_PRICE.toLowerCase(), PROPERTY_NAME_deliveryPrice);
map.put(DB_NAME_SUB_TOTAL_PRICE.toLowerCase(), PROPERTY_NAME_subTotalPrice);
map.put(DB_NAME_TAX.toLowerCase(), PROPERTY_NAME_tax);
+ map.put(DB_NAME_DELIVERY_PRICE.toLowerCase(), PROPERTY_NAME_deliveryPrice);
+ map.put(DB_NAME_PAYMENT_FEE.toLowerCase(), PROPERTY_NAME_paymentFee);
map.put(DB_NAME_TOTAL_PRICE.toLowerCase(), PROPERTY_NAME_totalPrice);
_dbNamePropertyNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map);
@@ -1200,15 +1230,17 @@
map.put(PROPERTY_NAME_orderCardInfoId.toLowerCase(), DB_NAME_ORDER_CARD_INFO_ID);
map.put(PROPERTY_NAME_deliveryMethodId.toLowerCase(), DB_NAME_DELIVERY_METHOD_ID);
map.put(PROPERTY_NAME_deliveryMethodCode.toLowerCase(), DB_NAME_DELIVERY_METHOD_CODE);
+ map.put(PROPERTY_NAME_deliveryNumber.toLowerCase(), DB_NAME_DELIVERY_NUMBER);
map.put(PROPERTY_NAME_lastModified.toLowerCase(), DB_NAME_LAST_MODIFIED);
map.put(PROPERTY_NAME_orderStatusId.toLowerCase(), DB_NAME_ORDER_STATUS_ID);
map.put(PROPERTY_NAME_purchasedDate.toLowerCase(), DB_NAME_PURCHASED_DATE);
map.put(PROPERTY_NAME_finishedDate.toLowerCase(), DB_NAME_FINISHED_DATE);
map.put(PROPERTY_NAME_currencyId.toLowerCase(), DB_NAME_CURRENCY_ID);
map.put(PROPERTY_NAME_currencyCode.toLowerCase(), DB_NAME_CURRENCY_CODE);
- map.put(PROPERTY_NAME_deliveryPrice.toLowerCase(), DB_NAME_DELIVERY_PRICE);
map.put(PROPERTY_NAME_subTotalPrice.toLowerCase(), DB_NAME_SUB_TOTAL_PRICE);
map.put(PROPERTY_NAME_tax.toLowerCase(), DB_NAME_TAX);
+ map.put(PROPERTY_NAME_deliveryPrice.toLowerCase(), DB_NAME_DELIVERY_PRICE);
+ map.put(PROPERTY_NAME_paymentFee.toLowerCase(), DB_NAME_PAYMENT_FEE);
map.put(PROPERTY_NAME_totalPrice.toLowerCase(), DB_NAME_TOTAL_PRICE);
_propertyNameDbNameKeyToLowerMap = java.util.Collections.unmodifiableMap(map);
@@ -1279,15 +1311,17 @@
map.put(DB_NAME_ORDER_CARD_INFO_ID, CAP_PROP_NAME_OrderCardInfoId);
map.put(DB_NAME_DELIVERY_METHOD_ID, CAP_PROP_NAME_DeliveryMethodId);
map.put(DB_NAME_DELIVERY_METHOD_CODE, CAP_PROP_NAME_DeliveryMethodCode);
+ map.put(DB_NAME_DELIVERY_NUMBER, CAP_PROP_NAME_DeliveryNumber);
map.put(DB_NAME_LAST_MODIFIED, CAP_PROP_NAME_LastModified);
map.put(DB_NAME_ORDER_STATUS_ID, CAP_PROP_NAME_OrderStatusId);
map.put(DB_NAME_PURCHASED_DATE, CAP_PROP_NAME_PurchasedDate);
map.put(DB_NAME_FINISHED_DATE, CAP_PROP_NAME_FinishedDate);
map.put(DB_NAME_CURRENCY_ID, CAP_PROP_NAME_CurrencyId);
map.put(DB_NAME_CURRENCY_CODE, CAP_PROP_NAME_CurrencyCode);
- map.put(DB_NAME_DELIVERY_PRICE, CAP_PROP_NAME_DeliveryPrice);
map.put(DB_NAME_SUB_TOTAL_PRICE, CAP_PROP_NAME_SubTotalPrice);
map.put(DB_NAME_TAX, CAP_PROP_NAME_Tax);
+ map.put(DB_NAME_DELIVERY_PRICE, CAP_PROP_NAME_DeliveryPrice);
+ map.put(DB_NAME_PAYMENT_FEE, CAP_PROP_NAME_PaymentFee);
map.put(DB_NAME_TOTAL_PRICE, CAP_PROP_NAME_TotalPrice);
_dbNameCapPropNameMap = java.util.Collections.unmodifiableMap(map);
@@ -1358,15 +1392,17 @@
map.put(DB_NAME_ORDER_CARD_INFO_ID, UNCAP_PROP_NAME_orderCardInfoId);
map.put(DB_NAME_DELIVERY_METHOD_ID, UNCAP_PROP_NAME_deliveryMethodId);
map.put(DB_NAME_DELIVERY_METHOD_CODE, UNCAP_PROP_NAME_deliveryMethodCode);
+ map.put(DB_NAME_DELIVERY_NUMBER, UNCAP_PROP_NAME_deliveryNumber);
map.put(DB_NAME_LAST_MODIFIED, UNCAP_PROP_NAME_lastModified);
map.put(DB_NAME_ORDER_STATUS_ID, UNCAP_PROP_NAME_orderStatusId);
map.put(DB_NAME_PURCHASED_DATE, UNCAP_PROP_NAME_purchasedDate);
map.put(DB_NAME_FINISHED_DATE, UNCAP_PROP_NAME_finishedDate);
map.put(DB_NAME_CURRENCY_ID, UNCAP_PROP_NAME_currencyId);
map.put(DB_NAME_CURRENCY_CODE, UNCAP_PROP_NAME_currencyCode);
- map.put(DB_NAME_DELIVERY_PRICE, UNCAP_PROP_NAME_deliveryPrice);
map.put(DB_NAME_SUB_TOTAL_PRICE, UNCAP_PROP_NAME_subTotalPrice);
map.put(DB_NAME_TAX, UNCAP_PROP_NAME_tax);
+ map.put(DB_NAME_DELIVERY_PRICE, UNCAP_PROP_NAME_deliveryPrice);
+ map.put(DB_NAME_PAYMENT_FEE, UNCAP_PROP_NAME_paymentFee);
map.put(DB_NAME_TOTAL_PRICE, UNCAP_PROP_NAME_totalPrice);
_dbNameUncapPropNameMap = java.util.Collections.unmodifiableMap(map);
@@ -1437,15 +1473,17 @@
map.put(CAP_PROP_NAME_OrderCardInfoId, DB_NAME_ORDER_CARD_INFO_ID);
map.put(CAP_PROP_NAME_DeliveryMethodId, DB_NAME_DELIVERY_METHOD_ID);
map.put(CAP_PROP_NAME_DeliveryMethodCode, DB_NAME_DELIVERY_METHOD_CODE);
+ map.put(CAP_PROP_NAME_DeliveryNumber, DB_NAME_DELIVERY_NUMBER);
map.put(CAP_PROP_NAME_LastModified, DB_NAME_LAST_MODIFIED);
map.put(CAP_PROP_NAME_OrderStatusId, DB_NAME_ORDER_STATUS_ID);
map.put(CAP_PROP_NAME_PurchasedDate, DB_NAME_PURCHASED_DATE);
map.put(CAP_PROP_NAME_FinishedDate, DB_NAME_FINISHED_DATE);
map.put(CAP_PROP_NAME_CurrencyId, DB_NAME_CURRENCY_ID);
map.put(CAP_PROP_NAME_CurrencyCode, DB_NAME_CURRENCY_CODE);
- map.put(CAP_PROP_NAME_DeliveryPrice, DB_NAME_DELIVERY_PRICE);
map.put(CAP_PROP_NAME_SubTotalPrice, DB_NAME_SUB_TOTAL_PRICE);
map.put(CAP_PROP_NAME_Tax, DB_NAME_TAX);
+ map.put(CAP_PROP_NAME_DeliveryPrice, DB_NAME_DELIVERY_PRICE);
+ map.put(CAP_PROP_NAME_PaymentFee, DB_NAME_PAYMENT_FEE);
map.put(CAP_PROP_NAME_TotalPrice, DB_NAME_TOTAL_PRICE);
_capPropNameDbNameMap = java.util.Collections.unmodifiableMap(map);
@@ -1516,15 +1554,17 @@
map.put(CAP_PROP_NAME_OrderCardInfoId, UNCAP_PROP_NAME_orderCardInfoId);
map.put(CAP_PROP_NAME_DeliveryMethodId, UNCAP_PROP_NAME_deliveryMethodId);
map.put(CAP_PROP_NAME_DeliveryMethodCode, UNCAP_PROP_NAME_deliveryMethodCode);
+ map.put(CAP_PROP_NAME_DeliveryNumber, UNCAP_PROP_NAME_deliveryNumber);
map.put(CAP_PROP_NAME_LastModified, UNCAP_PROP_NAME_lastModified);
map.put(CAP_PROP_NAME_OrderStatusId, UNCAP_PROP_NAME_orderStatusId);
map.put(CAP_PROP_NAME_PurchasedDate, UNCAP_PROP_NAME_purchasedDate);
map.put(CAP_PROP_NAME_FinishedDate, UNCAP_PROP_NAME_finishedDate);
map.put(CAP_PROP_NAME_CurrencyId, UNCAP_PROP_NAME_currencyId);
map.put(CAP_PROP_NAME_CurrencyCode, UNCAP_PROP_NAME_currencyCode);
- map.put(CAP_PROP_NAME_DeliveryPrice, UNCAP_PROP_NAME_deliveryPrice);
map.put(CAP_PROP_NAME_SubTotalPrice, UNCAP_PROP_NAME_subTotalPrice);
map.put(CAP_PROP_NAME_Tax, UNCAP_PROP_NAME_tax);
+ map.put(CAP_PROP_NAME_DeliveryPrice, UNCAP_PROP_NAME_deliveryPrice);
+ map.put(CAP_PROP_NAME_PaymentFee, UNCAP_PROP_NAME_paymentFee);
map.put(CAP_PROP_NAME_TotalPrice, UNCAP_PROP_NAME_totalPrice);
_capPropNameUncapPropNameMap = java.util.Collections.unmodifiableMap(map);
@@ -1595,15 +1635,17 @@
map.put(UNCAP_PROP_NAME_orderCardInfoId, DB_NAME_ORDER_CARD_INFO_ID);
map.put(UNCAP_PROP_NAME_deliveryMethodId, DB_NAME_DELIVERY_METHOD_ID);
map.put(UNCAP_PROP_NAME_deliveryMethodCode, DB_NAME_DELIVERY_METHOD_CODE);
+ map.put(UNCAP_PROP_NAME_deliveryNumber, DB_NAME_DELIVERY_NUMBER);
map.put(UNCAP_PROP_NAME_lastModified, DB_NAME_LAST_MODIFIED);
map.put(UNCAP_PROP_NAME_orderStatusId, DB_NAME_ORDER_STATUS_ID);
map.put(UNCAP_PROP_NAME_purchasedDate, DB_NAME_PURCHASED_DATE);
map.put(UNCAP_PROP_NAME_finishedDate, DB_NAME_FINISHED_DATE);
map.put(UNCAP_PROP_NAME_currencyId, DB_NAME_CURRENCY_ID);
map.put(UNCAP_PROP_NAME_currencyCode, DB_NAME_CURRENCY_CODE);
- map.put(UNCAP_PROP_NAME_deliveryPrice, DB_NAME_DELIVERY_PRICE);
map.put(UNCAP_PROP_NAME_subTotalPrice, DB_NAME_SUB_TOTAL_PRICE);
map.put(UNCAP_PROP_NAME_tax, DB_NAME_TAX);
+ map.put(UNCAP_PROP_NAME_deliveryPrice, DB_NAME_DELIVERY_PRICE);
+ map.put(UNCAP_PROP_NAME_paymentFee, DB_NAME_PAYMENT_FEE);
map.put(UNCAP_PROP_NAME_totalPrice, DB_NAME_TOTAL_PRICE);
_uncapPropNameDbNameMap = java.util.Collections.unmodifiableMap(map);
@@ -1674,15 +1716,17 @@
map.put(UNCAP_PROP_NAME_orderCardInfoId, CAP_PROP_NAME_OrderCardInfoId);
map.put(UNCAP_PROP_NAME_deliveryMethodId, CAP_PROP_NAME_DeliveryMethodId);
map.put(UNCAP_PROP_NAME_deliveryMethodCode, CAP_PROP_NAME_DeliveryMethodCode);
+ map.put(UNCAP_PROP_NAME_deliveryNumber, CAP_PROP_NAME_DeliveryNumber);
map.put(UNCAP_PROP_NAME_lastModified, CAP_PROP_NAME_LastModified);
map.put(UNCAP_PROP_NAME_orderStatusId, CAP_PROP_NAME_OrderStatusId);
map.put(UNCAP_PROP_NAME_purchasedDate, CAP_PROP_NAME_PurchasedDate);
map.put(UNCAP_PROP_NAME_finishedDate, CAP_PROP_NAME_FinishedDate);
map.put(UNCAP_PROP_NAME_currencyId, CAP_PROP_NAME_CurrencyId);
map.put(UNCAP_PROP_NAME_currencyCode, CAP_PROP_NAME_CurrencyCode);
- map.put(UNCAP_PROP_NAME_deliveryPrice, CAP_PROP_NAME_DeliveryPrice);
map.put(UNCAP_PROP_NAME_subTotalPrice, CAP_PROP_NAME_SubTotalPrice);
map.put(UNCAP_PROP_NAME_tax, CAP_PROP_NAME_Tax);
+ map.put(UNCAP_PROP_NAME_deliveryPrice, CAP_PROP_NAME_DeliveryPrice);
+ map.put(UNCAP_PROP_NAME_paymentFee, CAP_PROP_NAME_PaymentFee);
map.put(UNCAP_PROP_NAME_totalPrice, CAP_PROP_NAME_TotalPrice);
_uncapPropNameCapPropNameMap = java.util.Collections.unmodifiableMap(map);
@@ -1945,15 +1989,17 @@
columnInfoList.add(columnOrderCardInfoId());
columnInfoList.add(columnDeliveryMethodId());
columnInfoList.add(columnDeliveryMethodCode());
+ columnInfoList.add(columnDeliveryNumber());
columnInfoList.add(columnLastModified());
columnInfoList.add(columnOrderStatusId());
columnInfoList.add(columnPurchasedDate());
columnInfoList.add(columnFinishedDate());
columnInfoList.add(columnCurrencyId());
columnInfoList.add(columnCurrencyCode());
- columnInfoList.add(columnDeliveryPrice());
columnInfoList.add(columnSubTotalPrice());
columnInfoList.add(columnTax());
+ columnInfoList.add(columnDeliveryPrice());
+ columnInfoList.add(columnPaymentFee());
columnInfoList.add(columnTotalPrice());
return columnInfoList;
}
@@ -2010,7 +2056,7 @@
* @deprecated Please use getColumnInfoList()
*/
public String getColumnDbNameCommaString() {
- return "ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE";
+ return "ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, DELIVERY_NUMBER, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE";
}
/**
@@ -2332,6 +2378,12 @@
return new ColumnInfo(this, "DELIVERY_METHOD_CODE", "deliveryMethodCode", String.class, false);
}
/**
+ * @return Column information of deliveryNumber. (NotNull)
+ */
+ public ColumnInfo columnDeliveryNumber() {
+ return new ColumnInfo(this, "DELIVERY_NUMBER", "deliveryNumber", String.class, false);
+ }
+ /**
* @return Column information of lastModified. (NotNull)
*/
public ColumnInfo columnLastModified() {
@@ -2368,12 +2420,6 @@
return new ColumnInfo(this, "CURRENCY_CODE", "currencyCode", String.class, false);
}
/**
- * @return Column information of deliveryPrice. (NotNull)
- */
- public ColumnInfo columnDeliveryPrice() {
- return new ColumnInfo(this, "DELIVERY_PRICE", "deliveryPrice", java.math.BigDecimal.class, false);
- }
- /**
* @return Column information of subTotalPrice. (NotNull)
*/
public ColumnInfo columnSubTotalPrice() {
@@ -2386,6 +2432,18 @@
return new ColumnInfo(this, "TAX", "tax", java.math.BigDecimal.class, false);
}
/**
+ * @return Column information of deliveryPrice. (NotNull)
+ */
+ public ColumnInfo columnDeliveryPrice() {
+ return new ColumnInfo(this, "DELIVERY_PRICE", "deliveryPrice", java.math.BigDecimal.class, false);
+ }
+ /**
+ * @return Column information of paymentFee. (NotNull)
+ */
+ public ColumnInfo columnPaymentFee() {
+ return new ColumnInfo(this, "PAYMENT_FEE", "paymentFee", java.math.BigDecimal.class, false);
+ }
+ /**
* @return Column information of totalPrice. (NotNull)
*/
public ColumnInfo columnTotalPrice() {
@@ -2773,15 +2831,17 @@
public RelationTrace columnOrderCardInfoId() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnOrderCardInfoId()); }
public RelationTrace columnDeliveryMethodId() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryMethodId()); }
public RelationTrace columnDeliveryMethodCode() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryMethodCode()); }
+ public RelationTrace columnDeliveryNumber() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryNumber()); }
public RelationTrace columnLastModified() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnLastModified()); }
public RelationTrace columnOrderStatusId() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnOrderStatusId()); }
public RelationTrace columnPurchasedDate() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnPurchasedDate()); }
public RelationTrace columnFinishedDate() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnFinishedDate()); }
public RelationTrace columnCurrencyId() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCurrencyId()); }
public RelationTrace columnCurrencyCode() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnCurrencyCode()); }
- public RelationTrace columnDeliveryPrice() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryPrice()); }
public RelationTrace columnSubTotalPrice() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnSubTotalPrice()); }
public RelationTrace columnTax() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnTax()); }
+ public RelationTrace columnDeliveryPrice() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnDeliveryPrice()); }
+ public RelationTrace columnPaymentFee() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnPaymentFee()); }
public RelationTrace columnTotalPrice() { return fixTrace(_relationList, OrderFormDbm.getInstance().columnTotalPrice()); }
}
@@ -2906,15 +2966,17 @@
if (analyzer.init("ORDER_CARD_INFO_ID", "orderCardInfoId", "orderCardInfoId")) { myEntity.setOrderCardInfoId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
if (analyzer.init("DELIVERY_METHOD_ID", "deliveryMethodId", "deliveryMethodId")) { myEntity.setDeliveryMethodId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
if (analyzer.init("DELIVERY_METHOD_CODE", "deliveryMethodCode", "deliveryMethodCode")) { myEntity.setDeliveryMethodCode(analyzer.analyzeString(String.class)); };
+ if (analyzer.init("DELIVERY_NUMBER", "deliveryNumber", "deliveryNumber")) { myEntity.setDeliveryNumber(analyzer.analyzeString(String.class)); };
if (analyzer.init("LAST_MODIFIED", "lastModified", "lastModified")) { myEntity.setLastModified(analyzer.analyzeDate(java.sql.Timestamp.class)); };
if (analyzer.init("ORDER_STATUS_ID", "orderStatusId", "orderStatusId")) { myEntity.setOrderStatusId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
if (analyzer.init("PURCHASED_DATE", "purchasedDate", "purchasedDate")) { myEntity.setPurchasedDate(analyzer.analyzeDate(java.sql.Timestamp.class)); };
if (analyzer.init("FINISHED_DATE", "finishedDate", "finishedDate")) { myEntity.setFinishedDate(analyzer.analyzeDate(java.sql.Timestamp.class)); };
if (analyzer.init("CURRENCY_ID", "currencyId", "currencyId")) { myEntity.setCurrencyId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
if (analyzer.init("CURRENCY_CODE", "currencyCode", "currencyCode")) { myEntity.setCurrencyCode(analyzer.analyzeString(String.class)); };
- if (analyzer.init("DELIVERY_PRICE", "deliveryPrice", "deliveryPrice")) { myEntity.setDeliveryPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
if (analyzer.init("SUB_TOTAL_PRICE", "subTotalPrice", "subTotalPrice")) { myEntity.setSubTotalPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
if (analyzer.init("TAX", "tax", "tax")) { myEntity.setTax(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
+ if (analyzer.init("DELIVERY_PRICE", "deliveryPrice", "deliveryPrice")) { myEntity.setDeliveryPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
+ if (analyzer.init("PAYMENT_FEE", "paymentFee", "paymentFee")) { myEntity.setPaymentFee(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
if (analyzer.init("TOTAL_PRICE", "totalPrice", "totalPrice")) { myEntity.setTotalPrice(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
}
@@ -3041,15 +3103,17 @@
helpAppendingColumnValueString(sb, delimiter, equal, "ORDER_CARD_INFO_ID", myEntity.getOrderCardInfoId());
helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_METHOD_ID", myEntity.getDeliveryMethodId());
helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_METHOD_CODE", myEntity.getDeliveryMethodCode());
+ helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_NUMBER", myEntity.getDeliveryNumber());
helpAppendingColumnValueString(sb, delimiter, equal, "LAST_MODIFIED", myEntity.getLastModified());
helpAppendingColumnValueString(sb, delimiter, equal, "ORDER_STATUS_ID", myEntity.getOrderStatusId());
helpAppendingColumnValueString(sb, delimiter, equal, "PURCHASED_DATE", myEntity.getPurchasedDate());
helpAppendingColumnValueString(sb, delimiter, equal, "FINISHED_DATE", myEntity.getFinishedDate());
helpAppendingColumnValueString(sb, delimiter, equal, "CURRENCY_ID", myEntity.getCurrencyId());
helpAppendingColumnValueString(sb, delimiter, equal, "CURRENCY_CODE", myEntity.getCurrencyCode());
- helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_PRICE", myEntity.getDeliveryPrice());
helpAppendingColumnValueString(sb, delimiter, equal, "SUB_TOTAL_PRICE", myEntity.getSubTotalPrice());
helpAppendingColumnValueString(sb, delimiter, equal, "TAX", myEntity.getTax());
+ helpAppendingColumnValueString(sb, delimiter, equal, "DELIVERY_PRICE", myEntity.getDeliveryPrice());
+ helpAppendingColumnValueString(sb, delimiter, equal, "PAYMENT_FEE", myEntity.getPaymentFee());
helpAppendingColumnValueString(sb, delimiter, equal, "TOTAL_PRICE", myEntity.getTotalPrice());
sb.delete(0, delimiter.length()).insert(0, mapMarkAndStartBrace).append(endBrace);
@@ -3158,15 +3222,17 @@
valueMap.put("ORDER_CARD_INFO_ID", myEntity.getOrderCardInfoId());
valueMap.put("DELIVERY_METHOD_ID", myEntity.getDeliveryMethodId());
valueMap.put("DELIVERY_METHOD_CODE", myEntity.getDeliveryMethodCode());
+ valueMap.put("DELIVERY_NUMBER", myEntity.getDeliveryNumber());
valueMap.put("LAST_MODIFIED", myEntity.getLastModified());
valueMap.put("ORDER_STATUS_ID", myEntity.getOrderStatusId());
valueMap.put("PURCHASED_DATE", myEntity.getPurchasedDate());
valueMap.put("FINISHED_DATE", myEntity.getFinishedDate());
valueMap.put("CURRENCY_ID", myEntity.getCurrencyId());
valueMap.put("CURRENCY_CODE", myEntity.getCurrencyCode());
- valueMap.put("DELIVERY_PRICE", myEntity.getDeliveryPrice());
valueMap.put("SUB_TOTAL_PRICE", myEntity.getSubTotalPrice());
valueMap.put("TAX", myEntity.getTax());
+ valueMap.put("DELIVERY_PRICE", myEntity.getDeliveryPrice());
+ valueMap.put("PAYMENT_FEE", myEntity.getPaymentFee());
valueMap.put("TOTAL_PRICE", myEntity.getTotalPrice());
return valueMap;
}
@@ -3243,15 +3309,17 @@
valueMap.put("ORDER_CARD_INFO_ID", helpGettingColumnStringValue(myEntity.getOrderCardInfoId()));
valueMap.put("DELIVERY_METHOD_ID", helpGettingColumnStringValue(myEntity.getDeliveryMethodId()));
valueMap.put("DELIVERY_METHOD_CODE", helpGettingColumnStringValue(myEntity.getDeliveryMethodCode()));
+ valueMap.put("DELIVERY_NUMBER", helpGettingColumnStringValue(myEntity.getDeliveryNumber()));
valueMap.put("LAST_MODIFIED", helpGettingColumnStringValue(myEntity.getLastModified()));
valueMap.put("ORDER_STATUS_ID", helpGettingColumnStringValue(myEntity.getOrderStatusId()));
valueMap.put("PURCHASED_DATE", helpGettingColumnStringValue(myEntity.getPurchasedDate()));
valueMap.put("FINISHED_DATE", helpGettingColumnStringValue(myEntity.getFinishedDate()));
valueMap.put("CURRENCY_ID", helpGettingColumnStringValue(myEntity.getCurrencyId()));
valueMap.put("CURRENCY_CODE", helpGettingColumnStringValue(myEntity.getCurrencyCode()));
- valueMap.put("DELIVERY_PRICE", helpGettingColumnStringValue(myEntity.getDeliveryPrice()));
valueMap.put("SUB_TOTAL_PRICE", helpGettingColumnStringValue(myEntity.getSubTotalPrice()));
valueMap.put("TAX", helpGettingColumnStringValue(myEntity.getTax()));
+ valueMap.put("DELIVERY_PRICE", helpGettingColumnStringValue(myEntity.getDeliveryPrice()));
+ valueMap.put("PAYMENT_FEE", helpGettingColumnStringValue(myEntity.getPaymentFee()));
valueMap.put("TOTAL_PRICE", helpGettingColumnStringValue(myEntity.getTotalPrice()));
return valueMap;
}
@@ -3277,9 +3345,9 @@
public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) {
if (preparedInsertClauseOption.getTablePrefix() != null) {
final String tablePrefix = preparedInsertClauseOption.getTablePrefix();
- return "insert into " + tablePrefix + "ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
+ return "insert into " + tablePrefix + "ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, DELIVERY_NUMBER, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
}
- return "insert into ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, DELIVERY_PRICE, SUB_TOTAL_PRICE, TAX, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
+ return "insert into ORDER_FORM(ORDER_FORM_ID, ORDER_FORM_NUMBER, CUSTOMER_ID, CUSTOMER_GENDER, CUSTOMER_FIRSTNAME, CUSTOMER_LASTNAME, CUSTOMER_FIRSTNAME_DESCRIPTION, CUSTOMER_LASTNAME_DESCRIPTION, CUSTOMER_DAY_OF_BIRTH, CUSTOMER_EMAIL_ADDRESS, CUSTOMER_COMPANY, CUSTOMER_DEPARTMENT, CUSTOMER_STREET_ADDRESS, CUSTOMER_SUBURB, CUSTOMER_CITY, CUSTOMER_STATE, CUSTOMER_POSTCODE, CUSTOMER_COUNTRY_NAME, CUSTOMER_TELEPHONE, CUSTOMER_LOCALE_NAME, DELIVERY_COMPANY, DELIVERY_DEPARTMENT, DELIVERY_FIRSTNAME, DELIVERY_LASTNAME, DELIVERY_FIRSTNAME_DESCRIPTION, DELIVERY_LASTNAME_DESCRIPTION, DELIVERY_STREET_ADDRESS, DELIVERY_SUBURB, DELIVERY_CITY, DELIVERY_STATE, DELIVERY_POSTCODE, DELIVERY_COUNTRY_NAME, DELIVERY_TELEPHONE, DELIVERY_LOCALE_NAME, BILLING_COMPANY, BILLING_DEPARTMENT, BILLING_FIRSTNAME, BILLING_LASTNAME, BILLING_FIRSTNAME_DESCRIPTION, BILLING_LASTNAME_DESCRIPTION, BILLING_STREET_ADDRESS, BILLING_SUBURB, BILLING_CITY, BILLING_STATE, BILLING_POSTCODE, BILLING_COUNTRY_NAME, BILLING_TELEPHONE, BILLING_LOCALE_NAME, PAYMENT_METHOD_ID, PAYMENT_METHOD_CODE, ORDER_CARD_INFO_ID, DELIVERY_METHOD_ID, DELIVERY_METHOD_CODE, DELIVERY_NUMBER, LAST_MODIFIED, ORDER_STATUS_ID, PURCHASED_DATE, FINISHED_DATE, CURRENCY_ID, CURRENCY_CODE, SUB_TOTAL_PRICE, TAX, DELIVERY_PRICE, PAYMENT_FEE, TOTAL_PRICE) values(? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? , ? )";
}
// ===================================================================================
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDbm.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDbm.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/bsentity/dbmeta/PaymentMethodDbm.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -16,7 +16,7 @@
* PAYMENT_METHOD_ID
*
* [column-property]
- * PAYMENT_METHOD_ID, CODE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED
+ * PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED
*
* [foreign-property]
*
@@ -97,6 +97,8 @@
public static final String DB_NAME_PAYMENT_METHOD_ID = "PAYMENT_METHOD_ID";
/** Db-name of CODE. VARCHAR(16) : NotNull */
public static final String DB_NAME_CODE = "CODE";
+ /** Db-name of FEE. DECIMAL(14) : NotNull */
+ public static final String DB_NAME_FEE = "FEE";
/** Db-name of SORT_ORDER. INTEGER : NotNull */
public static final String DB_NAME_SORT_ORDER = "SORT_ORDER";
/** Db-name of DATE_ADDED. TIMESTAMP : NotNull */
@@ -108,6 +110,8 @@
public static final String COLUMN_DB_NAME_OF_PaymentMethodId = "PAYMENT_METHOD_ID";
/** @deprecated Deprecated! So use DB_NAME_Code. */
public static final String COLUMN_DB_NAME_OF_Code = "CODE";
+ /** @deprecated Deprecated! So use DB_NAME_Fee. */
+ public static final String COLUMN_DB_NAME_OF_Fee = "FEE";
/** @deprecated Deprecated! So use DB_NAME_SortOrder. */
public static final String COLUMN_DB_NAME_OF_SortOrder = "SORT_ORDER";
/** @deprecated Deprecated! So use DB_NAME_DateAdded. */
@@ -122,6 +126,8 @@
public static final String PROPERTY_NAME_paymentMethodId = "paymentMethodId";
/** Prop-name(JavaBeansRule) of code. VARCHAR(16) : NotNull */
public static final String PROPERTY_NAME_code = "code";
+ /** Prop-name(JavaBeansRule) of fee. DECIMAL(14) : NotNull */
+ public static final String PROPERTY_NAME_fee = "fee";
/** Prop-name(JavaBeansRule) of sortOrder. INTEGER : NotNull */
public static final String PROPERTY_NAME_sortOrder = "sortOrder";
/** Prop-name(JavaBeansRule) of dateAdded. TIMESTAMP : NotNull */
@@ -136,6 +142,8 @@
public static final String CAP_PROP_NAME_PaymentMethodId = "PaymentMethodId";
/** Cap-prop-name of code. VARCHAR(16) : NotNull */
public static final String CAP_PROP_NAME_Code = "Code";
+ /** Cap-prop-name of fee. DECIMAL(14) : NotNull */
+ public static final String CAP_PROP_NAME_Fee = "Fee";
/** Cap-prop-name of sortOrder. INTEGER : NotNull */
public static final String CAP_PROP_NAME_SortOrder = "SortOrder";
/** Cap-prop-name of dateAdded. TIMESTAMP : NotNull */
@@ -147,6 +155,8 @@
public static final String COLUMN_CAP_PROP_NAME_OF_PaymentMethodId = "PaymentMethodId";
/** @deprecated Deprecated! So use CAP_PROP_NAME_Code. */
public static final String COLUMN_CAP_PROP_NAME_OF_Code = "Code";
+ /** @deprecated Deprecated! So use CAP_PROP_NAME_Fee. */
+ public static final String COLUMN_CAP_PROP_NAME_OF_Fee = "Fee";
/** @deprecated Deprecated! So use CAP_PROP_NAME_SortOrder. */
public static final String COLUMN_CAP_PROP_NAME_OF_SortOrder = "SortOrder";
/** @deprecated Deprecated! So use CAP_PROP_NAME_DateAdded. */
@@ -161,6 +171,8 @@
public static final String UNCAP_PROP_NAME_paymentMethodId = "paymentMethodId";
/** Uncap-prop-name of code. VARCHAR(16) : NotNull */
public static final String UNCAP_PROP_NAME_code = "code";
+ /** Uncap-prop-name of fee. DECIMAL(14) : NotNull */
+ public static final String UNCAP_PROP_NAME_fee = "fee";
/** Uncap-prop-name of sortOrder. INTEGER : NotNull */
public static final String UNCAP_PROP_NAME_sortOrder = "sortOrder";
/** Uncap-prop-name of dateAdded. TIMESTAMP : NotNull */
@@ -172,6 +184,8 @@
public static final String COLUMN_UNCAP_PROP_NAME_OF_PaymentMethodId = "paymentMethodId";
/** @deprecated Deprecated! So use UNCAP_PROP_NAME_Code. */
public static final String COLUMN_UNCAP_PROP_NAME_OF_Code = "code";
+ /** @deprecated Deprecated! So use UNCAP_PROP_NAME_Fee. */
+ public static final String COLUMN_UNCAP_PROP_NAME_OF_Fee = "fee";
/** @deprecated Deprecated! So use UNCAP_PROP_NAME_SortOrder. */
public static final String COLUMN_UNCAP_PROP_NAME_OF_SortOrder = "sortOrder";
/** @deprecated Deprecated! So use UNCAP_PROP_NAME_DateAdded. */
@@ -212,6 +226,7 @@
map.put(DB_NAME_PAYMENT_METHOD_ID.toLowerCase(), PROPERTY_NAME_paymentMethodId);
map.put(DB_NAME_CODE.toLowerCase(), PROPERTY_NAME_code);
+ map.put(DB_NAME_FEE.toLowerCase(), PROPERTY_NAME_fee);
map.put(DB_NAME_SORT_ORDER.toLowerCase(), PROPERTY_NAME_sortOrder);
map.put(DB_NAME_DATE_ADDED.toLowerCase(), PROPERTY_NAME_dateAdded);
map.put(DB_NAME_LAST_MODIFIED.toLowerCase(), PROPERTY_NAME_lastModified);
@@ -231,6 +246,7 @@
map.put(PROPERTY_NAME_paymentMethodId.toLowerCase(), DB_NAME_PAYMENT_METHOD_ID);
map.put(PROPERTY_NAME_code.toLowerCase(), DB_NAME_CODE);
+ map.put(PROPERTY_NAME_fee.toLowerCase(), DB_NAME_FEE);
map.put(PROPERTY_NAME_sortOrder.toLowerCase(), DB_NAME_SORT_ORDER);
map.put(PROPERTY_NAME_dateAdded.toLowerCase(), DB_NAME_DATE_ADDED);
map.put(PROPERTY_NAME_lastModified.toLowerCase(), DB_NAME_LAST_MODIFIED);
@@ -252,6 +268,7 @@
map.put(DB_NAME_PAYMENT_METHOD_ID, CAP_PROP_NAME_PaymentMethodId);
map.put(DB_NAME_CODE, CAP_PROP_NAME_Code);
+ map.put(DB_NAME_FEE, CAP_PROP_NAME_Fee);
map.put(DB_NAME_SORT_ORDER, CAP_PROP_NAME_SortOrder);
map.put(DB_NAME_DATE_ADDED, CAP_PROP_NAME_DateAdded);
map.put(DB_NAME_LAST_MODIFIED, CAP_PROP_NAME_LastModified);
@@ -273,6 +290,7 @@
map.put(DB_NAME_PAYMENT_METHOD_ID, UNCAP_PROP_NAME_paymentMethodId);
map.put(DB_NAME_CODE, UNCAP_PROP_NAME_code);
+ map.put(DB_NAME_FEE, UNCAP_PROP_NAME_fee);
map.put(DB_NAME_SORT_ORDER, UNCAP_PROP_NAME_sortOrder);
map.put(DB_NAME_DATE_ADDED, UNCAP_PROP_NAME_dateAdded);
map.put(DB_NAME_LAST_MODIFIED, UNCAP_PROP_NAME_lastModified);
@@ -294,6 +312,7 @@
map.put(CAP_PROP_NAME_PaymentMethodId, DB_NAME_PAYMENT_METHOD_ID);
map.put(CAP_PROP_NAME_Code, DB_NAME_CODE);
+ map.put(CAP_PROP_NAME_Fee, DB_NAME_FEE);
map.put(CAP_PROP_NAME_SortOrder, DB_NAME_SORT_ORDER);
map.put(CAP_PROP_NAME_DateAdded, DB_NAME_DATE_ADDED);
map.put(CAP_PROP_NAME_LastModified, DB_NAME_LAST_MODIFIED);
@@ -315,6 +334,7 @@
map.put(CAP_PROP_NAME_PaymentMethodId, UNCAP_PROP_NAME_paymentMethodId);
map.put(CAP_PROP_NAME_Code, UNCAP_PROP_NAME_code);
+ map.put(CAP_PROP_NAME_Fee, UNCAP_PROP_NAME_fee);
map.put(CAP_PROP_NAME_SortOrder, UNCAP_PROP_NAME_sortOrder);
map.put(CAP_PROP_NAME_DateAdded, UNCAP_PROP_NAME_dateAdded);
map.put(CAP_PROP_NAME_LastModified, UNCAP_PROP_NAME_lastModified);
@@ -336,6 +356,7 @@
map.put(UNCAP_PROP_NAME_paymentMethodId, DB_NAME_PAYMENT_METHOD_ID);
map.put(UNCAP_PROP_NAME_code, DB_NAME_CODE);
+ map.put(UNCAP_PROP_NAME_fee, DB_NAME_FEE);
map.put(UNCAP_PROP_NAME_sortOrder, DB_NAME_SORT_ORDER);
map.put(UNCAP_PROP_NAME_dateAdded, DB_NAME_DATE_ADDED);
map.put(UNCAP_PROP_NAME_lastModified, DB_NAME_LAST_MODIFIED);
@@ -357,6 +378,7 @@
map.put(UNCAP_PROP_NAME_paymentMethodId, CAP_PROP_NAME_PaymentMethodId);
map.put(UNCAP_PROP_NAME_code, CAP_PROP_NAME_Code);
+ map.put(UNCAP_PROP_NAME_fee, CAP_PROP_NAME_Fee);
map.put(UNCAP_PROP_NAME_sortOrder, CAP_PROP_NAME_SortOrder);
map.put(UNCAP_PROP_NAME_dateAdded, CAP_PROP_NAME_DateAdded);
map.put(UNCAP_PROP_NAME_lastModified, CAP_PROP_NAME_LastModified);
@@ -570,6 +592,7 @@
final java.util.List<ColumnInfo> columnInfoList = new java.util.ArrayList<ColumnInfo>();
columnInfoList.add(columnPaymentMethodId());
columnInfoList.add(columnCode());
+ columnInfoList.add(columnFee());
columnInfoList.add(columnSortOrder());
columnInfoList.add(columnDateAdded());
columnInfoList.add(columnLastModified());
@@ -628,7 +651,7 @@
* @deprecated Please use getColumnInfoList()
*/
public String getColumnDbNameCommaString() {
- return "PAYMENT_METHOD_ID, CODE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED";
+ return "PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED";
}
/**
@@ -644,6 +667,12 @@
return new ColumnInfo(this, "CODE", "code", String.class, false);
}
/**
+ * @return Column information of fee. (NotNull)
+ */
+ public ColumnInfo columnFee() {
+ return new ColumnInfo(this, "FEE", "fee", java.math.BigDecimal.class, false);
+ }
+ /**
* @return Column information of sortOrder. (NotNull)
*/
public ColumnInfo columnSortOrder() {
@@ -803,6 +832,7 @@
public RelationTrace columnPaymentMethodId() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnPaymentMethodId()); }
public RelationTrace columnCode() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnCode()); }
+ public RelationTrace columnFee() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnFee()); }
public RelationTrace columnSortOrder() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnSortOrder()); }
public RelationTrace columnDateAdded() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnDateAdded()); }
public RelationTrace columnLastModified() { return fixTrace(_relationList, PaymentMethodDbm.getInstance().columnLastModified()); }
@@ -878,6 +908,7 @@
if (analyzer.init("PAYMENT_METHOD_ID", "paymentMethodId", "paymentMethodId")) { myEntity.setPaymentMethodId(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
if (analyzer.init("CODE", "code", "code")) { myEntity.setCode(analyzer.analyzeString(String.class)); };
+ if (analyzer.init("FEE", "fee", "fee")) { myEntity.setFee(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
if (analyzer.init("SORT_ORDER", "sortOrder", "sortOrder")) { myEntity.setSortOrder(analyzer.analyzeNumber(java.math.BigDecimal.class)); };
if (analyzer.init("DATE_ADDED", "dateAdded", "dateAdded")) { myEntity.setDateAdded(analyzer.analyzeDate(java.sql.Timestamp.class)); };
if (analyzer.init("LAST_MODIFIED", "lastModified", "lastModified")) { myEntity.setLastModified(analyzer.analyzeDate(java.sql.Timestamp.class)); };
@@ -955,6 +986,7 @@
final StringBuffer sb = new StringBuffer();
helpAppendingColumnValueString(sb, delimiter, equal, "PAYMENT_METHOD_ID", myEntity.getPaymentMethodId());
helpAppendingColumnValueString(sb, delimiter, equal, "CODE", myEntity.getCode());
+ helpAppendingColumnValueString(sb, delimiter, equal, "FEE", myEntity.getFee());
helpAppendingColumnValueString(sb, delimiter, equal, "SORT_ORDER", myEntity.getSortOrder());
helpAppendingColumnValueString(sb, delimiter, equal, "DATE_ADDED", myEntity.getDateAdded());
helpAppendingColumnValueString(sb, delimiter, equal, "LAST_MODIFIED", myEntity.getLastModified());
@@ -1014,6 +1046,7 @@
final java.util.Map<String, Object> valueMap = new java.util.LinkedHashMap<String, Object>();
valueMap.put("PAYMENT_METHOD_ID", myEntity.getPaymentMethodId());
valueMap.put("CODE", myEntity.getCode());
+ valueMap.put("FEE", myEntity.getFee());
valueMap.put("SORT_ORDER", myEntity.getSortOrder());
valueMap.put("DATE_ADDED", myEntity.getDateAdded());
valueMap.put("LAST_MODIFIED", myEntity.getLastModified());
@@ -1041,6 +1074,7 @@
final java.util.Map<String, String> valueMap = new java.util.LinkedHashMap<String, String>();
valueMap.put("PAYMENT_METHOD_ID", helpGettingColumnStringValue(myEntity.getPaymentMethodId()));
valueMap.put("CODE", helpGettingColumnStringValue(myEntity.getCode()));
+ valueMap.put("FEE", helpGettingColumnStringValue(myEntity.getFee()));
valueMap.put("SORT_ORDER", helpGettingColumnStringValue(myEntity.getSortOrder()));
valueMap.put("DATE_ADDED", helpGettingColumnStringValue(myEntity.getDateAdded()));
valueMap.put("LAST_MODIFIED", helpGettingColumnStringValue(myEntity.getLastModified()));
@@ -1068,9 +1102,9 @@
public String getPreparedInsertClause(PreparedInsertClauseOption preparedInsertClauseOption) {
if (preparedInsertClauseOption.getTablePrefix() != null) {
final String tablePrefix = preparedInsertClauseOption.getTablePrefix();
- return "insert into " + tablePrefix + "PAYMENT_METHOD(PAYMENT_METHOD_ID, CODE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED) values(? , ? , ? , ? , ? )";
+ return "insert into " + tablePrefix + "PAYMENT_METHOD(PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED) values(? , ? , ? , ? , ? , ? )";
}
- return "insert into PAYMENT_METHOD(PAYMENT_METHOD_ID, CODE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED) values(? , ? , ? , ? , ? )";
+ return "insert into PAYMENT_METHOD(PAYMENT_METHOD_ID, CODE, FEE, SORT_ORDER, DATE_ADDED, LAST_MODIFIED) values(? , ? , ? , ? , ? , ? )";
}
// ===================================================================================
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsOrderFormCQ.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -8010,6 +8010,164 @@
abstract protected ConditionValue getCValueDeliveryMethodCode();
+ /** Column db name of deliveryNumber. */
+ protected static final String COL_DELIVERY_NUMBER = "DELIVERY_NUMBER";
+
+ /** Column java name of deliveryNumber. */
+ protected static final String J_DeliveryNumber = "DeliveryNumber";
+
+ /** Column uncapitalised java name of deliveryNumber. */
+ protected static final String UJ_deliveryNumber = "deliveryNumber";
+
+ /**
+ * Set the value of deliveryNumber using equal. { = }
+ * If the value is null or empty-string, this condition is ignored.
+ *
+ * @param deliveryNumber The value of deliveryNumber as equal.
+ */
+ public void setDeliveryNumber_Equal(String deliveryNumber) {
+ registerDeliveryNumber(ConditionKey.CK_EQUAL, filterRemoveEmptyString(deliveryNumber));
+ }
+
+ /**
+ * Set the value of deliveryNumber using notEqual. { != }
+ * If the value is null or empty-string, this condition is ignored.
+ *
+ * @param deliveryNumber The value of deliveryNumber as notEqual.
+ */
+ public void setDeliveryNumber_NotEqual(String deliveryNumber) {
+ registerDeliveryNumber(ConditionKey.CK_NOT_EQUAL, filterRemoveEmptyString(deliveryNumber));
+ }
+
+ /**
+ * Set the value of deliveryNumber using greaterThan. { > }
+ * If the value is null or empty-string, this condition is ignored.
+ *
+ * @param deliveryNumber The value of deliveryNumber as greaterThan.
+ */
+ public void setDeliveryNumber_GreaterThan(String deliveryNumber) {
+ registerDeliveryNumber(ConditionKey.CK_GREATER_THAN, filterRemoveEmptyString(deliveryNumber));
+ }
+
+ /**
+ * Set the value of deliveryNumber using lessThan. { < }
+ * If the value is null or empty-string, this condition is ignored.
+ *
+ * @param deliveryNumber The value of deliveryNumber as lessThan.
+ */
+ public void setDeliveryNumber_LessThan(String deliveryNumber) {
+ registerDeliveryNumber(ConditionKey.CK_LESS_THAN, filterRemoveEmptyString(deliveryNumber));
+ }
+
+ /**
+ * Set the value of deliveryNumber using greaterEqual. { >= }
+ * If the value is null or empty-string, this condition is ignored.
+ *
+ * @param deliveryNumber The value of deliveryNumber as greaterEqual.
+ */
+ public void setDeliveryNumber_GreaterEqual(String deliveryNumber) {
+ registerDeliveryNumber(ConditionKey.CK_GREATER_EQUAL, filterRemoveEmptyString(deliveryNumber));
+ }
+
+ /**
+ * Set the value of deliveryNumber using lessEqual. { <= }
+ * If the value is null or empty-string, this condition is ignored.
+ *
+ * @param deliveryNumber The value of deliveryNumber as lessEqual.
+ */
+ public void setDeliveryNumber_LessEqual(String deliveryNumber) {
+ registerDeliveryNumber(ConditionKey.CK_LESS_EQUAL, filterRemoveEmptyString(deliveryNumber));
+ }
+
+ /**
+ * Set the value of deliveryNumber using prefixSearch. { like 'xxx%' }
+ * If the value is null or empty-string, this condition is ignored.
+ *
+ * @param deliveryNumber The value of deliveryNumber as prefixSearch.
+ */
+ public void setDeliveryNumber_PrefixSearch(String deliveryNumber) {
+ registerDeliveryNumber(ConditionKey.CK_PREFIX_SEARCH, filterRemoveEmptyString(deliveryNumber));
+ }
+
+ /**
+ * Set the value of deliveryNumber using likeSearch. { like '%xxx%' }
+ * If the value is null or empty-string, this condition is ignored.
+ * You can invoke this method several times and the conditions are set up.
+ *
+ * @param deliveryNumber The value of deliveryNumber as likeSearch.
+ * @param likeSearchOption The option of like-search. (NotNull)
+ */
+ public void setDeliveryNumber_LikeSearch(String deliveryNumber, jp.sf.pal.pompei.allcommon.cbean.coption.LikeSearchOption likeSearchOption) {
+ registerLikeSearchQuery(ConditionKey.CK_LIKE_SEARCH, filterRemoveEmptyString(deliveryNumber), getCValueDeliveryNumber(), COL_DELIVERY_NUMBER, J_DeliveryNumber, UJ_deliveryNumber, likeSearchOption);
+ }
+
+ /**
+ * Set the value of deliveryNumber using inScope. { in ('a', 'b') }
+ * If the element in the list is null or empty-string, the condition-element is ignored.
+ *
+ * @param deliveryNumberList The value of deliveryNumber as inScope.
+ */
+ public void setDeliveryNumber_InScope(java.util.List<String> deliveryNumberList) {
+ registerDeliveryNumber(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyStringFromList(deliveryNumberList));
+ }
+
+ /**
+ * Set the value of deliveryNumber using inScope. { in ('a', 'b') }
+ * If the element in the list is null or empty-string, the condition-element is ignored.
+ *
+ * @param deliveryNumber The value of deliveryNumber as inScope.
+ * @param inScopeOption The option of in-scope. (NotNull)
+ */
+ public void setDeliveryNumber_InScope(String deliveryNumber, jp.sf.pal.pompei.allcommon.cbean.coption.InScopeOption inScopeOption) {
+ registerInScopeQuery(ConditionKey.CK_IN_SCOPE, filterRemoveEmptyString(deliveryNumber), getCValueDeliveryNumber(), COL_DELIVERY_NUMBER, J_DeliveryNumber, UJ_deliveryNumber, inScopeOption);
+ }
+
+ /**
+ * Set the value of deliveryNumber using notInScope. { not in ('a', 'b') }
+ * If the element in the list is null or empty-string, the condition-element is ignored.
+ *
+ * @param deliveryNumberList The value of deliveryNumber as notInScope.
+ */
+ public void setDeliveryNumber_NotInScope(java.util.List<String> deliveryNumberList) {
+ registerDeliveryNumber(ConditionKey.CK_NOT_IN_SCOPE, filterRemoveEmptyStringFromList(deliveryNumberList));
+ }
+
+ /**
+ * Set the value of deliveryNumber using isNull. { is null }
+ */
+ public void setDeliveryNumber_IsNull() {
+ registerDeliveryNumber(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+ }
+
+ /**
+ * Set the value of deliveryNumber using isNotNull. { is not null }
+ */
+ public void setDeliveryNumber_IsNotNull() {
+ registerDeliveryNumber(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+ }
+
+ /**
+ * Register condition of deliveryNumber.
+ *
+ * @param key Condition key. (NotNull)
+ * @param value The value of deliveryNumber. (Nullable)
+ */
+ protected void registerDeliveryNumber(ConditionKey key, Object value) {
+ registerQuery(key, value, getCValueDeliveryNumber(), COL_DELIVERY_NUMBER, J_DeliveryNumber, UJ_deliveryNumber);
+ }
+
+ /**
+ * Register inline condition of deliveryNumber.
+ *
+ * @param key Condition key. (NotNull)
+ * @param value The value of deliveryNumber. (Nullable)
+ */
+ protected void registerInlineDeliveryNumber(ConditionKey key, Object value) {
+ registerInlineQuery(key, value, getCValueDeliveryNumber(), COL_DELIVERY_NUMBER, J_DeliveryNumber, UJ_deliveryNumber);
+ }
+
+ abstract protected ConditionValue getCValueDeliveryNumber();
+
/** Column db name of lastModified. */
protected static final String COL_LAST_MODIFIED = "LAST_MODIFIED";
@@ -8714,125 +8872,6 @@
abstract protected ConditionValue getCValueCurrencyCode();
- /** Column db name of deliveryPrice. */
- protected static final String COL_DELIVERY_PRICE = "DELIVERY_PRICE";
-
- /** Column java name of deliveryPrice. */
- protected static final String J_DeliveryPrice = "DeliveryPrice";
-
- /** Column uncapitalised java name of deliveryPrice. */
- protected static final String UJ_deliveryPrice = "deliveryPrice";
-
- /**
- * Set the value of deliveryPrice using equal. { = }
- *
- * @param deliveryPrice The value of deliveryPrice as equal.
- */
- public void setDeliveryPrice_Equal(java.math.BigDecimal deliveryPrice) {
- registerDeliveryPrice(ConditionKey.CK_EQUAL, deliveryPrice);
- }
-
- /**
- * Set the value of deliveryPrice using notEqual. { != }
- *
- * @param deliveryPrice The value of deliveryPrice as notEqual.
- */
- public void setDeliveryPrice_NotEqual(java.math.BigDecimal deliveryPrice) {
- registerDeliveryPrice(ConditionKey.CK_NOT_EQUAL, deliveryPrice);
- }
-
- /**
- * Set the value of deliveryPrice using greaterThan. { > }
- *
- * @param deliveryPrice The value of deliveryPrice as greaterThan.
- */
- public void setDeliveryPrice_GreaterThan(java.math.BigDecimal deliveryPrice) {
- registerDeliveryPrice(ConditionKey.CK_GREATER_THAN, deliveryPrice);
- }
-
- /**
- * Set the value of deliveryPrice using lessThan. { < }
- *
- * @param deliveryPrice The value of deliveryPrice as lessThan.
- */
- public void setDeliveryPrice_LessThan(java.math.BigDecimal deliveryPrice) {
- registerDeliveryPrice(ConditionKey.CK_LESS_THAN, deliveryPrice);
- }
-
- /**
- * Set the value of deliveryPrice using greaterEqual. { >= }
- *
- * @param deliveryPrice The value of deliveryPrice as greaterEqual.
- */
- public void setDeliveryPrice_GreaterEqual(java.math.BigDecimal deliveryPrice) {
- registerDeliveryPrice(ConditionKey.CK_GREATER_EQUAL, deliveryPrice);
- }
-
- /**
- * Set the value of deliveryPrice using lessEqual. { <= }
- *
- * @param deliveryPrice The value of deliveryPrice as lessEqual.
- */
- public void setDeliveryPrice_LessEqual(java.math.BigDecimal deliveryPrice) {
- registerDeliveryPrice(ConditionKey.CK_LESS_EQUAL, deliveryPrice);
- }
-
- /**
- * Set the value of deliveryPrice using inScope. { in (a, b) }
- * If the element in the list is null or empty-string, the condition-element is ignored.
- *
- * @param deliveryPriceList The value of deliveryPrice as inScope.
- */
- public void setDeliveryPrice_InScope(java.util.List<java.math.BigDecimal> deliveryPriceList) {
- registerDeliveryPrice(ConditionKey.CK_IN_SCOPE, deliveryPriceList);
- }
-
- /**
- * Set the value of deliveryPrice using notInScope. { not in (a, b) }
- * If the element in the list is null or empty-string, the condition-element is ignored.
- *
- * @param deliveryPriceList The value of deliveryPrice as notInScope.
- */
- public void setDeliveryPrice_NotInScope(java.util.List<java.math.BigDecimal> deliveryPriceList) {
- registerDeliveryPrice(ConditionKey.CK_NOT_IN_SCOPE, deliveryPriceList);
- }
-
- /**
- * Set the value of deliveryPrice using isNull. { is null }
- */
- public void setDeliveryPrice_IsNull() {
- registerDeliveryPrice(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
- }
-
- /**
- * Set the value of deliveryPrice using isNotNull. { is not null }
- */
- public void setDeliveryPrice_IsNotNull() {
- registerDeliveryPrice(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
- }
-
- /**
- * Register condition of deliveryPrice.
- *
- * @param key Condition key. (NotNull)
- * @param value The value of deliveryPrice. (Nullable)
- */
- protected void registerDeliveryPrice(ConditionKey key, Object value) {
- registerQuery(key, value, getCValueDeliveryPrice(), COL_DELIVERY_PRICE, J_DeliveryPrice, UJ_deliveryPrice);
- }
-
- /**
- * Register inline condition of deliveryPrice.
- *
- * @param key Condition key. (NotNull)
- * @param value The value of deliveryPrice. (Nullable)
- */
- protected void registerInlineDeliveryPrice(ConditionKey key, Object value) {
- registerInlineQuery(key, value, getCValueDeliveryPrice(), COL_DELIVERY_PRICE, J_DeliveryPrice, UJ_deliveryPrice);
- }
-
- abstract protected ConditionValue getCValueDeliveryPrice();
-
/** Column db name of subTotalPrice. */
protected static final String COL_SUB_TOTAL_PRICE = "SUB_TOTAL_PRICE";
@@ -9071,6 +9110,244 @@
abstract protected ConditionValue getCValueTax();
+ /** Column db name of deliveryPrice. */
+ protected static final String COL_DELIVERY_PRICE = "DELIVERY_PRICE";
+
+ /** Column java name of deliveryPrice. */
+ protected static final String J_DeliveryPrice = "DeliveryPrice";
+
+ /** Column uncapitalised java name of deliveryPrice. */
+ protected static final String UJ_deliveryPrice = "deliveryPrice";
+
+ /**
+ * Set the value of deliveryPrice using equal. { = }
+ *
+ * @param deliveryPrice The value of deliveryPrice as equal.
+ */
+ public void setDeliveryPrice_Equal(java.math.BigDecimal deliveryPrice) {
+ registerDeliveryPrice(ConditionKey.CK_EQUAL, deliveryPrice);
+ }
+
+ /**
+ * Set the value of deliveryPrice using notEqual. { != }
+ *
+ * @param deliveryPrice The value of deliveryPrice as notEqual.
+ */
+ public void setDeliveryPrice_NotEqual(java.math.BigDecimal deliveryPrice) {
+ registerDeliveryPrice(ConditionKey.CK_NOT_EQUAL, deliveryPrice);
+ }
+
+ /**
+ * Set the value of deliveryPrice using greaterThan. { > }
+ *
+ * @param deliveryPrice The value of deliveryPrice as greaterThan.
+ */
+ public void setDeliveryPrice_GreaterThan(java.math.BigDecimal deliveryPrice) {
+ registerDeliveryPrice(ConditionKey.CK_GREATER_THAN, deliveryPrice);
+ }
+
+ /**
+ * Set the value of deliveryPrice using lessThan. { < }
+ *
+ * @param deliveryPrice The value of deliveryPrice as lessThan.
+ */
+ public void setDeliveryPrice_LessThan(java.math.BigDecimal deliveryPrice) {
+ registerDeliveryPrice(ConditionKey.CK_LESS_THAN, deliveryPrice);
+ }
+
+ /**
+ * Set the value of deliveryPrice using greaterEqual. { >= }
+ *
+ * @param deliveryPrice The value of deliveryPrice as greaterEqual.
+ */
+ public void setDeliveryPrice_GreaterEqual(java.math.BigDecimal deliveryPrice) {
+ registerDeliveryPrice(ConditionKey.CK_GREATER_EQUAL, deliveryPrice);
+ }
+
+ /**
+ * Set the value of deliveryPrice using lessEqual. { <= }
+ *
+ * @param deliveryPrice The value of deliveryPrice as lessEqual.
+ */
+ public void setDeliveryPrice_LessEqual(java.math.BigDecimal deliveryPrice) {
+ registerDeliveryPrice(ConditionKey.CK_LESS_EQUAL, deliveryPrice);
+ }
+
+ /**
+ * Set the value of deliveryPrice using inScope. { in (a, b) }
+ * If the element in the list is null or empty-string, the condition-element is ignored.
+ *
+ * @param deliveryPriceList The value of deliveryPrice as inScope.
+ */
+ public void setDeliveryPrice_InScope(java.util.List<java.math.BigDecimal> deliveryPriceList) {
+ registerDeliveryPrice(ConditionKey.CK_IN_SCOPE, deliveryPriceList);
+ }
+
+ /**
+ * Set the value of deliveryPrice using notInScope. { not in (a, b) }
+ * If the element in the list is null or empty-string, the condition-element is ignored.
+ *
+ * @param deliveryPriceList The value of deliveryPrice as notInScope.
+ */
+ public void setDeliveryPrice_NotInScope(java.util.List<java.math.BigDecimal> deliveryPriceList) {
+ registerDeliveryPrice(ConditionKey.CK_NOT_IN_SCOPE, deliveryPriceList);
+ }
+
+ /**
+ * Set the value of deliveryPrice using isNull. { is null }
+ */
+ public void setDeliveryPrice_IsNull() {
+ registerDeliveryPrice(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+ }
+
+ /**
+ * Set the value of deliveryPrice using isNotNull. { is not null }
+ */
+ public void setDeliveryPrice_IsNotNull() {
+ registerDeliveryPrice(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+ }
+
+ /**
+ * Register condition of deliveryPrice.
+ *
+ * @param key Condition key. (NotNull)
+ * @param value The value of deliveryPrice. (Nullable)
+ */
+ protected void registerDeliveryPrice(ConditionKey key, Object value) {
+ registerQuery(key, value, getCValueDeliveryPrice(), COL_DELIVERY_PRICE, J_DeliveryPrice, UJ_deliveryPrice);
+ }
+
+ /**
+ * Register inline condition of deliveryPrice.
+ *
+ * @param key Condition key. (NotNull)
+ * @param value The value of deliveryPrice. (Nullable)
+ */
+ protected void registerInlineDeliveryPrice(ConditionKey key, Object value) {
+ registerInlineQuery(key, value, getCValueDeliveryPrice(), COL_DELIVERY_PRICE, J_DeliveryPrice, UJ_deliveryPrice);
+ }
+
+ abstract protected ConditionValue getCValueDeliveryPrice();
+
+ /** Column db name of paymentFee. */
+ protected static final String COL_PAYMENT_FEE = "PAYMENT_FEE";
+
+ /** Column java name of paymentFee. */
+ protected static final String J_PaymentFee = "PaymentFee";
+
+ /** Column uncapitalised java name of paymentFee. */
+ protected static final String UJ_paymentFee = "paymentFee";
+
+ /**
+ * Set the value of paymentFee using equal. { = }
+ *
+ * @param paymentFee The value of paymentFee as equal.
+ */
+ public void setPaymentFee_Equal(java.math.BigDecimal paymentFee) {
+ registerPaymentFee(ConditionKey.CK_EQUAL, paymentFee);
+ }
+
+ /**
+ * Set the value of paymentFee using notEqual. { != }
+ *
+ * @param paymentFee The value of paymentFee as notEqual.
+ */
+ public void setPaymentFee_NotEqual(java.math.BigDecimal paymentFee) {
+ registerPaymentFee(ConditionKey.CK_NOT_EQUAL, paymentFee);
+ }
+
+ /**
+ * Set the value of paymentFee using greaterThan. { > }
+ *
+ * @param paymentFee The value of paymentFee as greaterThan.
+ */
+ public void setPaymentFee_GreaterThan(java.math.BigDecimal paymentFee) {
+ registerPaymentFee(ConditionKey.CK_GREATER_THAN, paymentFee);
+ }
+
+ /**
+ * Set the value of paymentFee using lessThan. { < }
+ *
+ * @param paymentFee The value of paymentFee as lessThan.
+ */
+ public void setPaymentFee_LessThan(java.math.BigDecimal paymentFee) {
+ registerPaymentFee(ConditionKey.CK_LESS_THAN, paymentFee);
+ }
+
+ /**
+ * Set the value of paymentFee using greaterEqual. { >= }
+ *
+ * @param paymentFee The value of paymentFee as greaterEqual.
+ */
+ public void setPaymentFee_GreaterEqual(java.math.BigDecimal paymentFee) {
+ registerPaymentFee(ConditionKey.CK_GREATER_EQUAL, paymentFee);
+ }
+
+ /**
+ * Set the value of paymentFee using lessEqual. { <= }
+ *
+ * @param paymentFee The value of paymentFee as lessEqual.
+ */
+ public void setPaymentFee_LessEqual(java.math.BigDecimal paymentFee) {
+ registerPaymentFee(ConditionKey.CK_LESS_EQUAL, paymentFee);
+ }
+
+ /**
+ * Set the value of paymentFee using inScope. { in (a, b) }
+ * If the element in the list is null or empty-string, the condition-element is ignored.
+ *
+ * @param paymentFeeList The value of paymentFee as inScope.
+ */
+ public void setPaymentFee_InScope(java.util.List<java.math.BigDecimal> paymentFeeList) {
+ registerPaymentFee(ConditionKey.CK_IN_SCOPE, paymentFeeList);
+ }
+
+ /**
+ * Set the value of paymentFee using notInScope. { not in (a, b) }
+ * If the element in the list is null or empty-string, the condition-element is ignored.
+ *
+ * @param paymentFeeList The value of paymentFee as notInScope.
+ */
+ public void setPaymentFee_NotInScope(java.util.List<java.math.BigDecimal> paymentFeeList) {
+ registerPaymentFee(ConditionKey.CK_NOT_IN_SCOPE, paymentFeeList);
+ }
+
+ /**
+ * Set the value of paymentFee using isNull. { is null }
+ */
+ public void setPaymentFee_IsNull() {
+ registerPaymentFee(ConditionKey.CK_IS_NULL, DUMMY_OBJECT);
+ }
+
+ /**
+ * Set the value of paymentFee using isNotNull. { is not null }
+ */
+ public void setPaymentFee_IsNotNull() {
+ registerPaymentFee(ConditionKey.CK_IS_NOT_NULL, DUMMY_OBJECT);
+ }
+
+ /**
+ * Register condition of paymentFee.
+ *
+ * @param key Condition key. (NotNull)
+ * @param value The value of paymentFee. (Nullable)
+ */
+ protected void registerPaymentFee(ConditionKey key, Object value) {
+ registerQuery(key, value, getCValuePaymentFee(), COL_PAYMENT_FEE, J_PaymentFee, UJ_paymentFee);
+ }
+
+ /**
+ * Register inline condition of paymentFee.
+ *
+ * @param key Condition key. (NotNull)
+ * @param value The value of paymentFee. (Nullable)
+ */
+ protected void registerInlinePaymentFee(ConditionKey key, Object value) {
+ registerInlineQuery(key, value, getCValuePaymentFee(), COL_PAYMENT_FEE, J_PaymentFee, UJ_paymentFee);
+ }
+
+ abstract protected ConditionValue getCValuePaymentFee();
+
/** Column db name of totalPrice. */
protected static final String COL_TOTAL_PRICE = "TOTAL_PRICE";
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsPaymentMethodCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsPaymentMethodCQ.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/AbstractBsPaymentMethodCQ.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -367,6 +367,111 @@
abstract protected ConditionValue getCValueCode();
+ /** Column db name of fee. */
+ protected static final String COL_FEE = "FEE";
+
+ /** Column java name of fee. */
+ protected static final String J_Fee = "Fee";
+
+ /** Column uncapitalised java name of fee. */
+ protected static final String UJ_fee = "fee";
+
+ /**
+ * Set the value of fee using equal. { = }
+ *
+ * @param fee The value of fee as equal.
+ */
+ public void setFee_Equal(java.math.BigDecimal fee) {
+ registerFee(ConditionKey.CK_EQUAL, fee);
+ }
+
+ /**
+ * Set the value of fee using notEqual. { != }
+ *
+ * @param fee The value of fee as notEqual.
+ */
+ public void setFee_NotEqual(java.math.BigDecimal fee) {
+ registerFee(ConditionKey.CK_NOT_EQUAL, fee);
+ }
+
+ /**
+ * Set the value of fee using greaterThan. { > }
+ *
+ * @param fee The value of fee as greaterThan.
+ */
+ public void setFee_GreaterThan(java.math.BigDecimal fee) {
+ registerFee(ConditionKey.CK_GREATER_THAN, fee);
+ }
+
+ /**
+ * Set the value of fee using lessThan. { < }
+ *
+ * @param fee The value of fee as lessThan.
+ */
+ public void setFee_LessThan(java.math.BigDecimal fee) {
+ registerFee(ConditionKey.CK_LESS_THAN, fee);
+ }
+
+ /**
+ * Set the value of fee using greaterEqual. { >= }
+ *
+ * @param fee The value of fee as greaterEqual.
+ */
+ public void setFee_GreaterEqual(java.math.BigDecimal fee) {
+ registerFee(ConditionKey.CK_GREATER_EQUAL, fee);
+ }
+
+ /**
+ * Set the value of fee using lessEqual. { <= }
+ *
+ * @param fee The value of fee as lessEqual.
+ */
+ public void setFee_LessEqual(java.math.BigDecimal fee) {
+ registerFee(ConditionKey.CK_LESS_EQUAL, fee);
+ }
+
+ /**
+ * Set the value of fee using inScope. { in (a, b) }
+ * If the element in the list is null or empty-string, the condition-element is ignored.
+ *
+ * @param feeList The value of fee as inScope.
+ */
+ public void setFee_InScope(java.util.List<java.math.BigDecimal> feeList) {
+ registerFee(ConditionKey.CK_IN_SCOPE, feeList);
+ }
+
+ /**
+ * Set the value of fee using notInScope. { not in (a, b) }
+ * If the element in the list is null or empty-string, the condition-element is ignored.
+ *
+ * @param feeList The value of fee as notInScope.
+ */
+ public void setFee_NotInScope(java.util.List<java.math.BigDecimal> feeList) {
+ registerFee(ConditionKey.CK_NOT_IN_SCOPE, feeList);
+ }
+
+ /**
+ * Register condition of fee.
+ *
+ * @param key Condition key. (NotNull)
+ * @param value The value of fee. (Nullable)
+ */
+ protected void registerFee(ConditionKey key, Object value) {
+ registerQuery(key, value, getCValueFee(), COL_FEE, J_Fee, UJ_fee);
+ }
+
+ /**
+ * Register inline condition of fee.
+ *
+ * @param key Condition key. (NotNull)
+ * @param value The value of fee. (Nullable)
+ */
+ protected void registerInlineFee(ConditionKey key, Object value) {
+ registerInlineQuery(key, value, getCValueFee(), COL_FEE, J_Fee, UJ_fee);
+ }
+
+ abstract protected ConditionValue getCValueFee();
+
/** Column db name of sortOrder. */
protected static final String COL_SORT_ORDER = "SORT_ORDER";
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsOrderFormCQ.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -1009,6 +1009,24 @@
}
/**
+ * Include select-column of deliveryNumber as mine.
+ * Alias name is java-name of this column.
+ * Be careful to whether your table have the same column.
+ */
+ public void includeAsMine_DeliveryNumber() {
+ registerIncludedSelectColumn("DeliveryNumber", getRealColumnName("DELIVERY_NUMBER"));
+ }
+
+ /**
+ * Include select-column of deliveryNumber as mine.
+ *
+ * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+ */
+ public void includeAsMine_DeliveryNumber(String aliasName) {
+ registerIncludedSelectColumn(aliasName, getRealColumnName("DELIVERY_NUMBER"));
+ }
+
+ /**
* Include select-column of lastModified as mine.
* Alias name is java-name of this column.
* Be careful to whether your table have the same column.
@@ -1117,24 +1135,6 @@
}
/**
- * Include select-column of deliveryPrice as mine.
- * Alias name is java-name of this column.
- * Be careful to whether your table have the same column.
- */
- public void includeAsMine_DeliveryPrice() {
- registerIncludedSelectColumn("DeliveryPrice", getRealColumnName("DELIVERY_PRICE"));
- }
-
- /**
- * Include select-column of deliveryPrice as mine.
- *
- * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
- */
- public void includeAsMine_DeliveryPrice(String aliasName) {
- registerIncludedSelectColumn(aliasName, getRealColumnName("DELIVERY_PRICE"));
- }
-
- /**
* Include select-column of subTotalPrice as mine.
* Alias name is java-name of this column.
* Be careful to whether your table have the same column.
@@ -1171,6 +1171,42 @@
}
/**
+ * Include select-column of deliveryPrice as mine.
+ * Alias name is java-name of this column.
+ * Be careful to whether your table have the same column.
+ */
+ public void includeAsMine_DeliveryPrice() {
+ registerIncludedSelectColumn("DeliveryPrice", getRealColumnName("DELIVERY_PRICE"));
+ }
+
+ /**
+ * Include select-column of deliveryPrice as mine.
+ *
+ * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+ */
+ public void includeAsMine_DeliveryPrice(String aliasName) {
+ registerIncludedSelectColumn(aliasName, getRealColumnName("DELIVERY_PRICE"));
+ }
+
+ /**
+ * Include select-column of paymentFee as mine.
+ * Alias name is java-name of this column.
+ * Be careful to whether your table have the same column.
+ */
+ public void includeAsMine_PaymentFee() {
+ registerIncludedSelectColumn("PaymentFee", getRealColumnName("PAYMENT_FEE"));
+ }
+
+ /**
+ * Include select-column of paymentFee as mine.
+ *
+ * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+ */
+ public void includeAsMine_PaymentFee(String aliasName) {
+ registerIncludedSelectColumn(aliasName, getRealColumnName("PAYMENT_FEE"));
+ }
+
+ /**
* Include select-column of totalPrice as mine.
* Alias name is java-name of this column.
* Be careful to whether your table have the same column.
@@ -3630,6 +3666,48 @@
}
// /- - - - - - - - - - - - - - - - - - - - - - -
+ // Column = [DELIVERY_NUMBER]
+ // - - - - - - - - -/
+
+ /** The attribute of deliveryNumber. */
+ protected ConditionValue _deliveryNumber;
+
+ /**
+ * Get the value of deliveryNumber.
+ *
+ * @return The value of deliveryNumber.
+ */
+ public ConditionValue getDeliveryNumber() {
+ if (_deliveryNumber == null) {
+ _deliveryNumber = new ConditionValue();
+ }
+ return _deliveryNumber;
+ }
+
+ protected ConditionValue getCValueDeliveryNumber() {
+ return getDeliveryNumber();
+ }
+
+
+ /**
+ * Add order-by of deliveryNumber as ASC.
+ *
+ * @return this. (NotNull)
+ */
+ public BsOrderFormCQ addOrderBy_DeliveryNumber_Asc() {
+ getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_NUMBER), null, true);return this;
+ }
+
+ /**
+ * Add order-by of deliveryNumber as DESC.
+ *
+ * @return this. (NotNull)
+ */
+ public BsOrderFormCQ addOrderBy_DeliveryNumber_Desc() {
+ getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_NUMBER), null, false);return this;
+ }
+
+ // /- - - - - - - - - - - - - - - - - - - - - - -
// Column = [LAST_MODIFIED]
// - - - - - - - - -/
@@ -3914,48 +3992,6 @@
}
// /- - - - - - - - - - - - - - - - - - - - - - -
- // Column = [DELIVERY_PRICE]
- // - - - - - - - - -/
-
- /** The attribute of deliveryPrice. */
- protected ConditionValue _deliveryPrice;
-
- /**
- * Get the value of deliveryPrice.
- *
- * @return The value of deliveryPrice.
- */
- public ConditionValue getDeliveryPrice() {
- if (_deliveryPrice == null) {
- _deliveryPrice = new ConditionValue();
- }
- return _deliveryPrice;
- }
-
- protected ConditionValue getCValueDeliveryPrice() {
- return getDeliveryPrice();
- }
-
-
- /**
- * Add order-by of deliveryPrice as ASC.
- *
- * @return this. (NotNull)
- */
- public BsOrderFormCQ addOrderBy_DeliveryPrice_Asc() {
- getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_PRICE), null, true);return this;
- }
-
- /**
- * Add order-by of deliveryPrice as DESC.
- *
- * @return this. (NotNull)
- */
- public BsOrderFormCQ addOrderBy_DeliveryPrice_Desc() {
- getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_PRICE), null, false);return this;
- }
-
- // /- - - - - - - - - - - - - - - - - - - - - - -
// Column = [SUB_TOTAL_PRICE]
// - - - - - - - - -/
@@ -4040,6 +4076,90 @@
}
// /- - - - - - - - - - - - - - - - - - - - - - -
+ // Column = [DELIVERY_PRICE]
+ // - - - - - - - - -/
+
+ /** The attribute of deliveryPrice. */
+ protected ConditionValue _deliveryPrice;
+
+ /**
+ * Get the value of deliveryPrice.
+ *
+ * @return The value of deliveryPrice.
+ */
+ public ConditionValue getDeliveryPrice() {
+ if (_deliveryPrice == null) {
+ _deliveryPrice = new ConditionValue();
+ }
+ return _deliveryPrice;
+ }
+
+ protected ConditionValue getCValueDeliveryPrice() {
+ return getDeliveryPrice();
+ }
+
+
+ /**
+ * Add order-by of deliveryPrice as ASC.
+ *
+ * @return this. (NotNull)
+ */
+ public BsOrderFormCQ addOrderBy_DeliveryPrice_Asc() {
+ getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_PRICE), null, true);return this;
+ }
+
+ /**
+ * Add order-by of deliveryPrice as DESC.
+ *
+ * @return this. (NotNull)
+ */
+ public BsOrderFormCQ addOrderBy_DeliveryPrice_Desc() {
+ getSqlClause().registerOrderBy(getRealColumnName(COL_DELIVERY_PRICE), null, false);return this;
+ }
+
+ // /- - - - - - - - - - - - - - - - - - - - - - -
+ // Column = [PAYMENT_FEE]
+ // - - - - - - - - -/
+
+ /** The attribute of paymentFee. */
+ protected ConditionValue _paymentFee;
+
+ /**
+ * Get the value of paymentFee.
+ *
+ * @return The value of paymentFee.
+ */
+ public ConditionValue getPaymentFee() {
+ if (_paymentFee == null) {
+ _paymentFee = new ConditionValue();
+ }
+ return _paymentFee;
+ }
+
+ protected ConditionValue getCValuePaymentFee() {
+ return getPaymentFee();
+ }
+
+
+ /**
+ * Add order-by of paymentFee as ASC.
+ *
+ * @return this. (NotNull)
+ */
+ public BsOrderFormCQ addOrderBy_PaymentFee_Asc() {
+ getSqlClause().registerOrderBy(getRealColumnName(COL_PAYMENT_FEE), null, true);return this;
+ }
+
+ /**
+ * Add order-by of paymentFee as DESC.
+ *
+ * @return this. (NotNull)
+ */
+ public BsOrderFormCQ addOrderBy_PaymentFee_Desc() {
+ getSqlClause().registerOrderBy(getRealColumnName(COL_PAYMENT_FEE), null, false);return this;
+ }
+
+ // /- - - - - - - - - - - - - - - - - - - - - - -
// Column = [TOTAL_PRICE]
// - - - - - - - - -/
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsPaymentMethodCQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsPaymentMethodCQ.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/bs/BsPaymentMethodCQ.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -91,6 +91,24 @@
}
/**
+ * Include select-column of fee as mine.
+ * Alias name is java-name of this column.
+ * Be careful to whether your table have the same column.
+ */
+ public void includeAsMine_Fee() {
+ registerIncludedSelectColumn("Fee", getRealColumnName("FEE"));
+ }
+
+ /**
+ * Include select-column of fee as mine.
+ *
+ * @param aliasName Alias name. {select columnName as aliasName from ...} This should not contain comma. (NotNull)
+ */
+ public void includeAsMine_Fee(String aliasName) {
+ registerIncludedSelectColumn(aliasName, getRealColumnName("FEE"));
+ }
+
+ /**
* Include select-column of sortOrder as mine.
* Alias name is java-name of this column.
* Be careful to whether your table have the same column.
@@ -300,6 +318,48 @@
}
// /- - - - - - - - - - - - - - - - - - - - - - -
+ // Column = [FEE]
+ // - - - - - - - - -/
+
+ /** The attribute of fee. */
+ protected ConditionValue _fee;
+
+ /**
+ * Get the value of fee.
+ *
+ * @return The value of fee.
+ */
+ public ConditionValue getFee() {
+ if (_fee == null) {
+ _fee = new ConditionValue();
+ }
+ return _fee;
+ }
+
+ protected ConditionValue getCValueFee() {
+ return getFee();
+ }
+
+
+ /**
+ * Add order-by of fee as ASC.
+ *
+ * @return this. (NotNull)
+ */
+ public BsPaymentMethodCQ addOrderBy_Fee_Asc() {
+ getSqlClause().registerOrderBy(getRealColumnName(COL_FEE), null, true);return this;
+ }
+
+ /**
+ * Add order-by of fee as DESC.
+ *
+ * @return this. (NotNull)
+ */
+ public BsPaymentMethodCQ addOrderBy_Fee_Desc() {
+ getSqlClause().registerOrderBy(getRealColumnName(COL_FEE), null, false);return this;
+ }
+
+ // /- - - - - - - - - - - - - - - - - - - - - - -
// Column = [SORT_ORDER]
// - - - - - - - - -/
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/OrderFormCIQ.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -558,6 +558,14 @@
// /- - - - - - - - - - - - - - - - - - - - - - -
+ // Column = [DELIVERY_NUMBER]
+ // - - - - - - - - -/
+ protected ConditionValue getCValueDeliveryNumber() {
+ return _myCQ.getDeliveryNumber();
+ }
+
+
+ // /- - - - - - - - - - - - - - - - - - - - - - -
// Column = [LAST_MODIFIED]
// - - - - - - - - -/
protected ConditionValue getCValueLastModified() {
@@ -614,14 +622,6 @@
// /- - - - - - - - - - - - - - - - - - - - - - -
- // Column = [DELIVERY_PRICE]
- // - - - - - - - - -/
- protected ConditionValue getCValueDeliveryPrice() {
- return _myCQ.getDeliveryPrice();
- }
-
-
- // /- - - - - - - - - - - - - - - - - - - - - - -
// Column = [SUB_TOTAL_PRICE]
// - - - - - - - - -/
protected ConditionValue getCValueSubTotalPrice() {
@@ -638,6 +638,22 @@
// /- - - - - - - - - - - - - - - - - - - - - - -
+ // Column = [DELIVERY_PRICE]
+ // - - - - - - - - -/
+ protected ConditionValue getCValueDeliveryPrice() {
+ return _myCQ.getDeliveryPrice();
+ }
+
+
+ // /- - - - - - - - - - - - - - - - - - - - - - -
+ // Column = [PAYMENT_FEE]
+ // - - - - - - - - -/
+ protected ConditionValue getCValuePaymentFee() {
+ return _myCQ.getPaymentFee();
+ }
+
+
+ // /- - - - - - - - - - - - - - - - - - - - - - -
// Column = [TOTAL_PRICE]
// - - - - - - - - -/
protected ConditionValue getCValueTotalPrice() {
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/PaymentMethodCIQ.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/PaymentMethodCIQ.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/cbean/cq/ciq/PaymentMethodCIQ.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -111,6 +111,14 @@
// /- - - - - - - - - - - - - - - - - - - - - - -
+ // Column = [FEE]
+ // - - - - - - - - -/
+ protected ConditionValue getCValueFee() {
+ return _myCQ.getFee();
+ }
+
+
+ // /- - - - - - - - - - - - - - - - - - - - - - -
// Column = [SORT_ORDER]
// - - - - - - - - -/
protected ConditionValue getCValueSortOrder() {
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/OrderFormDxo.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -7,6 +7,7 @@
import org.seasar.extension.dxo.annotation.ConversionRule;
import org.seasar.extension.dxo.annotation.ExcludeNull;
+import jp.sf.pal.pompei.entity.notification.order.Order;
import jp.sf.pal.pompei.exentity.AddressBook;
import jp.sf.pal.pompei.exentity.Customer;
import jp.sf.pal.pompei.exentity.OrderCardInfo;
@@ -101,4 +102,7 @@
public void convert(OrderCardInfo orderCardInfo,
AbstractOrderEditPage orderEditPage);
+
+ public Order convert(OrderForm orderForm);
+
}
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ProductDxo.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ProductDxo.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/dxo/ProductDxo.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -5,7 +5,9 @@
import java.util.Map;
import org.seasar.extension.dxo.annotation.ConversionRule;
+import org.seasar.extension.dxo.annotation.ExcludeNull;
+import jp.sf.pal.pompei.exentity.OrderProduct;
import jp.sf.pal.pompei.exentity.Product;
import jp.sf.pal.pompei.exentity.ProductDescription;
import jp.sf.pal.pompei.web.admin.product.ProductEditPage;
@@ -17,11 +19,8 @@
Product convertProduct(ProductEditPage productEditPage);
- @ConversionRule("productId : productId"
- + ",code : code"
- + ",model : model"
- + ",price : price"
- + ",status : status"
+ @ConversionRule("productId : productId" + ",code : code" + ",model : model"
+ + ",price : price" + ",status : status"
+ ",productDescriptionList : productDescriptionList"
+ ",manufacturerName : manufacturer.name"
+ ",dateAdded : dateAdded")
@@ -53,4 +52,15 @@
+ ",productsName : productsName")
void convert(ProductDescription description, Map<String, Object> map);
+ @ExcludeNull
+ public void convert(ProductDescription productDescription,
+ jp.sf.pal.pompei.entity.notification.order.Product product);
+
+ @ExcludeNull
+ public void convert(Product product,
+ jp.sf.pal.pompei.entity.notification.order.Product p);
+
+ @ExcludeNull
+ public void convert(OrderProduct orderProduct,
+ jp.sf.pal.pompei.entity.notification.order.Product product);
}
Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Order.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Order.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Order.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -0,0 +1,1106 @@
+package jp.sf.pal.pompei.entity.notification.order;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Order implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 2324446618731867065L;
+
+ private java.math.BigDecimal orderFormId;
+
+ private String orderFormNumber;
+
+ private java.math.BigDecimal customerId;
+
+ private String customerGender;
+
+ private String customerFirstname;
+
+ private String customerLastname;
+
+ private String customerFirstnameDescription;
+
+ private String customerLastnameDescription;
+
+ private java.util.Date customerDayOfBirth;
+
+ private String customerEmailAddress;
+
+ private String customerCompany;
+
+ private String customerDepartment;
+
+ private String customerStreetAddress;
+
+ private String customerSuburb;
+
+ private String customerCity;
+
+ private String customerState;
+
+ private String customerPostcode;
+
+ private String customerCountryName;
+
+ private String customerTelephone;
+
+ private String customerLocaleName;
+
+ private String deliveryCompany;
+
+ private String deliveryDepartment;
+
+ private String deliveryFirstname;
+
+ private String deliveryLastname;
+
+ private String deliveryFirstnameDescription;
+
+ private String deliveryLastnameDescription;
+
+ private String deliveryStreetAddress;
+
+ private String deliverySuburb;
+
+ private String deliveryCity;
+
+ private String deliveryState;
+
+ private String deliveryPostcode;
+
+ private String deliveryCountryName;
+
+ private String deliveryTelephone;
+
+ private String deliveryLocaleName;
+
+ private String billingCompany;
+
+ private String billingDepartment;
+
+ private String billingFirstname;
+
+ private String billingLastname;
+
+ private String billingFirstnameDescription;
+
+ private String billingLastnameDescription;
+
+ private String billingStreetAddress;
+
+ private String billingSuburb;
+
+ private String billingCity;
+
+ private String billingState;
+
+ private String billingPostcode;
+
+ private String billingCountryName;
+
+ private String billingTelephone;
+
+ private String billingLocaleName;
+
+ private java.math.BigDecimal paymentMethodId;
+
+ private String paymentMethodCode;
+
+ private java.math.BigDecimal orderCardInfoId;
+
+ private java.math.BigDecimal deliveryMethodId;
+
+ private String deliveryMethodCode;
+
+ private java.sql.Timestamp lastModified;
+
+ private java.math.BigDecimal orderStatusId;
+
+ private java.sql.Timestamp purchasedDate;
+
+ private java.sql.Timestamp finishedDate;
+
+ private java.math.BigDecimal currencyId;
+
+ private String currencyCode;
+
+ private String deliveryNumber;
+
+ private java.math.BigDecimal deliveryPrice;
+
+ private java.math.BigDecimal subTotalPrice;
+
+ private java.math.BigDecimal tax;
+
+ private java.math.BigDecimal paymentFee;
+
+ private java.math.BigDecimal totalPrice;
+
+ private List<Product> products;
+
+ public String formatPrice(BigDecimal price) {
+ if (price == null) {
+ return "0";
+ }
+ //TODO i18n
+ DecimalFormat priceFormat = new DecimalFormat("###,###");
+ return priceFormat.format(price);
+ }
+
+ public String formatDate(Timestamp timestamp) {
+ if (timestamp == null) {
+ return "";
+ }
+ //TODO i18n
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm");
+ return dateFormat.format(timestamp);
+ }
+
+ /**
+ * @return the orderFormId
+ */
+ public java.math.BigDecimal getOrderFormId() {
+ return orderFormId;
+ }
+
+ /**
+ * @param orderFormId the orderFormId to set
+ */
+ public void setOrderFormId(java.math.BigDecimal orderFormId) {
+ this.orderFormId = orderFormId;
+ }
+
+ /**
+ * @return the orderFormNumber
+ */
+ public String getOrderFormNumber() {
+ return orderFormNumber;
+ }
+
+ /**
+ * @param orderFormNumber the orderFormNumber to set
+ */
+ public void setOrderFormNumber(String orderFormNumber) {
+ this.orderFormNumber = orderFormNumber;
+ }
+
+ /**
+ * @return the customerId
+ */
+ public java.math.BigDecimal getCustomerId() {
+ return customerId;
+ }
+
+ /**
+ * @param customerId the customerId to set
+ */
+ public void setCustomerId(java.math.BigDecimal customerId) {
+ this.customerId = customerId;
+ }
+
+ /**
+ * @return the customerGender
+ */
+ public String getCustomerGender() {
+ return customerGender;
+ }
+
+ /**
+ * @param customerGender the customerGender to set
+ */
+ public void setCustomerGender(String customerGender) {
+ this.customerGender = customerGender;
+ }
+
+ /**
+ * @return the customerFirstname
+ */
+ public String getCustomerFirstname() {
+ return customerFirstname;
+ }
+
+ /**
+ * @param customerFirstname the customerFirstname to set
+ */
+ public void setCustomerFirstname(String customerFirstname) {
+ this.customerFirstname = customerFirstname;
+ }
+
+ /**
+ * @return the customerLastname
+ */
+ public String getCustomerLastname() {
+ return customerLastname;
+ }
+
+ /**
+ * @param customerLastname the customerLastname to set
+ */
+ public void setCustomerLastname(String customerLastname) {
+ this.customerLastname = customerLastname;
+ }
+
+ /**
+ * @return the customerFirstnameDescription
+ */
+ public String getCustomerFirstnameDescription() {
+ return customerFirstnameDescription;
+ }
+
+ /**
+ * @param customerFirstnameDescription the customerFirstnameDescription to set
+ */
+ public void setCustomerFirstnameDescription(
+ String customerFirstnameDescription) {
+ this.customerFirstnameDescription = customerFirstnameDescription;
+ }
+
+ /**
+ * @return the customerLastnameDescription
+ */
+ public String getCustomerLastnameDescription() {
+ return customerLastnameDescription;
+ }
+
+ /**
+ * @param customerLastnameDescription the customerLastnameDescription to set
+ */
+ public void setCustomerLastnameDescription(
+ String customerLastnameDescription) {
+ this.customerLastnameDescription = customerLastnameDescription;
+ }
+
+ /**
+ * @return the customerDayOfBirth
+ */
+ public java.util.Date getCustomerDayOfBirth() {
+ return customerDayOfBirth;
+ }
+
+ /**
+ * @param customerDayOfBirth the customerDayOfBirth to set
+ */
+ public void setCustomerDayOfBirth(java.util.Date customerDayOfBirth) {
+ this.customerDayOfBirth = customerDayOfBirth;
+ }
+
+ /**
+ * @return the customerEmailAddress
+ */
+ public String getCustomerEmailAddress() {
+ return customerEmailAddress;
+ }
+
+ /**
+ * @param customerEmailAddress the customerEmailAddress to set
+ */
+ public void setCustomerEmailAddress(String customerEmailAddress) {
+ this.customerEmailAddress = customerEmailAddress;
+ }
+
+ /**
+ * @return the customerCompany
+ */
+ public String getCustomerCompany() {
+ return customerCompany;
+ }
+
+ /**
+ * @param customerCompany the customerCompany to set
+ */
+ public void setCustomerCompany(String customerCompany) {
+ this.customerCompany = customerCompany;
+ }
+
+ /**
+ * @return the customerDepartment
+ */
+ public String getCustomerDepartment() {
+ return customerDepartment;
+ }
+
+ /**
+ * @param customerDepartment the customerDepartment to set
+ */
+ public void setCustomerDepartment(String customerDepartment) {
+ this.customerDepartment = customerDepartment;
+ }
+
+ /**
+ * @return the customerStreetAddress
+ */
+ public String getCustomerStreetAddress() {
+ return customerStreetAddress;
+ }
+
+ /**
+ * @param customerStreetAddress the customerStreetAddress to set
+ */
+ public void setCustomerStreetAddress(String customerStreetAddress) {
+ this.customerStreetAddress = customerStreetAddress;
+ }
+
+ /**
+ * @return the customerSuburb
+ */
+ public String getCustomerSuburb() {
+ return customerSuburb;
+ }
+
+ /**
+ * @param customerSuburb the customerSuburb to set
+ */
+ public void setCustomerSuburb(String customerSuburb) {
+ this.customerSuburb = customerSuburb;
+ }
+
+ /**
+ * @return the customerCity
+ */
+ public String getCustomerCity() {
+ return customerCity;
+ }
+
+ /**
+ * @param customerCity the customerCity to set
+ */
+ public void setCustomerCity(String customerCity) {
+ this.customerCity = customerCity;
+ }
+
+ /**
+ * @return the customerState
+ */
+ public String getCustomerState() {
+ return customerState;
+ }
+
+ /**
+ * @param customerState the customerState to set
+ */
+ public void setCustomerState(String customerState) {
+ this.customerState = customerState;
+ }
+
+ /**
+ * @return the customerPostcode
+ */
+ public String getCustomerPostcode() {
+ return customerPostcode;
+ }
+
+ /**
+ * @param customerPostcode the customerPostcode to set
+ */
+ public void setCustomerPostcode(String customerPostcode) {
+ this.customerPostcode = customerPostcode;
+ }
+
+ /**
+ * @return the customerCountryName
+ */
+ public String getCustomerCountryName() {
+ return customerCountryName;
+ }
+
+ /**
+ * @param customerCountryName the customerCountryName to set
+ */
+ public void setCustomerCountryName(String customerCountryName) {
+ this.customerCountryName = customerCountryName;
+ }
+
+ /**
+ * @return the customerTelephone
+ */
+ public String getCustomerTelephone() {
+ return customerTelephone;
+ }
+
+ /**
+ * @param customerTelephone the customerTelephone to set
+ */
+ public void setCustomerTelephone(String customerTelephone) {
+ this.customerTelephone = customerTelephone;
+ }
+
+ /**
+ * @return the customerLocaleName
+ */
+ public String getCustomerLocaleName() {
+ return customerLocaleName;
+ }
+
+ /**
+ * @param customerLocaleName the customerLocaleName to set
+ */
+ public void setCustomerLocaleName(String customerLocaleName) {
+ this.customerLocaleName = customerLocaleName;
+ }
+
+ /**
+ * @return the deliveryCompany
+ */
+ public String getDeliveryCompany() {
+ return deliveryCompany;
+ }
+
+ /**
+ * @param deliveryCompany the deliveryCompany to set
+ */
+ public void setDeliveryCompany(String deliveryCompany) {
+ this.deliveryCompany = deliveryCompany;
+ }
+
+ /**
+ * @return the deliveryDepartment
+ */
+ public String getDeliveryDepartment() {
+ return deliveryDepartment;
+ }
+
+ /**
+ * @param deliveryDepartment the deliveryDepartment to set
+ */
+ public void setDeliveryDepartment(String deliveryDepartment) {
+ this.deliveryDepartment = deliveryDepartment;
+ }
+
+ /**
+ * @return the deliveryFirstname
+ */
+ public String getDeliveryFirstname() {
+ return deliveryFirstname;
+ }
+
+ /**
+ * @param deliveryFirstname the deliveryFirstname to set
+ */
+ public void setDeliveryFirstname(String deliveryFirstname) {
+ this.deliveryFirstname = deliveryFirstname;
+ }
+
+ /**
+ * @return the deliveryLastname
+ */
+ public String getDeliveryLastname() {
+ return deliveryLastname;
+ }
+
+ /**
+ * @param deliveryLastname the deliveryLastname to set
+ */
+ public void setDeliveryLastname(String deliveryLastname) {
+ this.deliveryLastname = deliveryLastname;
+ }
+
+ /**
+ * @return the deliveryFirstnameDescription
+ */
+ public String getDeliveryFirstnameDescription() {
+ return deliveryFirstnameDescription;
+ }
+
+ /**
+ * @param deliveryFirstnameDescription the deliveryFirstnameDescription to set
+ */
+ public void setDeliveryFirstnameDescription(
+ String deliveryFirstnameDescription) {
+ this.deliveryFirstnameDescription = deliveryFirstnameDescription;
+ }
+
+ /**
+ * @return the deliveryLastnameDescription
+ */
+ public String getDeliveryLastnameDescription() {
+ return deliveryLastnameDescription;
+ }
+
+ /**
+ * @param deliveryLastnameDescription the deliveryLastnameDescription to set
+ */
+ public void setDeliveryLastnameDescription(
+ String deliveryLastnameDescription) {
+ this.deliveryLastnameDescription = deliveryLastnameDescription;
+ }
+
+ /**
+ * @return the deliveryStreetAddress
+ */
+ public String getDeliveryStreetAddress() {
+ return deliveryStreetAddress;
+ }
+
+ /**
+ * @param deliveryStreetAddress the deliveryStreetAddress to set
+ */
+ public void setDeliveryStreetAddress(String deliveryStreetAddress) {
+ this.deliveryStreetAddress = deliveryStreetAddress;
+ }
+
+ /**
+ * @return the deliverySuburb
+ */
+ public String getDeliverySuburb() {
+ return deliverySuburb;
+ }
+
+ /**
+ * @param deliverySuburb the deliverySuburb to set
+ */
+ public void setDeliverySuburb(String deliverySuburb) {
+ this.deliverySuburb = deliverySuburb;
+ }
+
+ /**
+ * @return the deliveryCity
+ */
+ public String getDeliveryCity() {
+ return deliveryCity;
+ }
+
+ /**
+ * @param deliveryCity the deliveryCity to set
+ */
+ public void setDeliveryCity(String deliveryCity) {
+ this.deliveryCity = deliveryCity;
+ }
+
+ /**
+ * @return the deliveryState
+ */
+ public String getDeliveryState() {
+ return deliveryState;
+ }
+
+ /**
+ * @param deliveryState the deliveryState to set
+ */
+ public void setDeliveryState(String deliveryState) {
+ this.deliveryState = deliveryState;
+ }
+
+ /**
+ * @return the deliveryPostcode
+ */
+ public String getDeliveryPostcode() {
+ return deliveryPostcode;
+ }
+
+ /**
+ * @param deliveryPostcode the deliveryPostcode to set
+ */
+ public void setDeliveryPostcode(String deliveryPostcode) {
+ this.deliveryPostcode = deliveryPostcode;
+ }
+
+ /**
+ * @return the deliveryCountryName
+ */
+ public String getDeliveryCountryName() {
+ return deliveryCountryName;
+ }
+
+ /**
+ * @param deliveryCountryName the deliveryCountryName to set
+ */
+ public void setDeliveryCountryName(String deliveryCountryName) {
+ this.deliveryCountryName = deliveryCountryName;
+ }
+
+ /**
+ * @return the deliveryTelephone
+ */
+ public String getDeliveryTelephone() {
+ return deliveryTelephone;
+ }
+
+ /**
+ * @param deliveryTelephone the deliveryTelephone to set
+ */
+ public void setDeliveryTelephone(String deliveryTelephone) {
+ this.deliveryTelephone = deliveryTelephone;
+ }
+
+ /**
+ * @return the deliveryLocaleName
+ */
+ public String getDeliveryLocaleName() {
+ return deliveryLocaleName;
+ }
+
+ /**
+ * @param deliveryLocaleName the deliveryLocaleName to set
+ */
+ public void setDeliveryLocaleName(String deliveryLocaleName) {
+ this.deliveryLocaleName = deliveryLocaleName;
+ }
+
+ /**
+ * @return the billingCompany
+ */
+ public String getBillingCompany() {
+ return billingCompany;
+ }
+
+ /**
+ * @param billingCompany the billingCompany to set
+ */
+ public void setBillingCompany(String billingCompany) {
+ this.billingCompany = billingCompany;
+ }
+
+ /**
+ * @return the billingDepartment
+ */
+ public String getBillingDepartment() {
+ return billingDepartment;
+ }
+
+ /**
+ * @param billingDepartment the billingDepartment to set
+ */
+ public void setBillingDepartment(String billingDepartment) {
+ this.billingDepartment = billingDepartment;
+ }
+
+ /**
+ * @return the billingFirstname
+ */
+ public String getBillingFirstname() {
+ return billingFirstname;
+ }
+
+ /**
+ * @param billingFirstname the billingFirstname to set
+ */
+ public void setBillingFirstname(String billingFirstname) {
+ this.billingFirstname = billingFirstname;
+ }
+
+ /**
+ * @return the billingLastname
+ */
+ public String getBillingLastname() {
+ return billingLastname;
+ }
+
+ /**
+ * @param billingLastname the billingLastname to set
+ */
+ public void setBillingLastname(String billingLastname) {
+ this.billingLastname = billingLastname;
+ }
+
+ /**
+ * @return the billingFirstnameDescription
+ */
+ public String getBillingFirstnameDescription() {
+ return billingFirstnameDescription;
+ }
+
+ /**
+ * @param billingFirstnameDescription the billingFirstnameDescription to set
+ */
+ public void setBillingFirstnameDescription(
+ String billingFirstnameDescription) {
+ this.billingFirstnameDescription = billingFirstnameDescription;
+ }
+
+ /**
+ * @return the billingLastnameDescription
+ */
+ public String getBillingLastnameDescription() {
+ return billingLastnameDescription;
+ }
+
+ /**
+ * @param billingLastnameDescription the billingLastnameDescription to set
+ */
+ public void setBillingLastnameDescription(String billingLastnameDescription) {
+ this.billingLastnameDescription = billingLastnameDescription;
+ }
+
+ /**
+ * @return the billingStreetAddress
+ */
+ public String getBillingStreetAddress() {
+ return billingStreetAddress;
+ }
+
+ /**
+ * @param billingStreetAddress the billingStreetAddress to set
+ */
+ public void setBillingStreetAddress(String billingStreetAddress) {
+ this.billingStreetAddress = billingStreetAddress;
+ }
+
+ /**
+ * @return the billingSuburb
+ */
+ public String getBillingSuburb() {
+ return billingSuburb;
+ }
+
+ /**
+ * @param billingSuburb the billingSuburb to set
+ */
+ public void setBillingSuburb(String billingSuburb) {
+ this.billingSuburb = billingSuburb;
+ }
+
+ /**
+ * @return the billingCity
+ */
+ public String getBillingCity() {
+ return billingCity;
+ }
+
+ /**
+ * @param billingCity the billingCity to set
+ */
+ public void setBillingCity(String billingCity) {
+ this.billingCity = billingCity;
+ }
+
+ /**
+ * @return the billingState
+ */
+ public String getBillingState() {
+ return billingState;
+ }
+
+ /**
+ * @param billingState the billingState to set
+ */
+ public void setBillingState(String billingState) {
+ this.billingState = billingState;
+ }
+
+ /**
+ * @return the billingPostcode
+ */
+ public String getBillingPostcode() {
+ return billingPostcode;
+ }
+
+ /**
+ * @param billingPostcode the billingPostcode to set
+ */
+ public void setBillingPostcode(String billingPostcode) {
+ this.billingPostcode = billingPostcode;
+ }
+
+ /**
+ * @return the billingCountryName
+ */
+ public String getBillingCountryName() {
+ return billingCountryName;
+ }
+
+ /**
+ * @param billingCountryName the billingCountryName to set
+ */
+ public void setBillingCountryName(String billingCountryName) {
+ this.billingCountryName = billingCountryName;
+ }
+
+ /**
+ * @return the billingTelephone
+ */
+ public String getBillingTelephone() {
+ return billingTelephone;
+ }
+
+ /**
+ * @param billingTelephone the billingTelephone to set
+ */
+ public void setBillingTelephone(String billingTelephone) {
+ this.billingTelephone = billingTelephone;
+ }
+
+ /**
+ * @return the billingLocaleName
+ */
+ public String getBillingLocaleName() {
+ return billingLocaleName;
+ }
+
+ /**
+ * @param billingLocaleName the billingLocaleName to set
+ */
+ public void setBillingLocaleName(String billingLocaleName) {
+ this.billingLocaleName = billingLocaleName;
+ }
+
+ /**
+ * @return the paymentMethodId
+ */
+ public java.math.BigDecimal getPaymentMethodId() {
+ return paymentMethodId;
+ }
+
+ /**
+ * @param paymentMethodId the paymentMethodId to set
+ */
+ public void setPaymentMethodId(java.math.BigDecimal paymentMethodId) {
+ this.paymentMethodId = paymentMethodId;
+ }
+
+ /**
+ * @return the paymentMethodCode
+ */
+ public String getPaymentMethodCode() {
+ return paymentMethodCode;
+ }
+
+ /**
+ * @param paymentMethodCode the paymentMethodCode to set
+ */
+ public void setPaymentMethodCode(String paymentMethodCode) {
+ this.paymentMethodCode = paymentMethodCode;
+ }
+
+ /**
+ * @return the orderCardInfoId
+ */
+ public java.math.BigDecimal getOrderCardInfoId() {
+ return orderCardInfoId;
+ }
+
+ /**
+ * @param orderCardInfoId the orderCardInfoId to set
+ */
+ public void setOrderCardInfoId(java.math.BigDecimal orderCardInfoId) {
+ this.orderCardInfoId = orderCardInfoId;
+ }
+
+ /**
+ * @return the deliveryMethodId
+ */
+ public java.math.BigDecimal getDeliveryMethodId() {
+ return deliveryMethodId;
+ }
+
+ /**
+ * @param deliveryMethodId the deliveryMethodId to set
+ */
+ public void setDeliveryMethodId(java.math.BigDecimal deliveryMethodId) {
+ this.deliveryMethodId = deliveryMethodId;
+ }
+
+ /**
+ * @return the deliveryMethodCode
+ */
+ public String getDeliveryMethodCode() {
+ return deliveryMethodCode;
+ }
+
+ /**
+ * @param deliveryMethodCode the deliveryMethodCode to set
+ */
+ public void setDeliveryMethodCode(String deliveryMethodCode) {
+ this.deliveryMethodCode = deliveryMethodCode;
+ }
+
+ /**
+ * @return the lastModified
+ */
+ public java.sql.Timestamp getLastModified() {
+ return lastModified;
+ }
+
+ /**
+ * @param lastModified the lastModified to set
+ */
+ public void setLastModified(java.sql.Timestamp lastModified) {
+ this.lastModified = lastModified;
+ }
+
+ /**
+ * @return the orderStatusId
+ */
+ public java.math.BigDecimal getOrderStatusId() {
+ return orderStatusId;
+ }
+
+ /**
+ * @param orderStatusId the orderStatusId to set
+ */
+ public void setOrderStatusId(java.math.BigDecimal orderStatusId) {
+ this.orderStatusId = orderStatusId;
+ }
+
+ /**
+ * @return the purchasedDate
+ */
+ public java.sql.Timestamp getPurchasedDate() {
+ return purchasedDate;
+ }
+
+ /**
+ * @param purchasedDate the purchasedDate to set
+ */
+ public void setPurchasedDate(java.sql.Timestamp purchasedDate) {
+ this.purchasedDate = purchasedDate;
+ }
+
+ /**
+ * @return the finishedDate
+ */
+ public java.sql.Timestamp getFinishedDate() {
+ return finishedDate;
+ }
+
+ /**
+ * @param finishedDate the finishedDate to set
+ */
+ public void setFinishedDate(java.sql.Timestamp finishedDate) {
+ this.finishedDate = finishedDate;
+ }
+
+ /**
+ * @return the currencyId
+ */
+ public java.math.BigDecimal getCurrencyId() {
+ return currencyId;
+ }
+
+ /**
+ * @param currencyId the currencyId to set
+ */
+ public void setCurrencyId(java.math.BigDecimal currencyId) {
+ this.currencyId = currencyId;
+ }
+
+ /**
+ * @return the currencyCode
+ */
+ public String getCurrencyCode() {
+ return currencyCode;
+ }
+
+ /**
+ * @param currencyCode the currencyCode to set
+ */
+ public void setCurrencyCode(String currencyCode) {
+ this.currencyCode = currencyCode;
+ }
+
+ /**
+ * @return the deliveryPrice
+ */
+ public java.math.BigDecimal getDeliveryPrice() {
+ return deliveryPrice;
+ }
+
+ /**
+ * @param deliveryPrice the deliveryPrice to set
+ */
+ public void setDeliveryPrice(java.math.BigDecimal deliveryPrice) {
+ this.deliveryPrice = deliveryPrice;
+ }
+
+ /**
+ * @return the subTotalPrice
+ */
+ public java.math.BigDecimal getSubTotalPrice() {
+ return subTotalPrice;
+ }
+
+ /**
+ * @param subTotalPrice the subTotalPrice to set
+ */
+ public void setSubTotalPrice(java.math.BigDecimal subTotalPrice) {
+ this.subTotalPrice = subTotalPrice;
+ }
+
+ /**
+ * @return the tax
+ */
+ public java.math.BigDecimal getTax() {
+ return tax;
+ }
+
+ /**
+ * @param tax the tax to set
+ */
+ public void setTax(java.math.BigDecimal tax) {
+ this.tax = tax;
+ }
+
+ /**
+ * @return the paymentFee
+ */
+ public java.math.BigDecimal getPaymentFee() {
+ return paymentFee;
+ }
+
+ /**
+ * @param paymentFee the paymentFee to set
+ */
+ public void setPaymentFee(java.math.BigDecimal paymentFee) {
+ this.paymentFee = paymentFee;
+ }
+
+ /**
+ * @return the totalPrice
+ */
+ public java.math.BigDecimal getTotalPrice() {
+ return totalPrice;
+ }
+
+ /**
+ * @param totalPrice the totalPrice to set
+ */
+ public void setTotalPrice(java.math.BigDecimal totalPrice) {
+ this.totalPrice = totalPrice;
+ }
+
+ /**
+ * @return the products
+ */
+ public List<Product> getProducts() {
+ if (products == null) {
+ products = new ArrayList<Product>();
+ }
+ return products;
+ }
+
+ /**
+ * @param products the products to set
+ */
+ public void setProducts(List<Product> products) {
+ this.products = products;
+ }
+
+ public void addProduct(Product product) {
+ if (products == null) {
+ products = new ArrayList<Product>();
+ }
+ products.add(product);
+ }
+
+ /**
+ * @return the deliveryNumber
+ */
+ public String getDeliveryNumber() {
+ return deliveryNumber;
+ }
+
+ /**
+ * @param deliveryNumber the deliveryNumber to set
+ */
+ public void setDeliveryNumber(String deliveryNumber) {
+ this.deliveryNumber = deliveryNumber;
+ }
+}
Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Order.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Product.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Product.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Product.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -0,0 +1,428 @@
+package jp.sf.pal.pompei.entity.notification.order;
+
+import java.io.Serializable;
+
+public class Product implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1955114932729040595L;
+
+ protected java.math.BigDecimal languageId;
+
+ protected String name;
+
+ protected String title;
+
+ protected String description;
+
+ protected String url;
+
+ protected java.math.BigDecimal viewed;
+
+ protected java.math.BigDecimal weight;
+
+ protected String size;
+
+ protected java.math.BigDecimal ordered;
+
+ protected java.math.BigDecimal reviewed;
+
+ protected java.math.BigDecimal rating;
+
+ protected java.math.BigDecimal status;
+
+ protected java.sql.Timestamp dateAdded;
+
+ protected java.sql.Timestamp lastModified;
+
+ protected java.sql.Timestamp dateAvailable;
+
+ protected java.math.BigDecimal taxClassId;
+
+ protected java.math.BigDecimal manufacturerId;
+
+ protected java.math.BigDecimal orderProductId;
+
+ protected java.math.BigDecimal orderFormId;
+
+ protected java.math.BigDecimal productId;
+
+ protected String code;
+
+ protected String model;
+
+ protected java.math.BigDecimal price;
+
+ protected java.math.BigDecimal finalPrice;
+
+ protected java.math.BigDecimal tax;
+
+ protected java.math.BigDecimal quantity;
+
+ /**
+ * @return the languageId
+ */
+ public java.math.BigDecimal getLanguageId() {
+ return languageId;
+ }
+
+ /**
+ * @param languageId the languageId to set
+ */
+ public void setLanguageId(java.math.BigDecimal languageId) {
+ this.languageId = languageId;
+ }
+
+ /**
+ * @return the name
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * @param name the name to set
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * @return the title
+ */
+ public String getTitle() {
+ return title;
+ }
+
+ /**
+ * @param title the title to set
+ */
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ /**
+ * @return the description
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * @param description the description to set
+ */
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ /**
+ * @return the url
+ */
+ public String getUrl() {
+ return url;
+ }
+
+ /**
+ * @param url the url to set
+ */
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ /**
+ * @return the viewed
+ */
+ public java.math.BigDecimal getViewed() {
+ return viewed;
+ }
+
+ /**
+ * @param viewed the viewed to set
+ */
+ public void setViewed(java.math.BigDecimal viewed) {
+ this.viewed = viewed;
+ }
+
+ /**
+ * @return the weight
+ */
+ public java.math.BigDecimal getWeight() {
+ return weight;
+ }
+
+ /**
+ * @param weight the weight to set
+ */
+ public void setWeight(java.math.BigDecimal weight) {
+ this.weight = weight;
+ }
+
+ /**
+ * @return the size
+ */
+ public String getSize() {
+ return size;
+ }
+
+ /**
+ * @param size the size to set
+ */
+ public void setSize(String size) {
+ this.size = size;
+ }
+
+ /**
+ * @return the ordered
+ */
+ public java.math.BigDecimal getOrdered() {
+ return ordered;
+ }
+
+ /**
+ * @param ordered the ordered to set
+ */
+ public void setOrdered(java.math.BigDecimal ordered) {
+ this.ordered = ordered;
+ }
+
+ /**
+ * @return the reviewed
+ */
+ public java.math.BigDecimal getReviewed() {
+ return reviewed;
+ }
+
+ /**
+ * @param reviewed the reviewed to set
+ */
+ public void setReviewed(java.math.BigDecimal reviewed) {
+ this.reviewed = reviewed;
+ }
+
+ /**
+ * @return the rating
+ */
+ public java.math.BigDecimal getRating() {
+ return rating;
+ }
+
+ /**
+ * @param rating the rating to set
+ */
+ public void setRating(java.math.BigDecimal rating) {
+ this.rating = rating;
+ }
+
+ /**
+ * @return the status
+ */
+ public java.math.BigDecimal getStatus() {
+ return status;
+ }
+
+ /**
+ * @param status the status to set
+ */
+ public void setStatus(java.math.BigDecimal status) {
+ this.status = status;
+ }
+
+ /**
+ * @return the dateAdded
+ */
+ public java.sql.Timestamp getDateAdded() {
+ return dateAdded;
+ }
+
+ /**
+ * @param dateAdded the dateAdded to set
+ */
+ public void setDateAdded(java.sql.Timestamp dateAdded) {
+ this.dateAdded = dateAdded;
+ }
+
+ /**
+ * @return the lastModified
+ */
+ public java.sql.Timestamp getLastModified() {
+ return lastModified;
+ }
+
+ /**
+ * @param lastModified the lastModified to set
+ */
+ public void setLastModified(java.sql.Timestamp lastModified) {
+ this.lastModified = lastModified;
+ }
+
+ /**
+ * @return the dateAvailable
+ */
+ public java.sql.Timestamp getDateAvailable() {
+ return dateAvailable;
+ }
+
+ /**
+ * @param dateAvailable the dateAvailable to set
+ */
+ public void setDateAvailable(java.sql.Timestamp dateAvailable) {
+ this.dateAvailable = dateAvailable;
+ }
+
+ /**
+ * @return the taxClassId
+ */
+ public java.math.BigDecimal getTaxClassId() {
+ return taxClassId;
+ }
+
+ /**
+ * @param taxClassId the taxClassId to set
+ */
+ public void setTaxClassId(java.math.BigDecimal taxClassId) {
+ this.taxClassId = taxClassId;
+ }
+
+ /**
+ * @return the manufacturerId
+ */
+ public java.math.BigDecimal getManufacturerId() {
+ return manufacturerId;
+ }
+
+ /**
+ * @param manufacturerId the manufacturerId to set
+ */
+ public void setManufacturerId(java.math.BigDecimal manufacturerId) {
+ this.manufacturerId = manufacturerId;
+ }
+
+ /**
+ * @return the orderProductId
+ */
+ public java.math.BigDecimal getOrderProductId() {
+ return orderProductId;
+ }
+
+ /**
+ * @param orderProductId the orderProductId to set
+ */
+ public void setOrderProductId(java.math.BigDecimal orderProductId) {
+ this.orderProductId = orderProductId;
+ }
+
+ /**
+ * @return the orderFormId
+ */
+ public java.math.BigDecimal getOrderFormId() {
+ return orderFormId;
+ }
+
+ /**
+ * @param orderFormId the orderFormId to set
+ */
+ public void setOrderFormId(java.math.BigDecimal orderFormId) {
+ this.orderFormId = orderFormId;
+ }
+
+ /**
+ * @return the productId
+ */
+ public java.math.BigDecimal getProductId() {
+ return productId;
+ }
+
+ /**
+ * @param productId the productId to set
+ */
+ public void setProductId(java.math.BigDecimal productId) {
+ this.productId = productId;
+ }
+
+ /**
+ * @return the code
+ */
+ public String getCode() {
+ return code;
+ }
+
+ /**
+ * @param code the code to set
+ */
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ /**
+ * @return the model
+ */
+ public String getModel() {
+ return model;
+ }
+
+ /**
+ * @param model the model to set
+ */
+ public void setModel(String model) {
+ this.model = model;
+ }
+
+ /**
+ * @return the price
+ */
+ public java.math.BigDecimal getPrice() {
+ return price;
+ }
+
+ /**
+ * @param price the price to set
+ */
+ public void setPrice(java.math.BigDecimal price) {
+ this.price = price;
+ }
+
+ /**
+ * @return the finalPrice
+ */
+ public java.math.BigDecimal getFinalPrice() {
+ return finalPrice;
+ }
+
+ /**
+ * @param finalPrice the finalPrice to set
+ */
+ public void setFinalPrice(java.math.BigDecimal finalPrice) {
+ this.finalPrice = finalPrice;
+ }
+
+ /**
+ * @return the tax
+ */
+ public java.math.BigDecimal getTax() {
+ return tax;
+ }
+
+ /**
+ * @param tax the tax to set
+ */
+ public void setTax(java.math.BigDecimal tax) {
+ this.tax = tax;
+ }
+
+ /**
+ * @return the quantity
+ */
+ public java.math.BigDecimal getQuantity() {
+ return quantity;
+ }
+
+ /**
+ * @param quantity the quantity to set
+ */
+ public void setQuantity(java.math.BigDecimal quantity) {
+ this.quantity = quantity;
+ }
+
+}
Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/entity/notification/order/Product.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/OrderService.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -12,6 +12,7 @@
import jp.sf.pal.pompei.exentity.DeliveryMethod;
import jp.sf.pal.pompei.exentity.OrderCardInfo;
import jp.sf.pal.pompei.exentity.OrderForm;
+import jp.sf.pal.pompei.exentity.OrderNotification;
import jp.sf.pal.pompei.exentity.OrderProduct;
import jp.sf.pal.pompei.exentity.OrderStatus;
import jp.sf.pal.pompei.exentity.OrderStatusDescription;
@@ -36,9 +37,9 @@
AddressBook customerAddressBook, AddressBook deliveryAddressBook,
AddressBook billingAddressBook, PaymentMethod paymentMethod,
DeliveryMethod deliveryMethod, OrderCardInfo orderCardInfo,
- Currency currency, BigDecimal subTotalPrice,
- BigDecimal deliveryPrice, BigDecimal tax, BigDecimal totalPrice)
- throws CommonException;
+ Currency currency, BigDecimal subTotalPrice, BigDecimal tax,
+ BigDecimal deliveryPrice, BigDecimal paymentFee,
+ BigDecimal totalPrice) throws CommonException;
public Currency getCurrency(BigDecimal currencyId);
@@ -53,4 +54,12 @@
public List<OrderProduct> getOrderProductListByOrderFormId(
BigDecimal orderFormId);
+
+ public List<OrderNotification> getOrderNotificationListByOrderFormId(
+ BigDecimal orderFormId);
+
+ public void sendOrderNotifications(BigDecimal orderFormId,
+ BigDecimal[] orderNotificationIds) throws CommonException;
+
+ public OrderNotification getOrderNotification(BigDecimal orderNotificationId);
}
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/service/impl/OrderServiceImpl.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -1,10 +1,19 @@
package jp.sf.pal.pompei.service.impl;
+import java.io.StringWriter;
import java.math.BigDecimal;
import java.sql.Timestamp;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Properties;
+import javax.mail.Message;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+
import jp.sf.pal.common.CommonException;
import jp.sf.pal.pompei.PompeiConstants;
import jp.sf.pal.pompei.allcommon.cbean.PagingResultBean;
@@ -13,18 +22,23 @@
import jp.sf.pal.pompei.cbean.OrderCardInfoCB;
import jp.sf.pal.pompei.cbean.OrderCommentCB;
import jp.sf.pal.pompei.cbean.OrderFormCB;
+import jp.sf.pal.pompei.cbean.OrderNotificationCB;
import jp.sf.pal.pompei.cbean.OrderProductAttributeCB;
import jp.sf.pal.pompei.cbean.OrderProductCB;
import jp.sf.pal.pompei.cbean.OrderProductDownloadCB;
import jp.sf.pal.pompei.cbean.OrderStatusCB;
import jp.sf.pal.pompei.cbean.OrderStatusDescriptionCB;
import jp.sf.pal.pompei.cbean.OrderStatusHistoryCB;
+import jp.sf.pal.pompei.cbean.ProductDescriptionCB;
import jp.sf.pal.pompei.dxo.OrderFormDxo;
+import jp.sf.pal.pompei.dxo.ProductDxo;
+import jp.sf.pal.pompei.entity.notification.order.Order;
import jp.sf.pal.pompei.exbhv.CurrencyBhv;
import jp.sf.pal.pompei.exbhv.CustomerBasketBhv;
import jp.sf.pal.pompei.exbhv.OrderCardInfoBhv;
import jp.sf.pal.pompei.exbhv.OrderCommentBhv;
import jp.sf.pal.pompei.exbhv.OrderFormBhv;
+import jp.sf.pal.pompei.exbhv.OrderNotificationBhv;
import jp.sf.pal.pompei.exbhv.OrderProductAttributeBhv;
import jp.sf.pal.pompei.exbhv.OrderProductBhv;
import jp.sf.pal.pompei.exbhv.OrderProductDownloadBhv;
@@ -32,6 +46,7 @@
import jp.sf.pal.pompei.exbhv.OrderStatusDescriptionBhv;
import jp.sf.pal.pompei.exbhv.OrderStatusHistoryBhv;
import jp.sf.pal.pompei.exbhv.ProductBhv;
+import jp.sf.pal.pompei.exbhv.ProductDescriptionBhv;
import jp.sf.pal.pompei.exentity.AddressBook;
import jp.sf.pal.pompei.exentity.Currency;
import jp.sf.pal.pompei.exentity.Customer;
@@ -40,6 +55,7 @@
import jp.sf.pal.pompei.exentity.OrderCardInfo;
import jp.sf.pal.pompei.exentity.OrderComment;
import jp.sf.pal.pompei.exentity.OrderForm;
+import jp.sf.pal.pompei.exentity.OrderNotification;
import jp.sf.pal.pompei.exentity.OrderProduct;
import jp.sf.pal.pompei.exentity.OrderProductAttribute;
import jp.sf.pal.pompei.exentity.OrderProductDownload;
@@ -48,9 +64,19 @@
import jp.sf.pal.pompei.exentity.OrderStatusHistory;
import jp.sf.pal.pompei.exentity.PaymentMethod;
import jp.sf.pal.pompei.exentity.Product;
+import jp.sf.pal.pompei.exentity.ProductDescription;
import jp.sf.pal.pompei.pager.OrderFormPager;
+import jp.sf.pal.pompei.service.LanguageService;
import jp.sf.pal.pompei.service.OrderService;
+import jp.sf.pal.pompei.util.SystemUtil;
+import jp.sf.pal.pompei.util.VelocityUtil;
+import org.apache.commons.lang.StringUtils;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+import org.seasar.framework.log.Logger;
+
public class OrderServiceImpl implements OrderService {
/**
@@ -58,6 +84,12 @@
*/
private static final long serialVersionUID = -6452405711117279851L;
+ /**
+ * Logger for this class
+ */
+ private static final Logger logger = Logger
+ .getLogger(OrderServiceImpl.class);
+
private transient OrderFormBhv orderFormBhv;
private transient CurrencyBhv currencyBhv;
@@ -70,6 +102,8 @@
private transient ProductBhv productBhv;
+ private transient ProductDescriptionBhv productDescriptionBhv;
+
private transient OrderStatusDescriptionBhv orderStatusDescriptionBhv;
private transient OrderStatusBhv orderStatusBhv;
@@ -82,8 +116,141 @@
private transient OrderCommentBhv orderCommentBhv;
+ private transient OrderNotificationBhv orderNotificationBhv;
+
private OrderFormDxo orderFormDxo;
+ private LanguageService languageService;
+
+ private ProductDxo productDxo;
+
+ public void sendOrderNotifications(BigDecimal orderFormId,
+ BigDecimal[] orderNotificationIds) throws CommonException {
+ if (orderFormId == null) {
+ throw new CommonException("orderFormId.is.null.in.notification");
+ }
+ OrderForm orderForm = getOrderForm(orderFormId);
+ if (orderForm == null) {
+ throw new CommonException(
+ "could.not.find.orderformid.in.notification");
+ }
+ List<String> errors = new ArrayList<String>();
+ for (BigDecimal orderNotificationId : orderNotificationIds) {
+ OrderNotification orderNotification = getOrderNotification(orderNotificationId);
+ if (orderNotification != null) {
+ String to = orderNotification.getEmailAddress();
+ if (to == null || "".equals(to)) {
+ to = orderForm.getCustomerEmailAddress();
+ }
+ try {
+ sendOrderNotification(orderForm, to, SystemUtil
+ .getAdministratorEmail(), orderNotification
+ .getTemplateName());
+ } catch (Exception e) {
+ logger.log("EPA0004", new Object[] {}, e);
+ errors.add(orderNotification.getTemplateName() + "(" + to
+ + ")");
+ }
+ }
+ }
+ if (!errors.isEmpty()) {
+ String templates = StringUtils.join(errors.toArray(), ", ");
+ throw new CommonException("failed.to.send.some.order.notification",
+ new String[] { templates });
+ }
+ }
+
+ private ProductDescription getProdcutDescription(BigDecimal id) {
+ return getProdcutDescription(id, getLanguageService()
+ .getCurrentLanguage().getLanguageId());
+ }
+
+ private ProductDescription getProdcutDescription(BigDecimal id,
+ BigDecimal languagesId) {
+ ProductDescriptionCB cb = new ProductDescriptionCB();
+ cb.setupSelect_Product();
+
+ cb.query().setLanguageId_Equal(languagesId);
+ cb.query().setProductId_Equal(id);
+ return productDescriptionBhv.selectEntity(cb);
+ }
+
+ private void sendOrderNotification(OrderForm orderForm, String to,
+ String from, String templateName) throws CommonException {
+ try {
+ Order order = getOrderFormDxo().convert(orderForm);
+ List<OrderProduct> orderProductList = getOrderProductListByOrderFormId(orderForm
+ .getOrderFormId());
+ for (OrderProduct orderProduct : orderProductList) {
+ //TODO i18n: pass language id
+ ProductDescription productDescription = getProdcutDescription(orderProduct
+ .getProductId());
+ jp.sf.pal.pompei.entity.notification.order.Product product = new jp.sf.pal.pompei.entity.notification.order.Product();
+ getProductDxo().convert(productDescription, product);
+ getProductDxo().convert(productDescription.getProduct(),
+ product);
+ getProductDxo().convert(orderProduct, product);
+ order.addProduct(product);
+ }
+
+ // set velocity context
+ VelocityContext context = new VelocityContext();
+ context.put("order", order);
+
+ VelocityUtil.init();
+ StringWriter sw = new StringWriter();
+ String templatePath = SystemUtil
+ .getOrderNotificationTemplatePath(templateName);
+ // TODO i18n: encoding
+ Template template = VelocityUtil.getTemplate(templatePath, "UTF-8");
+
+ template.merge(context, sw);
+
+ String content = sw.toString();
+ if (content == null) {
+ throw new CommonException("notification.content.is.null");
+ }
+ int index = content.indexOf("\n");
+ String subject = null;
+ String body = null;
+ if (index != -1) {
+ subject = content.substring(0, index);
+ body = content.substring(index);
+ } else {
+ // TODO should throw exception?
+ subject = content;
+ body = content;
+ }
+
+ Properties props = System.getProperties();
+ // set smtp server
+ props.put("mail.smtp.host", SystemUtil.getSmtpHost());
+ Session session = Session.getDefaultInstance(props, null);
+ MimeMessage mimeMessage = new MimeMessage(session);
+ mimeMessage.setFrom(new InternetAddress(from));
+ mimeMessage.setRecipients(Message.RecipientType.TO, to);
+ //TODO i18n: encoding
+ mimeMessage.setSubject(subject, "iso-2022-jp");
+ //TODO i18n: encoding
+ mimeMessage.setText(body, "iso-2022-jp");
+ mimeMessage.setHeader("Content-Type", "text/plain");
+ mimeMessage.setSentDate(new Date());
+
+ Transport.send(mimeMessage);
+ } catch (Exception e) {
+ throw new CommonException("faild.to.send.order.notification", e);
+ }
+
+ }
+
+ public OrderNotification getOrderNotification(BigDecimal orderNotificationId) {
+ OrderNotificationCB cb = new OrderNotificationCB();
+ //TODO needed?
+ cb.setupSelect_OrderStatus();
+ cb.query().setOrderNotificationId_Equal(orderNotificationId);
+ return getOrderNotificationBhv().selectEntity(cb);
+ }
+
public void deleteOrderForm(OrderForm orderForm) {
BigDecimal orderFormId = orderForm.getOrderFormId();
@@ -323,9 +490,9 @@
AddressBook customerAddressBook, AddressBook deliveryAddressBook,
AddressBook billingAddressBook, PaymentMethod paymentMethod,
DeliveryMethod deliveryMethod, OrderCardInfo orderCardInfo,
- Currency currency, BigDecimal subTotalPrice,
- BigDecimal deliveryPrice, BigDecimal tax, BigDecimal totalPrice)
- throws CommonException {
+ Currency currency, BigDecimal subTotalPrice, BigDecimal tax,
+ BigDecimal deliveryPrice, BigDecimal paymentFee,
+ BigDecimal totalPrice) throws CommonException {
String orderFormNumber = null;
if (customer == null || customerBasketIdList == null
|| customerAddressBook == null || deliveryAddressBook == null
@@ -377,8 +544,9 @@
orderForm.setCurrencyCode(currency.getCode());
// price
orderForm.setSubTotalPrice(subTotalPrice);
+ orderForm.setTax(tax);
orderForm.setDeliveryPrice(deliveryPrice);
- orderForm.setTax(tax);
+ orderForm.setPaymentFee(paymentFee);
orderForm.setTotalPrice(totalPrice);
getOrderFormBhv().insert(orderForm);
@@ -458,6 +626,22 @@
return getCurrencyBhv().selectEntity(cb);
}
+ public List<OrderNotification> getOrderNotificationListByOrderFormId(
+ BigDecimal orderFormId) {
+ OrderForm of = getOrderForm(orderFormId);
+ if (of == null) {
+ return new ArrayList<OrderNotification>();
+ }
+
+ OrderNotificationCB cb = new OrderNotificationCB();
+ //TODO needed?
+ cb.setupSelect_OrderStatus();
+ cb.query().queryOrderStatus().setOrderStatusId_Equal(
+ of.getOrderStatusId());
+
+ return getOrderNotificationBhv().selectList(cb);
+ }
+
public OrderFormBhv getOrderFormBhv() {
return orderFormBhv;
}
@@ -638,4 +822,62 @@
this.orderStatusBhv = orderStatusBhv;
}
+ /**
+ * @return the orderNotificationBhv
+ */
+ public OrderNotificationBhv getOrderNotificationBhv() {
+ return orderNotificationBhv;
+ }
+
+ /**
+ * @param orderNotificationBhv the orderNotificationBhv to set
+ */
+ public void setOrderNotificationBhv(
+ OrderNotificationBhv orderNotificationBhv) {
+ this.orderNotificationBhv = orderNotificationBhv;
+ }
+
+ /**
+ * @return the productDescriptionBhv
+ */
+ public ProductDescriptionBhv getProductDescriptionBhv() {
+ return productDescriptionBhv;
+ }
+
+ /**
+ * @param productDescriptionBhv the productDescriptionBhv to set
+ */
+ public void setProductDescriptionBhv(
+ ProductDescriptionBhv productDescriptionBhv) {
+ this.productDescriptionBhv = productDescriptionBhv;
+ }
+
+ /**
+ * @return the languageService
+ */
+ public LanguageService getLanguageService() {
+ return languageService;
+ }
+
+ /**
+ * @param languageService the languageService to set
+ */
+ public void setLanguageService(LanguageService languageService) {
+ this.languageService = languageService;
+ }
+
+ /**
+ * @return the productDxo
+ */
+ public ProductDxo getProductDxo() {
+ return productDxo;
+ }
+
+ /**
+ * @param productDxo the productDxo to set
+ */
+ public void setProductDxo(ProductDxo productDxo) {
+ this.productDxo = productDxo;
+ }
+
}
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/SystemUtil.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -10,6 +10,7 @@
import jp.sf.pal.common.CommonException;
import jp.sf.pal.pompei.PompeiConstants;
+import org.apache.commons.lang.StringUtils;
import org.apache.jetspeed.administration.PortalAdministration;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.security.UserManager;
@@ -30,10 +31,38 @@
.getRequestMap().get(name);
}
+ public static String getAdministratorEmail() {
+ String url = getPortletConfig().getInitParameter(
+ PompeiConstants.ADMINISTRATOR_EMAIL);
+ if (url == null) {
+ return PompeiConstants.DEFAULT_ADMINISTRATOR_EMAIL;
+ }
+ return url;
+ }
+
+ public static String getSmtpHost() {
+ String url = getPortletConfig().getInitParameter(
+ PompeiConstants.SMTP_HOST);
+ if (url == null) {
+ return PompeiConstants.DEFAULT_SMTP_HOST;
+ }
+ return url;
+ }
+
public static String getContextRealPath(String path) {
return getPortletConfig().getPortletContext().getRealPath(path);
}
+ public static String getOrderNotificationTemplatePath(String templateName) {
+ String path = getPortletConfig().getInitParameter(
+ PompeiConstants.ORDER_NOTIFICATION_PATH);
+ if (path == null) {
+ path = PompeiConstants.DEFAULT_ORDER_NOTIFICATION_PATH;
+ }
+ // TODO i18n locale fallback
+ return path + templateName;
+ }
+
public static String getMessageDigest(String str) throws CommonException {
if (str == null) {
str = "";
Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/VelocityUtil.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/VelocityUtil.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/VelocityUtil.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -0,0 +1,233 @@
+package jp.sf.pal.pompei.util;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.Properties;
+
+import jp.sf.pal.pompei.PompeiConstants;
+
+import org.apache.commons.collections.ExtendedProperties;
+import org.apache.velocity.Template;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.context.Context;
+import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.velocity.exception.ParseErrorException;
+import org.apache.velocity.exception.ResourceNotFoundException;
+import org.apache.velocity.runtime.log.Log;
+
+public class VelocityUtil {
+ private static VelocityEngine velocityEngine;
+
+ public static void init() throws Exception {
+ if (velocityEngine == null) {
+ velocityEngine = new VelocityEngine();
+
+ Properties props = new Properties();
+ props.setProperty("resource.loader", "FILE");
+ props
+ .setProperty("FILE.resource.loader.class",
+ "org.apache.velocity.runtime.resource.loader.FileResourceLoader");
+ props.setProperty("FILE.resource.loader.cache", "true");
+ props.setProperty("FILE.resource.loader.modificationCheckInterval",
+ "60");
+ //TODO move to config file?
+ props.setProperty("FILE.resource.loader.path", SystemUtil
+ .getContextRealPath(PompeiConstants.DEFAULT_TEMPLATE_PATH));
+ velocityEngine.init(props);
+ }
+ }
+
+ /**
+ * @param key
+ * @param value
+ * @see org.apache.velocity.app.VelocityEngine#addProperty(java.lang.String, java.lang.Object)
+ */
+ public static void addProperty(String key, Object value) {
+ velocityEngine.addProperty(key, value);
+ }
+
+ /**
+ * @param key
+ * @see org.apache.velocity.app.VelocityEngine#clearProperty(java.lang.String)
+ */
+ public static void clearProperty(String key) {
+ velocityEngine.clearProperty(key);
+ }
+
+ /**
+ * @param arg0
+ * @param arg1
+ * @param arg2
+ * @param arg3
+ * @return
+ * @throws ParseErrorException
+ * @throws MethodInvocationException
+ * @throws ResourceNotFoundException
+ * @throws IOException
+ * @see org.apache.velocity.app.VelocityEngine#evaluate(org.apache.velocity.context.Context, java.io.Writer, java.lang.String, java.io.Reader)
+ */
+ public static boolean evaluate(Context arg0, Writer arg1, String arg2,
+ Reader arg3) throws ParseErrorException, MethodInvocationException,
+ ResourceNotFoundException, IOException {
+ return velocityEngine.evaluate(arg0, arg1, arg2, arg3);
+ }
+
+ /**
+ * @param context
+ * @param out
+ * @param logTag
+ * @param instring
+ * @return
+ * @throws ParseErrorException
+ * @throws MethodInvocationException
+ * @throws ResourceNotFoundException
+ * @throws IOException
+ * @see org.apache.velocity.app.VelocityEngine#evaluate(org.apache.velocity.context.Context, java.io.Writer, java.lang.String, java.lang.String)
+ */
+ public static boolean evaluate(Context context, Writer out, String logTag,
+ String instring) throws ParseErrorException,
+ MethodInvocationException, ResourceNotFoundException, IOException {
+ return velocityEngine.evaluate(context, out, logTag, instring);
+ }
+
+ /**
+ * @param key
+ * @return
+ * @see org.apache.velocity.app.VelocityEngine#getApplicationAttribute(java.lang.Object)
+ */
+ public static Object getApplicationAttribute(Object key) {
+ return velocityEngine.getApplicationAttribute(key);
+ }
+
+ /**
+ * @return
+ * @see org.apache.velocity.app.VelocityEngine#getLog()
+ */
+ public static Log getLog() {
+ return velocityEngine.getLog();
+ }
+
+ /**
+ * @param key
+ * @return
+ * @see org.apache.velocity.app.VelocityEngine#getProperty(java.lang.String)
+ */
+ public static Object getProperty(String key) {
+ return velocityEngine.getProperty(key);
+ }
+
+ /**
+ * @param name
+ * @param encoding
+ * @return
+ * @throws ResourceNotFoundException
+ * @throws ParseErrorException
+ * @throws Exception
+ * @see org.apache.velocity.app.VelocityEngine#getTemplate(java.lang.String, java.lang.String)
+ */
+ public static Template getTemplate(String name, String encoding)
+ throws ResourceNotFoundException, ParseErrorException, Exception {
+ return velocityEngine.getTemplate(name, encoding);
+ }
+
+ /**
+ * @param name
+ * @return
+ * @throws ResourceNotFoundException
+ * @throws ParseErrorException
+ * @throws Exception
+ * @see org.apache.velocity.app.VelocityEngine#getTemplate(java.lang.String)
+ */
+ public static Template getTemplate(String name)
+ throws ResourceNotFoundException, ParseErrorException, Exception {
+ return velocityEngine.getTemplate(name);
+ }
+
+ /**
+ * @param arg0
+ * @param arg1
+ * @param arg2
+ * @param arg3
+ * @param arg4
+ * @return
+ * @throws Exception
+ * @see org.apache.velocity.app.VelocityEngine#invokeVelocimacro(java.lang.String, java.lang.String, java.lang.String[], org.apache.velocity.context.Context, java.io.Writer)
+ */
+ public static boolean invokeVelocimacro(String arg0, String arg1,
+ String[] arg2, Context arg3, Writer arg4) throws Exception {
+ return velocityEngine.invokeVelocimacro(arg0, arg1, arg2, arg3, arg4);
+ }
+
+ /**
+ * @param templateName
+ * @param context
+ * @param writer
+ * @return
+ * @throws ResourceNotFoundException
+ * @throws ParseErrorException
+ * @throws MethodInvocationException
+ * @throws Exception
+ * @see org.apache.velocity.app.VelocityEngine#mergeTemplate(java.lang.String, org.apache.velocity.context.Context, java.io.Writer)
+ */
+ public static boolean mergeTemplate(String templateName, Context context,
+ Writer writer) throws ResourceNotFoundException,
+ ParseErrorException, MethodInvocationException, Exception {
+ return velocityEngine.mergeTemplate(templateName, context, writer);
+ }
+
+ /**
+ * @param templateName
+ * @param encoding
+ * @param context
+ * @param writer
+ * @return
+ * @throws ResourceNotFoundException
+ * @throws ParseErrorException
+ * @throws MethodInvocationException
+ * @throws Exception
+ * @see org.apache.velocity.app.VelocityEngine#mergeTemplate(java.lang.String, java.lang.String, org.apache.velocity.context.Context, java.io.Writer)
+ */
+ public static boolean mergeTemplate(String templateName, String encoding,
+ Context context, Writer writer) throws ResourceNotFoundException,
+ ParseErrorException, MethodInvocationException, Exception {
+ return velocityEngine.mergeTemplate(templateName, encoding, context,
+ writer);
+ }
+
+ /**
+ * @param resourceName
+ * @return
+ * @see org.apache.velocity.app.VelocityEngine#resourceExists(java.lang.String)
+ */
+ public static boolean resourceExists(String resourceName) {
+ return velocityEngine.resourceExists(resourceName);
+ }
+
+ /**
+ * @param key
+ * @param value
+ * @see org.apache.velocity.app.VelocityEngine#setApplicationAttribute(java.lang.Object, java.lang.Object)
+ */
+ public static void setApplicationAttribute(Object key, Object value) {
+ velocityEngine.setApplicationAttribute(key, value);
+ }
+
+ /**
+ * @param configuration
+ * @see org.apache.velocity.app.VelocityEngine#setExtendedProperties(org.apache.commons.collections.ExtendedProperties)
+ */
+ public static void setExtendedProperties(ExtendedProperties configuration) {
+ velocityEngine.setExtendedProperties(configuration);
+ }
+
+ /**
+ * @param key
+ * @param value
+ * @see org.apache.velocity.app.VelocityEngine#setProperty(java.lang.String, java.lang.Object)
+ */
+ public static void setProperty(String key, Object value) {
+ velocityEngine.setProperty(key, value);
+ }
+
+}
Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/util/VelocityUtil.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/AbstractOrderEditPage.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -120,6 +120,8 @@
private String deliveryTelephone;
+ private String deliveryNumber;
+
@DateTimeConverter(pattern = "yyyy/MM/dd")
private Date finishedDate;
@@ -138,6 +140,8 @@
private BigDecimal paymentMethodId;
+ private BigDecimal paymentFee;
+
@DateTimeConverter(pattern = "yyyy/MM/dd")
private Date purchasedDate;
@@ -862,4 +866,32 @@
this.deliveryLastnameDescription = deliveryLastnameDescription;
}
+ /**
+ * @return the deliveryNumber
+ */
+ public String getDeliveryNumber() {
+ return deliveryNumber;
+ }
+
+ /**
+ * @param deliveryNumber the deliveryNumber to set
+ */
+ public void setDeliveryNumber(String deliveryNumber) {
+ this.deliveryNumber = deliveryNumber;
+ }
+
+ /**
+ * @return the paymentFee
+ */
+ public BigDecimal getPaymentFee() {
+ return paymentFee;
+ }
+
+ /**
+ * @param paymentFee the paymentFee to set
+ */
+ public void setPaymentFee(BigDecimal paymentFee) {
+ this.paymentFee = paymentFee;
+ }
+
}
\ No newline at end of file
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderConfirmAction.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -8,10 +8,14 @@
import jp.sf.pal.pompei.dxo.OrderFormDxo;
import jp.sf.pal.pompei.exentity.OrderCardInfo;
import jp.sf.pal.pompei.exentity.OrderForm;
+import jp.sf.pal.pompei.exentity.OrderNotification;
import jp.sf.pal.pompei.exentity.OrderStatusDescription;
import jp.sf.pal.pompei.service.LanguageService;
import jp.sf.pal.pompei.service.OrderService;
+import org.seasar.teeda.extension.annotation.takeover.TakeOver;
+import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
+
public class OrderConfirmAction implements Serializable {
/**
@@ -81,7 +85,8 @@
}
}
- public Class<?> doFinish() {
+ @TakeOver(type = TakeOverType.INCLUDE, properties = "orderFormId")
+ public Class<?> doUpdate() {
if (isUpdate()) {
// order form
OrderForm orderForm = getOrderService().getOrderForm(
@@ -111,7 +116,16 @@
FacesMessageUtil
.addInfoMessage("updated.order.info.in.orderconfirm");
- return OrderListPage.class;
+
+ List<OrderNotification> orderNotificationList = getOrderService()
+ .getOrderNotificationListByOrderFormId(
+ getOrderConfirmPage().getOrderFormId());
+ if (orderNotificationList != null
+ && !orderNotificationList.isEmpty()) {
+ return OrderNotificationSelectPage.class;
+ } else {
+ return OrderListPage.class;
+ }
} else if (isDelete()) {
// order form
OrderForm orderForm = getOrderService().getOrderForm(
Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectAction.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectAction.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -0,0 +1,122 @@
+package jp.sf.pal.pompei.web.admin.order;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import jp.sf.pal.common.CommonException;
+import jp.sf.pal.common.util.FacesMessageUtil;
+import jp.sf.pal.pompei.PompeiConstants;
+import jp.sf.pal.pompei.exentity.OrderForm;
+import jp.sf.pal.pompei.exentity.OrderNotification;
+import jp.sf.pal.pompei.service.OrderService;
+
+public class OrderNotificationSelectAction implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -8099143241154630299L;
+
+ /**
+ *
+ */
+ private OrderNotificationSelectPage orderNotificationSelectPage;
+
+ private OrderService orderService;
+
+ public Class<?> initialize() {
+ return null;
+ }
+
+ public Class<?> prerender() {
+ if (getOrderNotificationSelectPage().getOrderFormId() == null) {
+ FacesMessageUtil.addErrorMessage("orderformid.is.null");
+ return OrderListPage.class;
+ }
+ OrderForm orderForm = getOrderService().getOrderForm(
+ getOrderNotificationSelectPage().getOrderFormId());
+ if (orderForm == null) {
+ FacesMessageUtil.addErrorMessage("could.not.find.orderformid");
+ return OrderListPage.class;
+ }
+
+ List<OrderNotification> orderNotificationList = getOrderService()
+ .getOrderNotificationListByOrderFormId(
+ orderForm.getOrderFormId());
+ List<Map<String, String>> orderNotificationIdsItems = new ArrayList<Map<String, String>>();
+ for (OrderNotification orderNotification : orderNotificationList) {
+ Map<String, String> map = new HashMap<String, String>();
+ StringBuilder sb = new StringBuilder();
+ //TODO alignment?
+ sb.append(orderNotification.getTemplateName()).append(" (");
+ if (orderNotification.getEmailAddress() != null) {
+ sb.append(orderNotification.getEmailAddress());
+ } else {
+ sb.append(getOrderNotificationSelectPage().getLabelHelper()
+ .getLabelValue("to_customer"));
+ }
+ sb.append(")");
+ map.put(PompeiConstants.LABEL, sb.toString());
+ map.put(PompeiConstants.VALUE, orderNotification
+ .getOrderNotificationId().toString());
+ orderNotificationIdsItems.add(map);
+ }
+ getOrderNotificationSelectPage().setOrderNotificationIdsItems(
+ orderNotificationIdsItems);
+
+ // render faces messages
+ FacesMessageUtil.renderMessages();
+ return null;
+ }
+
+ public Class<?> doSend() {
+ try {
+ getOrderService().sendOrderNotifications(
+ getOrderNotificationSelectPage().getOrderFormId(),
+ getOrderNotificationSelectPage().getOrderNotificationIds());
+ FacesMessageUtil.addInfoMessage("sent.order.notifications");
+ //TODO test
+ // return OrderListPage.class;
+ } catch (CommonException e) {
+ if (e.getArgs() != null) {
+ FacesMessageUtil.addErrorMessage(e.getMessageId(), e.getArgs());
+ } else {
+ FacesMessageUtil.addErrorMessage(e.getMessageId());
+ }
+ }
+ return null;
+ }
+
+ /**
+ * @return the orderNotificationSelectPage
+ */
+ public OrderNotificationSelectPage getOrderNotificationSelectPage() {
+ return orderNotificationSelectPage;
+ }
+
+ /**
+ * @param orderNotificationSelectPage the orderNotificationSelectPage to set
+ */
+ public void setOrderNotificationSelectPage(
+ OrderNotificationSelectPage orderNotificationSelectPage) {
+ this.orderNotificationSelectPage = orderNotificationSelectPage;
+ }
+
+ /**
+ * @return the orderService
+ */
+ public OrderService getOrderService() {
+ return orderService;
+ }
+
+ /**
+ * @param orderService the orderService to set
+ */
+ public void setOrderService(OrderService orderService) {
+ this.orderService = orderService;
+ }
+
+}
Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectAction.java
___________________________________________________________________
Name: svn:eol-style
+ native
Added: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectPage.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectPage.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectPage.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -0,0 +1,70 @@
+package jp.sf.pal.pompei.web.admin.order;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+import org.seasar.teeda.extension.util.LabelHelper;
+
+public class OrderNotificationSelectPage implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1490863696155845975L;
+
+ private LabelHelper labelHelper;
+
+ private BigDecimal orderFormId;
+
+ private BigDecimal[] orderNotificationIds;
+
+ private List<Map<String, String>> orderNotificationIdsItems;
+
+ public BigDecimal getOrderFormId() {
+ return orderFormId;
+ }
+
+ public void setOrderFormId(BigDecimal orderFormId) {
+ this.orderFormId = orderFormId;
+ }
+
+ public List<Map<String, String>> getOrderNotificationIdsItems() {
+ return orderNotificationIdsItems;
+ }
+
+ public void setOrderNotificationIdsItems(
+ List<Map<String, String>> orderNotificationIdsItems) {
+ this.orderNotificationIdsItems = orderNotificationIdsItems;
+ }
+
+ /**
+ * @return the orderNotificationIds
+ */
+ public BigDecimal[] getOrderNotificationIds() {
+ return orderNotificationIds;
+ }
+
+ /**
+ * @param orderNotificationIds the orderNotificationIds to set
+ */
+ public void setOrderNotificationIds(BigDecimal[] orderNotificationIds) {
+ this.orderNotificationIds = orderNotificationIds;
+ }
+
+ /**
+ * @return the labelHelper
+ */
+ public LabelHelper getLabelHelper() {
+ return labelHelper;
+ }
+
+ /**
+ * @param labelHelper the labelHelper to set
+ */
+ public void setLabelHelper(LabelHelper labelHelper) {
+ this.labelHelper = labelHelper;
+ }
+
+}
Property changes on: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/admin/order/OrderNotificationSelectPage.java
___________________________________________________________________
Name: svn:eol-style
+ native
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-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmAction.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -195,6 +195,13 @@
}
getCheckoutConfirmPage().setPaymentMethodName(pmd.getName());
+ // payment fee
+ BigDecimal paymentFee = PompeiConstants.DEFAULT_PAYMENT_FEE;
+ if (pmd.getPaymentMethod().getFee() != null) {
+ paymentFee = pmd.getPaymentMethod().getFee();
+ }
+ getCheckoutConfirmPage().setPaymentFee(paymentFee);
+
// deliveryMethod
BigDecimal deliveryMethodId = (BigDecimal) orderProcessMap
.get(PompeiConstants.DELIVERY_METHOD_ID);
@@ -237,7 +244,7 @@
// total
getCheckoutConfirmPage().setTotalPrice(
- subTotalPrice.add(tax).add(deliveryPrice));
+ subTotalPrice.add(tax).add(deliveryPrice).add(paymentFee));
// render FacesMessages
FacesMessageUtil.renderMessages();
@@ -322,8 +329,9 @@
pmd.getPaymentMethod(), dmd.getDeliveryMethod(),
orderCardInfo, currency,
getCheckoutConfirmPage().getSubTotalPrice(),
+ getCheckoutConfirmPage().getTax(),
getCheckoutConfirmPage().getDeliveryPrice(),
- getCheckoutConfirmPage().getTax(),
+ getCheckoutConfirmPage().getPaymentFee(),
getCheckoutConfirmPage().getTotalPrice());
getCheckoutConfirmPage().setOrderFormNumber(orderFormNumber);
} catch (CommonException e) {
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-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/checkout/CheckoutConfirmPage.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -25,6 +25,10 @@
@BigDecimalConverter(pattern = "###,###")
private BigDecimal deliveryPrice;
+ //TODO i18n
+ @BigDecimalConverter(pattern = "###,###")
+ private BigDecimal paymentFee;
+
private String cellphone;
private String city;
@@ -323,4 +327,18 @@
public void setDepartment(String department) {
this.department = department;
}
+
+ /**
+ * @return the paymentFee
+ */
+ public BigDecimal getPaymentFee() {
+ return paymentFee;
+ }
+
+ /**
+ * @param paymentFee the paymentFee to set
+ */
+ public void setPaymentFee(BigDecimal paymentFee) {
+ this.paymentFee = paymentFee;
+ }
}
Modified: pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/java/jp/sf/pal/pompei/web/user/signup/SignupEditAction.java 2007-10-13 22:48:08 UTC (rev 628)
@@ -128,13 +128,13 @@
}
} catch (UnsupportedEncodingException e) {
FacesMessageUtil.addErrorMessage("could.not.read.term.of.service");
- logger.log("EPA0004", new Object[] { this.toString() }, e);
+ logger.log("EPC0001", new Object[] { this.toString() }, e);
} catch (FileNotFoundException e) {
FacesMessageUtil.addErrorMessage("could.not.read.term.of.service");
- logger.log("EPA0004", new Object[] { this.toString() }, e);
+ logger.log("EPC0002", new Object[] { this.toString() }, e);
} catch (IOException e) {
FacesMessageUtil.addErrorMessage("could.not.read.term.of.service");
- logger.log("EPA0004", new Object[] { this.toString() }, e);
+ logger.log("EPC0003", new Object[] { this.toString() }, e);
} finally {
if (reader != null) {
try {
Added: pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties 2007-10-13 22:48:08 UTC (rev 628)
@@ -0,0 +1,4 @@
+EPA0001=Could not read a term of service.
+EPA0002=Could not read a term of service.
+EPA0003=Could not read a term of service.
+EPA0004=Could not send order notification.
Property changes on: pompei/portlets/pompei-core/trunk/src/main/resources/PCMessages.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/resources/appMessages.properties 2007-10-13 22:48:08 UTC (rev 628)
@@ -144,3 +144,13 @@
could.not.create.user.by.system.error=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
could.not.insert.customer.data=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+# OrderNotificationSelect.java
+orderformid.is.null=\u6307\u5b9a\u3055\u308c\u305f\u6ce8\u6587ID\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.find.orderformid=\u6307\u5b9a\u3055\u308c\u305f\u6ce8\u6587\u60c5\u5831\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+orderFormId.is.null.in.notification=\u6307\u5b9a\u3055\u308c\u305f\u6ce8\u6587ID\u304c\u6b63\u3057\u304f\u3042\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+could.not.find.orderformid.in.notification=\u6307\u5b9a\u3055\u308c\u305f\u6ce8\u6587\u60c5\u5831\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002\u518d\u5ea6\u3001\u8a66\u3057\u3066\u3082\u3001\u3053\u306e\u554f\u984c\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306b\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+notification.content.is.null=\u6ce8\u6587\u901a\u77e5\u306e\u30b3\u30f3\u30c6\u30f3\u30c4\u304c\u751f\u6210\u3067\u304d\u307e\u305b\u3093\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+faild.to.send.order.notification=\u6ce8\u6587\u901a\u77e5\u306e\u9001\u4fe1\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002
+failed.to.send.some.order.notification=\u6b21\u306e\u6ce8\u6587\u901a\u77e5\u306e\u9001\u4fe1\u306b\u5931\u6557\u3057\u307e\u3057\u305f: {0}
+sent.order.notifications=\u6ce8\u6587\u901a\u77e5\u3092\u9001\u4fe1\u3057\u307e\u3057\u305f\u3002
+
Modified: pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/label.properties
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/label.properties 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/resources/jp/sf/pal/pompei/web/admin/order/label.properties 2007-10-13 22:48:08 UTC (rev 628)
@@ -5,3 +5,6 @@
M=\u7537\u6027
F=\u5973\u6027
state.items=\u5317\u6d77\u9053,\u9752\u68ee\u770c,\u5ca9\u624b\u770c,\u5bae\u57ce\u770c,\u79cb\u7530\u770c,\u5c71\u5f62\u770c,\u798f\u5cf6\u770c,\u8328\u57ce\u770c,\u6803\u6728\u770c,\u7fa4\u99ac\u770c,\u57fc\u7389\u770c,\u5343\u8449\u770c,\u6771\u4eac\u90fd,\u795e\u5948\u5ddd\u770c,\u65b0\u6f5f\u770c,\u5bcc\u5c71\u770c,\u77f3\u5ddd\u770c,\u798f\u4e95\u770c,\u5c71\u68a8\u770c,\u9577\u91ce\u770c,\u5c90\u961c\u770c,\u9759\u5ca1\u770c,\u611b\u77e5\u770c,\u4e09\u91cd\u770c,\u6ecb\u8cc0\u770c,\u4eac\u90fd\u5e9c,\u5927\u962a\u5e9c,\u5175\u5eab\u770c,\u5948\u826f\u770c,\u548c\u6b4c\u5c71\u770c,\u9ce5\u53d6\u770c,\u5cf6\u6839\u770c,\u5ca1\u5c71\u770c,\u5e83\u5cf6\u770c,\u5c71\u53e3\u770c,\u5fb3\u5cf6\u770c,\u9999\u5ddd\u770c,\u611b\u5a9b\u770c,\u9ad8\u77e5\u770c,\u798f\u5ca1\u770c,\u4f50\u8cc0\u770c,\u9577\u5d0e\u770c,\u718a\u672c\u770c,\u5927\u5206\u770c,\u5bae\u5d0e\u770c,\u9e7f\u5150\u5cf6\u770c,\u6c96\u7e04\u770c,
+
+none=\u306a\u3057
+to_customer=\u9867\u5ba2\u5b9b
\ No newline at end of file
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/create_table.sql 2007-10-13 22:48:08 UTC (rev 628)
@@ -95,6 +95,7 @@
CREATE TABLE PAYMENT_METHOD (
PAYMENT_METHOD_ID INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY (START WITH 100, INCREMENT BY 1)
, CODE VARCHAR(16) NOT NULL
+ , FEE DECIMAL(14, 6) NOT NULL
, SORT_ORDER INTEGER NOT NULL
, DATE_ADDED TIMESTAMP NOT NULL
, LAST_MODIFIED TIMESTAMP NOT NULL
@@ -182,15 +183,17 @@
, ORDER_CARD_INFO_ID BIGINT
, DELIVERY_METHOD_ID INTEGER
, DELIVERY_METHOD_CODE VARCHAR(16) NOT NULL
+ , DELIVERY_NUMBER VARCHAR(32)
, LAST_MODIFIED TIMESTAMP NOT NULL
, ORDER_STATUS_ID INTEGER NOT NULL
, PURCHASED_DATE TIMESTAMP NOT NULL
, FINISHED_DATE TIMESTAMP
, CURRENCY_ID INTEGER
, CURRENCY_CODE CHAR(3) NOT NULL
- , DELIVERY_PRICE DECIMAL(14, 6)
, SUB_TOTAL_PRICE DECIMAL(14, 6)
, TAX DECIMAL(14, 6)
+ , DELIVERY_PRICE DECIMAL(14, 6)
+ , PAYMENT_FEE DECIMAL(14, 6)
, TOTAL_PRICE DECIMAL(14, 6) NOT NULL
, PRIMARY KEY (ORDER_FORM_ID)
);
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-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/db/insert_data.sql 2007-10-13 22:48:08 UTC (rev 628)
@@ -20,6 +20,11 @@
INSERT INTO ORDER_STATUS_DESCRIPTION VALUES ( 5, 1, '出荷完了','');
INSERT INTO ORDER_STATUS_DESCRIPTION VALUES ( 6, 1, '保留','');
+INSERT INTO ORDER_NOTIFICATION VALUES ( 1, 1, null, 'new-order-to-customer.vm',1);
+INSERT INTO ORDER_NOTIFICATION VALUES ( 2, 5, null, 'completed-order-to-customer.vm',1);
+--INSERT INTO ORDER_NOTIFICATION VALUES ( 3, 1, '', 'new-order-to-admin.vm',1);
+--INSERT INTO ORDER_NOTIFICATION VALUES ( 4, 1, '', 'completed-order-to-admin.vm',1);
+
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');
Added: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/completed-order-to-admin.vm
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/completed-order-to-admin.vm 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/completed-order-to-admin.vm 2007-10-13 22:48:08 UTC (rev 628)
@@ -0,0 +1,47 @@
+【Pompei】ご注文商品発送のお知らせ (管理用)
+${order.customerLastname} ${order.customerFirstname} 様
+
+#if(${order.paymentMethodCode} == 'BANK')ご入金いただきましてありがとうございました。#end
+Pompei 商品をご注文いただき、誠にありがとうございました。
+
+ご注文商品を発送させていただきましたのでご連絡させていただきます。
+商品到着まで、もうしばらくお待ち下さい。
+
+【ご注文内容】
+---------------------------------------------------------------
+・ご注文番号 ${order.orderFormNumber}
+・ご注文主のお名前 ${order.customerLastname} ${order.customerFirstname} 様
+・ご注文日 ${order.formatDate(${order.purchasedDate})}
+
+・お届け先のお名前 ${order.deliveryLastname} ${order.deliveryFirstname} 様
+・商品のお届け先
+ 〒${order.deliveryPostcode} ${order.deliveryState}${order.deliveryCity}
+ ${order.deliveryStreetAddress}
+
+
+【発送させていただいた商品】
+---------------------------------------------------------------
+#foreach($product in ${order.products})
+商品名 ${product.name}
+数量 ${product.quantity} 個
+
+#end
+
+【配送について】
+---------------------------------------------------------------
+商品は「Pompei急便」が配送させていただきます。
+商品の配送状況は、Pompei急便のホームページでご確認いただけます。
+
+お問い合わせNo. ${order.deliveryNumber}
+http://pal.sourceforge.jp/
+
+
+今後とも Pompei をご利用いただけますようお願い申し上げます。
+本日はご注文いただきありがとうございました。
+
+このメールの内容についてのお問い合わせは、
+下記の連絡先までお願いします。
+
+--
+Pompei Project
+http://pal.sourceforge.jp/
Added: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/completed-order-to-customer.vm
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/completed-order-to-customer.vm 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/completed-order-to-customer.vm 2007-10-13 22:48:08 UTC (rev 628)
@@ -0,0 +1,47 @@
+【Pompei】ご注文商品発送のお知らせ
+${order.customerLastname} ${order.customerFirstname} 様
+
+#if(${order.paymentMethodCode} == 'BANK')ご入金いただきましてありがとうございました。#end
+Pompei 商品をご注文いただき、誠にありがとうございました。
+
+ご注文商品を発送させていただきましたのでご連絡させていただきます。
+商品到着まで、もうしばらくお待ち下さい。
+
+【ご注文内容】
+---------------------------------------------------------------
+・ご注文番号 ${order.orderFormNumber}
+・ご注文主のお名前 ${order.customerLastname} ${order.customerFirstname} 様
+・ご注文日 ${order.formatDate(${order.purchasedDate})}
+
+・お届け先のお名前 ${order.deliveryLastname} ${order.deliveryFirstname} 様
+・商品のお届け先
+ 〒${order.deliveryPostcode} ${order.deliveryState}${order.deliveryCity}
+ ${order.deliveryStreetAddress}
+
+
+【発送させていただいた商品】
+---------------------------------------------------------------
+#foreach($product in ${order.products})
+商品名 ${product.name}
+数量 ${product.quantity} 個
+
+#end
+
+【配送について】
+---------------------------------------------------------------
+商品は「Pompei急便」が配送させていただきます。
+商品の配送状況は、Pompei急便のホームページでご確認いただけます。
+
+お問い合わせNo. ${order.deliveryNumber}
+http://pal.sourceforge.jp/
+
+
+今後とも Pompei をご利用いただけますようお願い申し上げます。
+本日はご注文いただきありがとうございました。
+
+このメールの内容についてのお問い合わせは、
+下記の連絡先までお願いします。
+
+--
+Pompei Project
+http://pal.sourceforge.jp/
Added: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/new-order-to-admin.vm
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/new-order-to-admin.vm 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/new-order-to-admin.vm 2007-10-13 22:48:08 UTC (rev 628)
@@ -0,0 +1,73 @@
+【Pompei】ご注文確認メール (管理用)
+${order.customerLastname} ${order.customerFirstname} 様
+
+Pompei 商品をご注文いただき、誠にありがとうございます。
+
+下記の内容でご注文を承りました。
+ご注文内容をご確認ください。
+
+【ご注文内容】
+---------------------------------------------------------------
+・ご注文番号 ${order.orderFormNumber}
+・ご注文主のお名前 ${order.customerLastname} ${order.customerFirstname} 様
+・ご注文日 ${order.formatDate(${order.purchasedDate})}
+
+・お届け先のお名前 ${order.deliveryLastname} ${order.deliveryFirstname} 様
+・商品のお届け先
+ 〒${order.deliveryPostcode} ${order.deliveryState}${order.deliveryCity}
+ ${order.deliveryStreetAddress}
+
+
+#if(${order.paymentMethodCode} == 'BANK')
+【お支払い方法】 銀行振込み
+---------------------------------------------------------------
+下記口座までお振込み下さい。入金確認後、商品を発送させていただきます。
+なお、恐れ入りますが振込み手数料はお客様負担とさせていただきます。
+
+ポンペイ銀行 本店事業部 普通 1234567
+#end
+#if(${order.paymentMethodCode} == 'COD')
+【お支払い方法】 代引き
+---------------------------------------------------------------
+代金は、商品と引き換えに運送会社の担当者にお支払い下さい。
+#end
+
+
+【ご注文商品】
+---------------------------------------------------------------
+#foreach($product in ${order.products})
+商品名 ${product.name}
+数量 ${product.quantity} 個
+価格 ${order.formatPrice(${product.finalPrice})} 円
+
+#end
+
+【ご注文金額】 合計お支払い金額
+---------------------------------------------------------------
+・商品の合計金額 ${order.formatPrice(${order.subTotalPrice})} 円
+・消費税 ${order.formatPrice(${order.tax})} 円
+・配送料 ${order.formatPrice(${order.deliveryPrice})} 円
+#if(${order.paymentMethodCode} == 'COD')・代引手数料 ${order.formatPrice(${order.paymentFee})} 円
+#end・ご注文金額合計 ${order.formatPrice(${order.totalPrice})} 円
+
+
+ご注文いただいた商品は、取次ぎ会社、または、製造元における
+在庫切れのため、お届けできない場合がございます。
+在庫切れとなりました場合は、やむを得ず、在庫切れとなった商品を
+キャンセルとさせていただきます。
+出荷及び在庫切れのご連絡につきましては、改めてメールにて
+ご案内させていただきます。
+
+また、ご注文のみでは、契約が確定したわけではございません。
+出荷が確定した時点で、契約完了となります。
+恐れ入りますが、あわせてご了承くださいますようお願い申し上げます。
+
+今後とも Pompei をご利用いただけますようお願い申し上げます。
+本日はご注文いただきありがとうございました。
+
+このメールの内容についてのお問い合わせは、
+下記の連絡先までお願いします。
+
+--
+Pompei Project
+http://pal.sourceforge.jp/
Added: pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/new-order-to-customer.vm
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/new-order-to-customer.vm 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/WEB-INF/template/notification/order/new-order-to-customer.vm 2007-10-13 22:48:08 UTC (rev 628)
@@ -0,0 +1,73 @@
+【Pompei】ご注文確認メール
+${order.customerLastname} ${order.customerFirstname} 様
+
+Pompei 商品をご注文いただき、誠にありがとうございます。
+
+下記の内容でご注文を承りました。
+ご注文内容をご確認ください。
+
+【ご注文内容】
+---------------------------------------------------------------
+・ご注文番号 ${order.orderFormNumber}
+・ご注文主のお名前 ${order.customerLastname} ${order.customerFirstname} 様
+・ご注文日 ${order.formatDate(${order.purchasedDate})}
+
+・お届け先のお名前 ${order.deliveryLastname} ${order.deliveryFirstname} 様
+・商品のお届け先
+ 〒${order.deliveryPostcode} ${order.deliveryState}${order.deliveryCity}
+ ${order.deliveryStreetAddress}
+
+
+#if(${order.paymentMethodCode} == 'BANK')
+【お支払い方法】 銀行振込み
+---------------------------------------------------------------
+下記口座までお振込み下さい。入金確認後、商品を発送させていただきます。
+なお、恐れ入りますが振込み手数料はお客様負担とさせていただきます。
+
+ポンペイ銀行 本店事業部 普通 1234567
+#end
+#if(${order.paymentMethodCode} == 'COD')
+【お支払い方法】 代引き
+---------------------------------------------------------------
+代金は、商品と引き換えに運送会社の担当者にお支払い下さい。
+#end
+
+
+【ご注文商品】
+---------------------------------------------------------------
+#foreach($product in ${order.products})
+商品名 ${product.name}
+数量 ${product.quantity} 個
+価格 ${order.formatPrice(${product.finalPrice})} 円
+
+#end
+
+【ご注文金額】 合計お支払い金額
+---------------------------------------------------------------
+・商品の合計金額 ${order.formatPrice(${order.subTotalPrice})} 円
+・消費税 ${order.formatPrice(${order.tax})} 円
+・配送料 ${order.formatPrice(${order.deliveryPrice})} 円
+#if(${order.paymentMethodCode} == 'COD')・代引手数料 ${order.formatPrice(${order.paymentFee})} 円
+#end・ご注文金額合計 ${order.formatPrice(${order.totalPrice})} 円
+
+
+ご注文いただいた商品は、取次ぎ会社、または、製造元における
+在庫切れのため、お届けできない場合がございます。
+在庫切れとなりました場合は、やむを得ず、在庫切れとなった商品を
+キャンセルとさせていただきます。
+出荷及び在庫切れのご連絡につきましては、改めてメールにて
+ご案内させていただきます。
+
+また、ご注文のみでは、契約が確定したわけではございません。
+出荷が確定した時点で、契約完了となります。
+恐れ入りますが、あわせてご了承くださいますようお願い申し上げます。
+
+今後とも Pompei をご利用いただけますようお願い申し上げます。
+本日はご注文いただきありがとうございました。
+
+このメールの内容についてのお問い合わせは、
+下記の連絡先までお願いします。
+
+--
+Pompei Project
+http://pal.sourceforge.jp/
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderConfirm.html 2007-10-13 22:48:08 UTC (rev 628)
@@ -57,9 +57,9 @@
</td>
</tr>
<tr>
- <th>配送料金:</th>
+ <th>配送お問い合わせ番号:</th>
<td>
- <b style="color: #990000;"><span id="deliveryPrice-display">abc</span></b><input type="hidden" id="deliveryPrice"/>
+ <span id="deliveryNumber-display">abc</span><input type="hidden" id="deliveryNumber"/>
</td>
</tr>
<tr>
@@ -75,6 +75,18 @@
</td>
</tr>
<tr>
+ <th>配送料金:</th>
+ <td>
+ <b style="color: #990000;"><span id="deliveryPrice-display">abc</span></b><input type="hidden" id="deliveryPrice"/>
+ </td>
+ </tr>
+ <tr>
+ <th>代引き手数料:</th>
+ <td>
+ <b style="color: #990000;"><span id="paymentFee-display">abc</span></b><input type="hidden" id="paymentFee"/>
+ </td>
+ </tr>
+ <tr>
<th>合計:</th>
<td>
<b style="color: #990000;"><span id="totalPrice-display">abc</span></b><input type="hidden" id="totalPrice"/>
@@ -475,7 +487,7 @@
<br/>
<br/>
<div style="width: 100%;text-align: center;">
- <input type="submit" id="doFinish" value="完了" />
+ <input type="submit" id="doUpdate" value="完了" />
<input type="submit" id="jumpOrderList" value="一覧に戻る" />
</div>
</div>
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-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderEdit.html 2007-10-13 22:48:08 UTC (rev 628)
@@ -59,9 +59,9 @@
</td>
</tr>
<tr>
- <th>配送料金:</th>
+ <th>配送お問い合わせ番号:</th>
<td>
- <input type="text" id="deliveryPrice" size="14"/>
+ <input type="text" id="deliveryNumber" size="20"/>
</td>
</tr>
<tr>
@@ -77,6 +77,18 @@
</td>
</tr>
<tr>
+ <th>配送料金:</th>
+ <td>
+ <input type="text" id="deliveryPrice" size="14"/>
+ </td>
+ </tr>
+ <tr>
+ <th>代引手数料:</th>
+ <td>
+ <input type="text" id="paymentFee" size="14"/>
+ </td>
+ </tr>
+ <tr>
<th><b style="color: #990000;">合計:</b></th>
<td>
<input type="text" id="totalPrice" size="14"/>
Modified: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderList.html 2007-10-13 22:48:08 UTC (rev 628)
@@ -247,6 +247,7 @@
<span id="lastModified">2000/01/01</span>
</td>
<td align="center">
+ <a id="goOrderNotificationSelect" href="./orderNotificationSelect.html?orderFormId=0">通知</a>
<a id="goOrderEdit" href="./orderEdit.html?orderFormId=0&fixed_mode=update">編集</a>
<a id="goOrderDelete" href="./orderConfirm.html?orderFormId=0&fixed_mode=delete">削除</a>
</td>
Added: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderNotificationSelect.html
===================================================================
--- pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderNotificationSelect.html 2007-10-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderNotificationSelect.html 2007-10-13 22:48:08 UTC (rev 628)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <title>注文通知選択</title>
+ </head>
+ <body>
+ <form id="orderNotificationSelectForm" method="post">
+ <input type="hidden" id="orderFormId"/>
+ <div style="width:100%;">
+ <center>
+ <div style="width:80%;text-align: left;">
+ <div class="portlet-msg">
+ <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
+ </div>
+ <br/>
+ <div style="font-size: 14pt;font-weight: bold;"><span style="color:#ff9900;">1.</span> 送信する通知を選択してください</div>
+ <table style="border-top: 1px solid silver;border-bottom: 1px solid silver;width: 100%;">
+ <tr>
+ <td width="10" bgcolor="#ffd153"> </td>
+ <td width="100" bgcolor="#fff1a1" valign="top" align="center">
+ <label>通知</label>
+ </td>
+ <td>
+ <label>テンプレート名(送信先)</label>
+ <select id="orderNotificationIds" multiple="multiple" size="10" style="width: 100%;">
+ <option>abc</option>
+ </select>
+ </td>
+ </tr>
+ </table>
+ <br/>
+ <br/>
+ <div style="width: 100%;text-align: center;">
+ <input type="submit" id="doSend" value="選択した通知を送信する" />
+ <input type="submit" id="jumpOrderList" value="一覧に戻る" />
+ </div>
+ </div>
+ </center>
+ </div>
+ </form>
+ </body>
+</html>
Property changes on: pompei/portlets/pompei-core/trunk/src/main/webapp/view/admin/order/orderNotificationSelect.html
___________________________________________________________________
Name: svn:eol-style
+ native
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-13 22:41:36 UTC (rev 627)
+++ pompei/portlets/pompei-core/trunk/src/main/webapp/view/user/checkout/checkoutConfirm.html 2007-10-13 22:48:08 UTC (rev 628)
@@ -86,6 +86,13 @@
</td>
</tr>
<tr>
+ <td colspan="4" align="right">消費税</td>
+ <td colspan="2" align="right">
+ <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">
<b style="color: #990000;"><span id="deliveryPrice">1000</span></b>
@@ -93,10 +100,10 @@
</td>
</tr>
<tr>
- <td colspan="4" align="right">消費税</td>
+ <td colspan="4" align="right">代引手数料</td>
<td colspan="2" align="right">
- <b style="color: #990000;"><span id="tax">50</span></b>
- <input type="hidden" id="tax-hidden" />
+ <b style="color: #990000;"><span id="paymentFee">1000</span></b>
+ <input type="hidden" id="paymentFee-hidden" />
</td>
</tr>
<tr>