You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2009/04/28 21:45:07 UTC
svn commit: r769510 [3/3] - in /ofbiz/trunk/applications/accounting:
servicedef/ src/org/ofbiz/accounting/payment/ webapp/accounting/WEB-INF/
webapp/accounting/WEB-INF/actions/payment/
webapp/accounting/WEB-INF/actions/transaction/ webapp/accounting/co...
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ManualTx.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ManualTx.groovy?rev=769510&r1=769509&r2=769510&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ManualTx.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ManualTx.groovy Tue Apr 28 19:45:06 2009
@@ -86,3 +86,5 @@
context.paymentMethodType = paymentMethodType;
context.paymentMethodTypeId = paymentMethodTypeId;
}
+
+context.showToolTip = "true";
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy?rev=769510&r1=769509&r2=769510&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/transaction/ViewGatewayResponse.groovy Tue Apr 28 19:45:06 2009
@@ -34,7 +34,7 @@
// get this field first, it determines which purpose this script satisfies
orderPaymentPreferenceId = context.orderPaymentPreferenceId;
-// first purpose: retrieve orderId and pamentPreferenceId
+// first purpose: retrieve orderId and paymentPreferenceId
if (!orderPaymentPreferenceId) {
paymentGatewayResponse = context.paymentGatewayResponse;
orderPaymentPreference = paymentGatewayResponse.getRelatedOne("OrderPaymentPreference");
@@ -43,7 +43,7 @@
return;
}
-// second purpose: grab the latest gateway response of the orderaymentpreferenceId
+// second purpose: grab the latest gateway response of the orderpaymentpreferenceId
orderPaymentPreference = delegator.findByPrimaryKey("OrderPaymentPreference", [orderPaymentPreferenceId : orderPaymentPreferenceId]);
gatewayResponses = orderPaymentPreference.getRelated("PaymentGatewayResponse", ["transactionDate DESC"]);
EntityUtil.filterByCondition(gatewayResponses, EntityCondition.makeCondition("transCodeEnumId", EntityOperator.EQUALS, "PGT_AUTHORIZE"));
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=769510&r1=769509&r2=769510&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Tue Apr 28 19:45:06 2009
@@ -421,21 +421,27 @@
<response name="success" type="view" value="EditPaymentGatewayConfig"/>
<response name="error" type="view" value="EditPaymentGatewayConfig"/>
</request-map>
- <request-map uri="UpdatePaymentGatewayConfigPayflowPro">
+ <request-map uri="UpdatePaymentGatewayConfigClearCommerce">
<security https="true" auth="true"/>
- <event type="service" invoke="updatePaymentGatewayConfigPayflowPro"/>
+ <event type="service" invoke="updatePaymentGatewayConfigClearCommerce"/>
<response name="success" type="view" value="EditPaymentGatewayConfig"/>
<response name="error" type="view" value="EditPaymentGatewayConfig"/>
</request-map>
- <request-map uri="UpdatePaymentGatewayConfigPayPal">
+ <request-map uri="UpdatePaymentGatewayConfigCyberSource">
<security https="true" auth="true"/>
- <event type="service" invoke="updatePaymentGatewayConfigPayPal"/>
+ <event type="service" invoke="updatePaymentGatewayConfigCyberSource"/>
<response name="success" type="view" value="EditPaymentGatewayConfig"/>
<response name="error" type="view" value="EditPaymentGatewayConfig"/>
</request-map>
- <request-map uri="UpdatePaymentGatewayConfigClearCommerce">
+ <request-map uri="UpdatePaymentGatewayConfigPayflowPro">
<security https="true" auth="true"/>
- <event type="service" invoke="updatePaymentGatewayConfigClearCommerce"/>
+ <event type="service" invoke="updatePaymentGatewayConfigPayflowPro"/>
+ <response name="success" type="view" value="EditPaymentGatewayConfig"/>
+ <response name="error" type="view" value="EditPaymentGatewayConfig"/>
+ </request-map>
+ <request-map uri="UpdatePaymentGatewayConfigPayPal">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="updatePaymentGatewayConfigPayPal"/>
<response name="success" type="view" value="EditPaymentGatewayConfig"/>
<response name="error" type="view" value="EditPaymentGatewayConfig"/>
</request-map>
@@ -474,7 +480,19 @@
<response name="success" type="view" value="ViewGatewayResponse"/>
<response name="error" type="view" value="CaptureTransaction"/>
</request-map>
-
+ <request-map uri="processReleaseTransaction">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="releaseOrderPaymentPreference"/>
+ <response name="success" type="view" value="ManualTransaction"/>
+ <response name="error" type="view" value="ManualTransaction"/>
+ </request-map>
+ <request-map uri="processRefundTransaction">
+ <security https="true" auth="true"/>
+ <event type="service" invoke="refundOrderPaymentPreference"/>
+ <response name="success" type="view" value="ManualTransaction"/>
+ <response name="error" type="view" value="ManualTransaction"/>
+ </request-map>
+
<!-- Party Accounts requests -->
<request-map uri="PartyAccountsSummary">
<security https="true" auth="true"/>
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl?rev=769510&r1=769509&r2=769510&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl Tue Apr 28 19:45:06 2009
@@ -26,14 +26,14 @@
</#if>
<tr>
- <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingCompanyNameCard}</td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingCompanyNameCard}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="60" name="companyNameOnCard" value="${creditCard.companyNameOnCard?if_exists}"/>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingPrefixCard}</td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingPrefixCard}</b></td>
<td width="5"> </td>
<td width="74%">
<select name="titleOnCard">
@@ -46,28 +46,28 @@
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingFirstNameCard}</td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingFirstNameCard}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)?if_exists}"/>
<#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingMiddleNameCard}</td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingMiddleNameCard}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)?if_exists}"/>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingLastNameCard}</td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingLastNameCard}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)?if_exists}"/>
<#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingSuffixCard}</td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingSuffixCard}</b></td>
<td width="5"> </td>
<td width="74%">
<select name="suffixOnCard">
@@ -84,7 +84,7 @@
</tr>
<tr>
- <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingCardType}</td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingCardType}</b></td>
<td width="5"> </td>
<td width="74%">
<select name="cardType">
@@ -97,7 +97,7 @@
<#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingCardNumber}</td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingCardNumber}</b></td>
<td width="5"> </td>
<td width="74%">
<#if creditCard?has_content>
@@ -134,7 +134,7 @@
</td>
</tr>-->
<tr>
- <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingExpirationDate}</td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.AccountingExpirationDate}</b></td>
<td width="5"> </td>
<td width="74%">
<#assign expMonth = "">
@@ -171,7 +171,7 @@
<#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td>
</tr>
<tr>
- <td width="26%" align="right" valign="middle">${uiLabelMap.CommonDescription}</td>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.CommonDescription}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="20" maxlength="30" name="description" value="${paymentMethod.description?if_exists}"/>
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl?rev=769510&r1=769509&r2=769510&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl Tue Apr 28 19:45:06 2009
@@ -18,7 +18,8 @@
-->
<#-- reference number -->
- <#if txType?default("") == "PRDS_PAY_CREDIT" || txType?default("") == "PRDS_PAY_CAPTURE" || txType?default("") == "PRDS_PAY_RELEASE">
+ <#if txType?default("") == "PRDS_PAY_CREDIT" || txType?default("") == "PRDS_PAY_CAPTURE" ||
+ txType?default("") == "PRDS_PAY_RELEASE" || txType?default("") == "PRDS_PAY_REFUND">
${setRequestAttribute("validTx", "true")}
<#assign validTx = true>
<tr><td colspan="3"><hr/></td></tr>
@@ -27,11 +28,35 @@
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="60" name="referenceNum">
- (*)</td>
+ <span class="tooltip">${uiLabelMap.CommonRequired}</span>
+ </td>
+ </tr>
+ <tr>
+ <td width="26%" align="right" valign=middle><b>${uiLabelMap.FormFieldTitle_orderPaymentPreferenceId}</b></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="20" maxlength="20" name="orderPaymentPreferenceId">
+ <span class="tooltip">${uiLabelMap.CommonRequired}</span>
+ </td>
</tr>
</#if>
-
<#-- manual credit card information -->
+ <#if txType?default("") == "PRDS_PAY_RELEASE">
+ ${setRequestAttribute("validTx", "true")}
+ <script language="JavaScript" type="text/javascript">
+ <!-- //
+ document.manualTxForm.action = "<@o...@ofbizUrl>";
+ // -->
+ </script>
+ </#if>
+ <#if txType?default("") == "PRDS_PAY_REFUND">
+ ${setRequestAttribute("validTx", "true")}
+ <script language="JavaScript" type="text/javascript">
+ <!-- //
+ document.manualTxForm.action = "<@o...@ofbizUrl>";
+ // -->
+ </script>
+ </#if>
<#if txType?default("") == "PRDS_PAY_CREDIT" || txType?default("") == "PRDS_PAY_AUTH">
${setRequestAttribute("validTx", "true")}
<script language="JavaScript" type="text/javascript">
@@ -45,51 +70,54 @@
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="60" name="firstName" value="${(person.firstName)?if_exists}">
- *</td>
+ <span class="tooltip">${uiLabelMap.CommonRequired}</span>
+ </td>
</tr>
<tr>
<td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyLastName}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="60" name="lastName" value="${(person.lastName)?if_exists}">
- *</td>
+ <span class="tooltip">${uiLabelMap.CommonRequired}</span>
+ </td>
</tr>
<tr>
<td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyEmailAddress}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="60" name="infoString" value="">
- *</td>
+ <span class="tooltip">${uiLabelMap.CommonRequired}</span>
+ </td>
</tr>
<tr><td colspan="3"><hr></td></tr>
-
+ <#assign showToolTip = "true">
${screens.render("component://accounting/widget/CommonScreens.xml#creditCardFields")}
-
<tr><td colspan="3"><hr></td></tr>
-
<#-- first / last name -->
<tr>
<td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyFirstName}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="30" name="firstName" value="${(person.firstName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
- *</td>
+ <span class="tooltip">${uiLabelMap.CommonRequired}</span>
+ </td>
</tr>
<tr>
<td width="26%" align="right" valign=middle><b>${uiLabelMap.PartyLastName}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="30" name="lastName" value="${(person.lastName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
- *</td>
+ <span class="tooltip">${uiLabelMap.CommonRequired}</span>
+ </td>
</tr>
-
<#-- credit card address -->
<tr>
<td width="26%" align="right" valign=middle><b>${uiLabelMap.AccountingBillToAddress1}</b></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="30" name="address1" value="${(postalFields.address1)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
- *</td>
+ <span class="tooltip">${uiLabelMap.CommonRequired}</span>
+ </td>
</tr>
<tr>
<td width="26%" align="right" valign=middle><b>${uiLabelMap.AccountingBillToAddress2}</b></td>
@@ -103,7 +131,8 @@
<td width="5"> </td>
<td width="74%">
<input type="text" size="30" maxlength="30" name="city" value="${(postalFields.city)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
- *</td>
+ <span class="tooltip">${uiLabelMap.CommonRequired}</span>
+ </td>
</tr>
<tr>
<td width="26%" align="right" valign=middle><b>${uiLabelMap.CommonStateProvince}</b></td>
@@ -125,7 +154,8 @@
<td width="5"> </td>
<td width="74%">
<input type="text" size="12" maxlength="10" name="postalCode" value="${(postalFields.postalCode)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
- *</td>
+ <span class="tooltip">${uiLabelMap.CommonRequired}</span>
+ </td>
</tr>
<tr>
<td width="26%" align="right" valign=middle><b>${uiLabelMap.CommonCountry}</b></td>
@@ -138,6 +168,7 @@
</#if>
${screens.render("component://common/widget/CommonScreens.xml#countries")}
</select>
- *</td>
+ <span class="tooltip">${uiLabelMap.CommonRequired}</span>
+ </td>
</tr>
</#if>
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl?rev=769510&r1=769509&r2=769510&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl Tue Apr 28 19:45:06 2009
@@ -22,7 +22,7 @@
<#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)>
${setRequestAttribute("validTx", "false")}
- <form name="manualTxForm" method="get" action="<@o...@ofbizUrl>">
+ <form name="manualTxForm" method="post" action="<@o...@ofbizUrl>">
<#if requestParameters.paymentMethodId?exists>
<input type="hidden" name="paymentMethodId" value="${requestParameters.paymentMethodId}">
</#if>
@@ -86,18 +86,15 @@
<#if requestAttributes.validTx?default("false") == "true">
<tr><td colspan="3"><hr></td></tr>
-
<#-- amount field -->
- <#if txType != "PRDS_PAY_RELEASE">
- <tr>
- <td width="26%" align="right" valign="middle"><b>${uiLabelMap.CommonAmount}</b></td>
- <td width="5"> </td>
- <td width="74%">
- <input type="text" size="20" maxlength="30" name="amount">
- *</td>
- </tr>
- </#if>
-
+ <tr>
+ <td width="26%" align="right" valign="middle"><b>${uiLabelMap.CommonAmount}</b></td>
+ <td width="5"> </td>
+ <td width="74%">
+ <input type="text" size="20" maxlength="30" name="amount">
+ <span class="tooltip">${uiLabelMap.CommonRequired}</span>
+ </td>
+ </tr>
<#-- submit button -->
<tr>
<td width="26%" align="right" valign=middle> </td>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=769510&r1=769509&r2=769510&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Tue Apr 28 19:45:06 2009
@@ -390,6 +390,7 @@
<set field="headerItem" value="transaction"/>
<set field="tabButtonItem" value="manualtransactiontab"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/ManualTx.groovy"/>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
</actions>
<widgets>
<decorator-screen name="GenericTransactionDecorator" location="component://accounting/widget/TransactionScreens.xml">
@@ -416,7 +417,7 @@
</section>
</screen>
<screen name="manualCCTx">
- <section>
+ <section>
<widgets>
<platform-specific>
<html><html-template location="component://accounting/webapp/accounting/payment/manualCCTx.ftl"/></html>
Modified: ofbiz/trunk/applications/accounting/widget/TransactionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionForms.xml?rev=769510&r1=769509&r2=769510&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionForms.xml Tue Apr 28 19:45:06 2009
@@ -23,9 +23,28 @@
<form name="FindGatewayResponses" type="single" target="FindGatewayResponses" title=""
header-row-style="header-row" default-table-style="basic-table">
<field name="hideSearch"><hidden value="Y"/></field> <!-- what is this for? -->
- <field name="paymentGatewayResponseId" title="${uiLabelMap.AccountingPaymentGatewayResponseId}"><text-find/></field>
- <field name="orderPaymentPreferenceId" title="${uiLabelMap.AccountingOrderPaymentPreferenceId}"><text-find/></field>
- <field name="transCodeEnumId" title="${uiLabelMap.AccountingStatus}">
+ <field name="paymentGatewayResponseId" title="${uiLabelMap.AccountingPaymentGatewayResponseId}">
+ <text-find/>
+ </field>
+ <field name="paymentServiceTypeEnumId">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
+ <entity-constraint name="enumTypeId" operator="equals" value="PRDS_PAYSVC"/>
+ <entity-order-by field-name="sequenceId"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="orderPaymentPreferenceId" title="${uiLabelMap.AccountingOrderPaymentPreferenceId}">
+ <text-find/>
+ </field>
+ <field name="paymentMethodTypeId">
+ <drop-down allow-empty="true">
+ <entity-options entity-name="PaymentMethodType" description="${description}" key-field-name="paymentMethodTypeId">
+ <entity-order-by field-name="description"/>
+ </entity-options>
+ </drop-down>
+ </field>
+ <field name="transCodeEnumId">
<drop-down allow-empty="true">
<entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="PGT_CODE"/>
@@ -33,11 +52,16 @@
</entity-options>
</drop-down>
</field>
+ <field name="referenceNum">
+ <text-find size="60" maxlength="60"/>
+ </field>
+ <field name="performSearch"><hidden value="Y"/></field>
+ <field name="noConditionFind"><hidden value="Y"/></field>
<field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit">
<submit button-type="button"/>
</field>
</form>
-
+
<!-- Brings up a list of gateway responses. TODO: should cut down data displayd -->
<form name="ListGatewayResponses" type="list" use-row-submit="true" target="" title="" list-name="listIt" paginate-target="FindGatewayResponses"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
@@ -57,8 +81,17 @@
<parameter param-name="paymentGatewayResponseId"/>
</hyperlink>
</field>
+ <field name="paymentServiceTypeEnumId">
+ <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+ </field>
+ <field name="paymentMethodTypeId">
+ <display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId" description="${description}"/>
+ </field>
+ <field name="transCodeEnumId">
+ <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+ </field>
</form>
-
+
<!-- presents the orderId and orderPaymentPreferenceId for a gateway response with links to the order -->
<form name="ViewGatewayResponseRelations" type="single" target="" title=""
header-row-style="header-row" default-table-style="basic-table">
@@ -69,7 +102,7 @@
</field>
<field name="orderPaymentPreferenceId"><display/></field>
</form>
-
+
<!-- displays the gateway response in detail -->
<form name="ViewGatewayResponse" type="single" target="processCaptureTransaction" title="" default-map-name="paymentGatewayResponse"
header-row-style="header-row" default-table-style="basic-table">
@@ -77,8 +110,17 @@
<!-- TODO: what is the correct way to ensure that the response was authorized?
<field name="submitButton" use-when="paymentGatewayResponse!=null&&paymentGatewayResponse.getString("gatewayFlag").equals("A")" title="${uiLabelMap.AccountingCapture}" widget-style="smallSubmit"><submit button-type="button"/></field>
-->
+ <field name="paymentServiceTypeEnumId">
+ <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+ </field>
+ <field name="paymentMethodTypeId">
+ <display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId" description="${description}"/>
+ </field>
+ <field name="transCodeEnumId">
+ <display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/>
+ </field>
</form>
-
+
<!-- form for authorizing a transaction -->
<form name="AuthorizeTransaction" type="single" target="processAuthorizeTransaction" title=""
header-row-style="header-row" default-table-style="basic-table">
@@ -92,7 +134,7 @@
<field name="overrideAmount" title="${uiLabelMap.AccountingAmount}"><text/></field>
<field name="submitButton" title="${uiLabelMap.AccountingAuthorize}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
-
+
<!-- form for capturing a transaction -->
<form name="CaptureTransaction" type="single" target="processCaptureTransaction" title=""
header-row-style="header-row" default-table-style="basic-table">
Modified: ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml?rev=769510&r1=769509&r2=769510&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml Tue Apr 28 19:45:06 2009
@@ -24,6 +24,7 @@
<screen name="GenericTransactionDecorator">
<section>
<actions>
+ <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
<set field="headerItem" value="transaction"/>
</actions>
<widgets>