You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by si...@apache.org on 2006/07/14 03:23:54 UTC
svn commit: r421780 - in /incubator/ofbiz/trunk/applications:
accounting/entitydef/ accounting/script/org/ofbiz/accounting/payment/
accounting/servicedef/ accounting/src/org/ofbiz/accounting/payment/
ecommerce/config/ ecommerce/webapp/ecommerce/WEB-INF...
Author: sichen
Date: Thu Jul 13 18:23:49 2006
New Revision: 421780
URL: http://svn.apache.org/viewvc?rev=421780&view=rev
Log:
OFBIZ-81: Add PaymentMethod.description field to describe individual payment methods. For example, a customer may want to describe a CC as a "primary card". Added support for this field wherever payment methods are created/updated. Display this field in ordermgr checkout, ecommerce checkout, and partymgr viewprofile. Thanks to Ashish Vijaywargiya.
Modified:
incubator/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml
incubator/ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml
incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java
incubator/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editpaymentmethod.bsh
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/billsettings.ftl
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutoptions.ftl
incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl
incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl
incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/editpaymentmethod.bsh
incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl
incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl
incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl
incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl
Modified: incubator/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml?rev=421780&r1=421779&r2=421780&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml (original)
+++ incubator/ofbiz/trunk/applications/accounting/entitydef/entitymodel.xml Thu Jul 13 18:23:49 2006
@@ -2416,6 +2416,7 @@
<field name="paymentMethodTypeId" type="id"></field>
<field name="partyId" type="id-ne"></field>
<field name="glAccountId" type="id-ne"></field>
+ <field name="description" type="description"></field>
<field name="fromDate" type="date-time"></field>
<field name="thruDate" type="date-time"></field>
<prim-key field="paymentMethodId"/>
Modified: incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml?rev=421780&r1=421779&r2=421780&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml (original)
+++ incubator/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/payment/PaymentMapProcs.xml Thu Jul 13 18:23:49 2006
@@ -49,6 +49,7 @@
<process field="cardType"><copy/><not-empty><fail-message message="Card Type is missing"/></not-empty></process>
<process field="cardNumber"><copy/></process>
<process field="contactMechId"><copy/></process>
+ <process field="description"><copy/></process>
<process field="expMonth"><not-empty><fail-message message="Expiration Month is missing"/></not-empty></process>
<process field="expYear"><not-empty><fail-message message="Expiration Year is missing"/></not-empty></process>
<process field="expireDate">
@@ -57,12 +58,14 @@
</simple-map-processor>
<simple-map-processor name="updateCreditCard">
<process field="paymentMethodId"><copy/><not-empty><fail-message message="Credit Card Payment Method ID is missing"/></not-empty></process>
+ <process field="description"><copy/></process>
<!-- also call createCreditCard after calling updateCreditCard -->
</simple-map-processor>
<!-- EftAccount map procs -->
<simple-map-processor name="createEftAccount">
<process field="partyId"><copy/></process>
+ <process field="description"><copy/></process>
<process field="bankName"><copy/><not-empty><fail-message message="Bank Name is missing"/></not-empty></process>
<process field="routingNumber"><copy/><not-empty><fail-message message="Routing Number is missing"/></not-empty></process>
<process field="accountType"><copy/><not-empty><fail-message message="Account Type is missing"/></not-empty></process>
@@ -73,6 +76,7 @@
</simple-map-processor>
<simple-map-processor name="updateEftAccount">
<process field="paymentMethodId"><copy/><not-empty><fail-message message="EFT Account Payment Method ID is missing"/></not-empty></process>
+ <process field="description"><copy/></process>
<!-- also call createEftAccount after calling updateEftAccount -->
</simple-map-processor>
</simple-map-processors>
Modified: incubator/ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml?rev=421780&r1=421779&r2=421780&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml (original)
+++ incubator/ofbiz/trunk/applications/accounting/servicedef/services_paymentmethod.xml Thu Jul 13 18:23:49 2006
@@ -40,8 +40,9 @@
<description>Create CreditCard</description>
<auto-attributes include="pk" mode="INOUT" optional="true"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
- <!-- these three fields are for updating on the PaymentMethod -->
+ <!-- these four fields are for updating on the PaymentMethod -->
<attribute name="partyId" type="String" mode="IN" optional="true"/>
+ <attribute name="description" type="String" mode="IN" optional="true"/>
<attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/>
<attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
<!-- these two will be assembled into a expireDate by buildCcExpireDate on an ECA if needed -->
@@ -68,10 +69,11 @@
<description>Update CreditCard</description>
<auto-attributes include="pk" mode="IN" optional="false"/>
<auto-attributes include="nonpk" mode="IN" optional="true"/>
- <!-- these three fields are for updating on the PaymentMethod -->
+ <!-- these four fields are for updating on the PaymentMethod -->
<attribute name="partyId" type="String" mode="IN" optional="true"/>
<attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/>
<attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
+ <attribute name="description" type="String" mode="IN" optional="true"/>
<!-- these two will be assembled into a expireDate by buildCcExpireDate on an ECA if needed -->
<attribute name="expMonth" type="String" mode="IN" optional="true"/>
<attribute name="expYear" type="String" mode="IN" optional="true"/>
@@ -92,6 +94,7 @@
<attribute name="partyId" type="String" mode="IN" optional="true"/>
<attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/>
<attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
+ <attribute name="description" type="String" mode="IN" optional="true"/>
<attribute name="cardNumber" type="String" mode="IN" optional="false"/>
<attribute name="pinNumber" type="String" mode="IN" optional="true"/>
<attribute name="expireDate" type="String" mode="IN" optional="true"/>
@@ -105,6 +108,7 @@
<attribute name="partyId" type="String" mode="IN" optional="true"/>
<attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/>
<attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
+ <attribute name="description" type="String" mode="IN" optional="true"/>
<attribute name="paymentMethodId" type="String" mode="INOUT" optional="false"/>
<attribute name="cardNumber" type="String" mode="IN" optional="true"/>
<attribute name="pinNumber" type="String" mode="IN" optional="true"/>
@@ -120,6 +124,7 @@
<attribute name="partyId" type="String" mode="IN" optional="true"/>
<attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/>
<attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
+ <attribute name="description" type="String" mode="IN" optional="true"/>
<attribute name="bankName" type="String" mode="IN" optional="false"/>
<attribute name="routingNumber" type="String" mode="IN" optional="false"/>
<attribute name="accountType" type="String" mode="IN" optional="false"/>
@@ -145,6 +150,7 @@
<attribute name="partyId" type="String" mode="IN" optional="true"/>
<attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/>
<attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
+ <attribute name="description" type="String" mode="IN" optional="true"/>
<attribute name="paymentMethodId" type="String" mode="INOUT" optional="false"/>
<attribute name="bankName" type="String" mode="IN" optional="false"/>
<attribute name="routingNumber" type="String" mode="IN" optional="false"/>
Modified: incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java?rev=421780&r1=421779&r2=421780&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java (original)
+++ incubator/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java Thu Jul 13 18:23:49 2006
@@ -174,6 +174,7 @@
}
newPm.set("partyId", partyId);
+ newPm.set("description",context.get("description"));
newPm.set("fromDate", (context.get("fromDate") != null ? context.get("fromDate") : now));
newPm.set("thruDate", context.get("thruDate"));
newCc.set("companyNameOnCard", context.get("companyNameOnCard"));
@@ -325,6 +326,7 @@
newPm.set("partyId", partyId);
newPm.set("fromDate", context.get("fromDate"), false);
+ newPm.set("description",context.get("description"));
// The following check is needed to avoid to reactivate an expired pm
if (newPm.get("thruDate") == null) {
newPm.set("thruDate", context.get("thruDate"));
@@ -443,6 +445,7 @@
newPm.set("partyId", partyId);
newPm.set("fromDate", (context.get("fromDate") != null ? context.get("fromDate") : now));
newPm.set("thruDate", context.get("thruDate"));
+ newPm.set("description",context.get("description"));
newGc.set("cardNumber", context.get("cardNumber"));
newGc.set("pinNumber", context.get("pinNumber"));
@@ -542,6 +545,7 @@
newPm.set("partyId", partyId);
newPm.set("fromDate", context.get("fromDate"), false);
newPm.set("thruDate", context.get("thruDate"));
+ newPm.set("description",context.get("description"));
newGc.set("cardNumber", context.get("cardNumber"));
newGc.set("pinNumber", context.get("pinNumber"));
@@ -621,6 +625,7 @@
newPm.set("partyId", partyId);
newPm.set("fromDate", (context.get("fromDate") != null ? context.get("fromDate") : now));
newPm.set("thruDate", context.get("thruDate"));
+ newPm.set("description",context.get("description"));
newEa.set("bankName", context.get("bankName"));
newEa.set("routingNumber", context.get("routingNumber"));
newEa.set("accountType", context.get("accountType"));
@@ -733,6 +738,7 @@
newPm.set("partyId", partyId);
newPm.set("fromDate", context.get("fromDate"), false);
newPm.set("thruDate", context.get("thruDate"));
+ newPm.set("description",context.get("description"));
newEa.set("bankName", context.get("bankName"));
newEa.set("routingNumber", context.get("routingNumber"));
newEa.set("accountType", context.get("accountType"));
Modified: incubator/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties?rev=421780&r1=421779&r2=421780&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/config/EcommerceUiLabels.properties Thu Jul 13 18:23:49 2006
@@ -36,6 +36,7 @@
AccountingCompanyNameOnCard=Company Name on Card
AccountingCreditCard=Credit Card
AccountingCreditCardInformation=Credit Card Information
+AccountingGiftCardInformation=Gift Card Information
AccountingCurrentBalance=Your current balance is:
AccountingCurrentBalanceProblem=Problem checking you balance; check your card and pin number and try again
AccountingEFTAccountInformation=EFT Account Information
Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editpaymentmethod.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editpaymentmethod.bsh?rev=421780&r1=421779&r2=421780&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editpaymentmethod.bsh (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/WEB-INF/actions/customer/editpaymentmethod.bsh Thu Jul 13 18:23:49 2006
@@ -58,10 +58,14 @@
if (eftAccountData == null) eftAccountData = new HashMap();
if (eftAccountData != null) context.put("eftAccountData", eftAccountData);
+paymentMethodData = paymentResults.get("paymentMethod");
+if (!tryEntity.booleanValue()) paymentMethodData = parameterMap;
+if (paymentMethodData == null) paymentMethodData = new HashMap();
+if (paymentMethodData != null) context.put("paymentMethodData", paymentMethodData);
+
//prepare security flag
if (!security.hasEntityPermission("PARTYMGR", "_VIEW", session) && (context.get("creditCard") != null || context.get("giftCard") != null || context.get("eftAccount") != null) && context.get("paymentMethod") != null && !userLogin.get("partyId").equals((context.get("paymentMethod")).get("partyId"))) {
context.put("canNotView", true);
} else {
context.put("canNotView", false);
}
-
Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl?rev=421780&r1=421779&r2=421780&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl Thu Jul 13 18:23:49 2006
@@ -158,6 +158,13 @@
*</td>
</tr>
<tr>
+ <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}">
+ </td>
+ </tr>
+ <tr>
<td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyBillingAddress}</div></td>
<td width="5"> </td>
<td width="74%">
Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl?rev=421780&r1=421779&r2=421780&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl Thu Jul 13 18:23:49 2006
@@ -87,6 +87,13 @@
<input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccountData.accountNumber?if_exists}">
*</td>
</tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}">
+ </td>
+ </tr>
<tr>
<td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyBillingAddress}</div></td>
Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl?rev=421780&r1=421779&r2=421780&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl Thu Jul 13 18:23:49 2006
@@ -106,6 +106,13 @@
</select>
</td>
</tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}">
+ </td>
+ </tr>
</table>
</form>
Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/billsettings.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/billsettings.ftl?rev=421780&r1=421779&r2=421780&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/billsettings.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/billsettings.ftl Thu Jul 13 18:23:49 2006
@@ -253,6 +253,13 @@
</select>
*</td>
</tr>
+ <tr>
+ <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" class="inputBox" size="20" maxlength="30" name="description" value="${creditCard.description?if_exists}">
+ </td>
+ </tr>
</#if>
<#-- eft fields -->
@@ -315,6 +322,13 @@
<input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber?if_exists}">
*</td>
</tr>
+ <tr>
+ <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${eftAccount.description?if_exists}">
+ </td>
+ </tr>
</#if>
<#-- gift card fields -->
@@ -327,7 +341,7 @@
</tr>
</#if>
<tr>
- <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingCreditCardInformation}</div></td>
+ <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingGiftCardInformation}</div></td>
<td width="5"> </td>
<td width="74%"> </td>
</tr>
@@ -344,6 +358,13 @@
<td width="74%">
<input type="text" class="inputBox" size="10" maxlength="60" name="giftCardPin" value="${giftCard.pinNumber?if_exists}">
*</td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign=middle><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${giftCard.description?if_exists}">
+ </td>
</tr>
<#if paymentMethodType != "GC">
<tr>
Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutoptions.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutoptions.ftl?rev=421780&r1=421779&r2=421780&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutoptions.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutoptions.ftl Thu Jul 13 18:23:49 2006
@@ -390,6 +390,7 @@
<td width="50%">
<span class="tabletext">CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</span>
<a href="javascript:submitForm(document.checkoutInfoForm, 'EC', '${paymentMethod.paymentMethodId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
+ <#if paymentMethod.description?has_content><br/><span class="tabletext">(${paymentMethod.description})</span></#if>
</td>
</tr>
</#if>
@@ -403,6 +404,7 @@
<td width="50%">
<span class="tabletext">EFT: ${eftAccount.bankName?if_exists}: ${eftAccount.accountNumber?if_exists}</span>
<a href="javascript:submitForm(document.checkoutInfoForm, 'EE', '${paymentMethod.paymentMethodId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
+ <#if paymentMethod.description?has_content><br/><span class="tabletext">(${paymentMethod.description})</span></#if>
</td>
</tr>
</#if>
@@ -433,6 +435,7 @@
<td width="50%">
<span class="tabletext">${uiLabelMap.AccountingGift}: ${giftCardNumber}</span>
<a href="javascript:submitForm(document.checkoutInfoForm, 'EG', '${paymentMethod.paymentMethodId}');" class="buttontext">[${uiLabelMap.CommonUpdate}]</a>
+ <#if paymentMethod.description?has_content><br/><span class="tabletext">(${paymentMethod.description})</span></#if>
</td>
</tr>
</#if>
Modified: incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl?rev=421780&r1=421779&r2=421780&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl (original)
+++ incubator/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutpayment.ftl Thu Jul 13 18:23:49 2006
@@ -56,7 +56,10 @@
// edit eft account
form.action="<@o...@ofbizUrl>";
form.submit();
- }
+ }else if(mode = "EG")
+ //edit gift card
+ form.action="<@o...@ofbizUrl>";
+ form.submit();
}
function toggleBillingAccount(box) {
@@ -175,7 +178,9 @@
<input type="checkbox" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if cart.isPaymentSelected(paymentMethod.paymentMethodId)>checked</#if>>
</td>
<td width="1%" nowrap>
- <span class="tabletext">${uiLabelMap.AccountingGift}: ${giftCardNumber}</span>
+ <span class="tabletext">${uiLabelMap.AccountingGift}: ${giftCardNumber}
+ <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ </span>
<span class="tabletext" align="right">
<a href="javascript:submitForm(document.checkoutInfoForm, 'EG', '${paymentMethod.paymentMethodId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
</span>
@@ -196,7 +201,9 @@
<input type="checkbox" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if cart.isPaymentSelected(paymentMethod.paymentMethodId)>checked</#if>>
</td>
<td width="1%" nowrap>
- <span class="tabletext">CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</span>
+ <span class="tabletext">CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
+ <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ </span>
<span class="tabletext" align="right">
<a href="javascript:submitForm(document.checkoutInfoForm, 'EC', '${paymentMethod.paymentMethodId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
</span>
@@ -217,7 +224,9 @@
<input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if paymentMethod.paymentMethodId == checkOutPaymentId>checked</#if>>
</td>
<td width="1%" nowrap>
- <span class="tabletext">EFT: ${eftAccount.bankName?if_exists}: ${eftAccount.accountNumber?if_exists}</span>
+ <span class="tabletext">EFT: ${eftAccount.bankName?if_exists}: ${eftAccount.accountNumber?if_exists}
+ <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ </span>
<a href="javascript:submitForm(document.checkoutInfoForm, 'EE', '${paymentMethod.paymentMethodId}');" class="buttontext">${uiLabelMap.CommonUpdate}</a>
</td>
<td> </td>
Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl?rev=421780&r1=421779&r2=421780&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl (original)
+++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/entry/billsettings.ftl Thu Jul 13 18:23:49 2006
@@ -119,7 +119,10 @@
<input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?exists && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/>
</td>
<td width="50%">
- <span class="tabletext">CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</span>
+ <span class="tabletext">
+ CC: ${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
+ <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ </span>
</td>
<td align="right"><a href="/partymgr/control/editcreditcard?party_id=${orderParty.partyId}&paymentMethodId=${paymentMethod.paymentMethodId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></td>
</tr>
@@ -130,7 +133,10 @@
<input type="radio" name="checkOutPaymentId" value="${paymentMethod.paymentMethodId}" <#if checkOutPaymentId?exists && paymentMethod.paymentMethodId == checkOutPaymentId>checked="checked"</#if>/>
</td>
<td width="50%">
- <span class="tabletext">EFT: ${eftAccount.bankName?if_exists}: ${eftAccount.accountNumber?if_exists}</span>
+ <span class="tabletext">
+ EFT: ${eftAccount.bankName?if_exists}: ${eftAccount.accountNumber?if_exists}
+ <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
+ </span>
</td>
<td align="right"><a href="/partymgr/control/editeftaccount?party_id=${orderParty.partyId}&paymentMethodId=${paymentMethod.paymentMethodId}" target="_blank" class="buttontext">${uiLabelMap.CommonUpdate}</a></td>
</tr>
@@ -420,6 +426,13 @@
</select>
*</td>
</tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" class="inputBox" size="20" maxlength="30" name="description" value="${creditCard.description?if_exists}"/>
+ </td>
+ </tr>
</#if>
<#-- eft fields -->
@@ -476,6 +489,13 @@
<td width="74%">
<input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber?if_exists}"/>
*</td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${eftAccount.description?if_exists}"/>
+ </td>
</tr>
</#if>
</table>
Modified: incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/editpaymentmethod.bsh
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/editpaymentmethod.bsh?rev=421780&r1=421779&r2=421780&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/editpaymentmethod.bsh (original)
+++ incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/editpaymentmethod.bsh Thu Jul 13 18:23:49 2006
@@ -71,3 +71,8 @@
donePage = parameters.get("DONE_PAGE");
if (donePage == null || donePage.length() <= 0) donePage = "viewprofile";
context.put("donePage", donePage);
+
+paymentMethodData = paymentResults.get("paymentMethod");
+if (!tryEntity.booleanValue()) paymentMethodData = parameters;
+if (paymentMethodData == null) paymentMethodData = new HashMap();
+if (paymentMethodData != null) context.put("paymentMethodData", paymentMethodData);
Modified: incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl?rev=421780&r1=421779&r2=421780&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl (original)
+++ incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editcreditcard.ftl Thu Jul 13 18:23:49 2006
@@ -161,6 +161,13 @@
*</td>
</tr>
<tr>
+ <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}">
+ </td>
+ </tr>
+ <tr>
<td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingBillingAddress}</div></td>
<td width="5"> </td>
<td width="74%">
Modified: incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl?rev=421780&r1=421779&r2=421780&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl (original)
+++ incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editeftaccount.ftl Thu Jul 13 18:23:49 2006
@@ -84,7 +84,13 @@
<input type="text" class='inputBox' size="20" maxlength="40" name="accountNumber" value="${eftAccountData.accountNumber?if_exists}">
*</td>
</tr>
-
+ <tr>
+ <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" class='inputBox' size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}">
+ *</td>
+ </tr>
<tr>
<td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyBillingAddress}</div></td>
<td width="5"> </td>
Modified: incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl?rev=421780&r1=421779&r2=421780&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl (original)
+++ incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/editgiftcard.ftl Thu Jul 13 18:23:49 2006
@@ -90,6 +90,13 @@
</select>
</td>
</tr>
+ <tr>
+ <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}">
+ </td>
+ </tr>
</table>
</form>
Modified: incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl?rev=421780&r1=421779&r2=421780&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl (original)
+++ incubator/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl Thu Jul 13 18:23:49 2006
@@ -300,6 +300,7 @@
${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
</#if>
</b>
+ <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
<#if paymentMethod.glAccountId?has_content>(for GL Account ${paymentMethod.glAccountId})</#if>
(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate?if_exists})
<#if paymentMethod.thruDate?has_content><b>(${uiLabelMap.PartyContactEffectiveThru}: ${paymentMethod.thruDate})</b></#if>