You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2014/08/16 13:35:02 UTC
svn commit: r1618336 [10/21] - in /ofbiz/trunk/applications:
accounting/webapp/accounting/agreement/ accounting/webapp/accounting/common/
accounting/webapp/accounting/finaccounttrans/
accounting/webapp/accounting/invoice/ accounting/webapp/accounting/p...
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Sat Aug 16 11:34:57 2014
@@ -30,7 +30,7 @@ under the License.
<#assign cardNumberDisplay = cardNumber>
</#if>
</#if>
- ${cardNumberDisplay?if_exists}
+ ${cardNumberDisplay!}
</#macro>
<div class="screenlet">
@@ -59,14 +59,14 @@ under the License.
<#else>
<td>${payment.paymentId}</td>
</#if>
- <td>${partyName.groupName?if_exists}${partyName.lastName?if_exists} ${partyName.firstName?if_exists} ${partyName.middleName?if_exists}
+ <td>${partyName.groupName!}${partyName.lastName!} ${partyName.firstName!} ${partyName.middleName!}
<#if security.hasPermission("PARTYMGR_VIEW", session) || security.hasPermission("PARTYMGR_ADMIN", session)>
[<a href="/partymgr/control/viewprofile?partyId=${partyId}">${partyId}</a>]
<#else>
[${partyId}]
</#if>
</td>
- <td><@ofbizCurrency amount=payment.amount?if_exists/></td>
+ <td><@ofbizCurrency amount=payment.amount!/></td>
<td>${statusItem.description}</td>
</tr>
</#list>
@@ -96,12 +96,12 @@ under the License.
<#assign orderPaymentStatuses = orderReadHelper.getOrderPaymentStatuses()>
<#if orderPaymentStatuses?has_content>
<#list orderPaymentStatuses as orderPaymentStatus>
- <#assign statusItem = orderPaymentStatus.getRelatedOne("StatusItem", false)?if_exists>
+ <#assign statusItem = orderPaymentStatus.getRelatedOne("StatusItem", false)!>
<#if statusItem?has_content>
<div>
${statusItem.get("description",locale)} <#if orderPaymentStatus.statusDatetime?has_content>- ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderPaymentStatus.statusDatetime, "", locale, timeZone)!}</#if>
- ${uiLabelMap.CommonBy} - [${orderPaymentStatus.statusUserLogin?if_exists}]
+ ${uiLabelMap.CommonBy} - [${orderPaymentStatus.statusUserLogin!}]
</div>
</#if>
</#list>
@@ -120,13 +120,13 @@ under the License.
</#if>
<#assign outputted = "true">
<#-- try the paymentMethod first; if paymentMethodId is specified it overrides paymentMethodTypeId -->
- <#assign paymentMethod = orderPaymentPreference.getRelatedOne("PaymentMethod", false)?if_exists>
+ <#assign paymentMethod = orderPaymentPreference.getRelatedOne("PaymentMethod", false)!>
<#if !paymentMethod?has_content>
<#assign paymentMethodType = orderPaymentPreference.getRelatedOne("PaymentMethodType", false)>
<#if paymentMethodType.paymentMethodTypeId == "EXT_BILLACT">
<#assign outputted = "false">
<#-- billing account -->
- <#if billingAccount?exists>
+ <#if billingAccount??>
<#if outputted?default("false") == "true">
<tr><td colspan="4"><hr /></td></tr>
</#if>
@@ -144,7 +144,7 @@ under the License.
<table class="basic-table" cellspacing='0'>
<tr>
<td valign="top">
- ${uiLabelMap.CommonNbr}<a href="/accounting/control/EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${billingAccount.billingAccountId}</a> - ${billingAccount.description?if_exists}
+ ${uiLabelMap.CommonNbr}<a href="/accounting/control/EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${billingAccount.billingAccountId}</a> - ${billingAccount.description!}
</td>
<td valign="top" align="right">
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED" && orderPaymentPreference.statusId != "PAYMENT_RECEIVED">
@@ -163,7 +163,7 @@ under the License.
<input type="hidden" name="orderId" value="${orderId}" />
<input type="hidden" name="orderPaymentPreferenceId" value="${orderPaymentPreference.orderPaymentPreferenceId}" />
<input type="hidden" name="statusId" value="PAYMENT_CANCELLED" />
- <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId?if_exists}" />
+ <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId!}" />
</form>
</div>
</#if>
@@ -172,10 +172,10 @@ under the License.
</tr>
</#if>
<#elseif paymentMethodType.paymentMethodTypeId == "FIN_ACCOUNT">
- <#assign finAccount = orderPaymentPreference.getRelatedOne("FinAccount", false)?if_exists/>
+ <#assign finAccount = orderPaymentPreference.getRelatedOne("FinAccount", false)!/>
<#if (finAccount?has_content)>
<#assign gatewayResponses = orderPaymentPreference.getRelated("PaymentGatewayResponse", null, null, false)>
- <#assign finAccountType = finAccount.getRelatedOne("FinAccountType", false)?if_exists/>
+ <#assign finAccountType = finAccount.getRelatedOne("FinAccountType", false)!/>
<tr>
<td align="right" valign="top" width="29%">
<div>
@@ -193,16 +193,16 @@ under the License.
</#if>
#${finAccount.finAccountCode?default(finAccount.finAccountId)} (<a href="/accounting/control/EditFinAccount?finAccountId=${finAccount.finAccountId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${finAccount.finAccountId}</a>)
<br />
- ${finAccount.finAccountName?if_exists}
+ ${finAccount.finAccountName!}
<br />
<#-- Authorize and Capture transactions -->
<div>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
- <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a>
+ <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId!}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a>
</#if>
<#if orderPaymentPreference.statusId == "PAYMENT_AUTHORIZED">
- <a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.AccountingCapture}</a>
+ <a href="/accounting/control/CaptureTransaction?orderId=${orderId!}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.AccountingCapture}</a>
</#if>
</div>
</div>
@@ -214,7 +214,7 @@ under the License.
${(transactionCode.get("description",locale))?default("Unknown")}:
<#if gatewayResponse.transactionDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(gatewayResponse.transactionDate, "", locale, timeZone)!} </#if>
<@ofbizCurrency amount=gatewayResponse.amount isoCode=currencyUomId/><br />
- (<span class="label">${uiLabelMap.OrderReference}</span> ${gatewayResponse.referenceNum?if_exists}
+ (<span class="label">${uiLabelMap.OrderReference}</span> ${gatewayResponse.referenceNum!}
<span class="label">${uiLabelMap.OrderAvs}</span> ${gatewayResponse.gatewayAvsResult?default("N/A")}
<span class="label">${uiLabelMap.OrderScore}</span> ${gatewayResponse.gatewayScoreResult?default("N/A")})
<a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.CommonDetails}</a>
@@ -232,7 +232,7 @@ under the License.
<input type="hidden" name="orderId" value="${orderId}" />
<input type="hidden" name="orderPaymentPreferenceId" value="${orderPaymentPreference.orderPaymentPreferenceId}" />
<input type="hidden" name="statusId" value="PAYMENT_CANCELLED" />
- <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId?if_exists}" />
+ <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId!}" />
</form>
</div>
</#if>
@@ -258,7 +258,7 @@ under the License.
<#else>
<tr>
<td align="right" valign="top" width="29%">
- <div> <span class="label">${paymentMethodType.get("description",locale)?if_exists}</span>
+ <div> <span class="label">${paymentMethodType.get("description",locale)!}</span>
<#if orderPaymentPreference.maxAmount?has_content>
<br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
@@ -271,11 +271,11 @@ under the License.
<#if orderPaymentPreference.maxAmount?has_content>
<br />${uiLabelMap.OrderPaymentMaximumAmount}: <@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/>
</#if>
- <br /> [<#if oppStatusItem?exists>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>]
+ <br /> [<#if oppStatusItem??>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>]
</div>
<#--
- <div><@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> - ${(orderPaymentPreference.authDate.toString())?if_exists}</div>
- <div> <#if orderPaymentPreference.authRefNum?exists>(${uiLabelMap.OrderReference}: ${orderPaymentPreference.authRefNum})</#if></div>
+ <div><@ofbizCurrency amount=orderPaymentPreference.maxAmount?default(0.00) isoCode=currencyUomId/> - ${(orderPaymentPreference.authDate.toString())!}</div>
+ <div> <#if orderPaymentPreference.authRefNum??>(${uiLabelMap.OrderReference}: ${orderPaymentPreference.authRefNum})</#if></div>
-->
</td>
<#else>
@@ -292,7 +292,7 @@ under the License.
<input type="hidden" name="orderId" value="${orderId}" />
<input type="hidden" name="orderPaymentPreferenceId" value="${orderPaymentPreference.orderPaymentPreferenceId}" />
<input type="hidden" name="statusId" value="PAYMENT_CANCELLED" />
- <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId?if_exists}" />
+ <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId!}" />
</form>
</div>
</#if>
@@ -316,11 +316,11 @@ under the License.
</#if>
</#if>
<#else>
- <#if paymentMethod.paymentMethodTypeId?if_exists == "CREDIT_CARD">
+ <#if paymentMethod.paymentMethodTypeId! == "CREDIT_CARD">
<#assign gatewayResponses = orderPaymentPreference.getRelated("PaymentGatewayResponse", null, null, false)>
- <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)?if_exists>
+ <#assign creditCard = paymentMethod.getRelatedOne("CreditCard", false)!>
<#if creditCard?has_content>
- <#assign pmBillingAddress = creditCard.getRelatedOne("PostalAddress", false)?if_exists>
+ <#assign pmBillingAddress = creditCard.getRelatedOne("PostalAddress", false)!>
</#if>
<tr>
<td align="right" valign="top" width="29%">
@@ -334,7 +334,7 @@ under the License.
<td valign="top" width="60%">
<div>
<#if creditCard?has_content>
- <#if creditCard.companyNameOnCard?exists>${creditCard.companyNameOnCard}<br /></#if>
+ <#if creditCard.companyNameOnCard??>${creditCard.companyNameOnCard}<br /></#if>
<#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if>
${creditCard.firstNameOnCard?default("N/A")}
<#if creditCard.middleNameOnCard?has_content>${creditCard.middleNameOnCard} </#if>
@@ -344,22 +344,22 @@ under the License.
<#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)>
${creditCard.cardType}
- <@maskSensitiveNumber cardNumber=creditCard.cardNumber?if_exists/>
+ <@maskSensitiveNumber cardNumber=creditCard.cardNumber!/>
${creditCard.expireDate}
- [<#if oppStatusItem?exists>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>]
+ [<#if oppStatusItem??>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>]
<#else>
${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
- [<#if oppStatusItem?exists>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>]
+ [<#if oppStatusItem??>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>]
</#if>
<br />
<#-- Authorize and Capture transactions -->
<div>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
- <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a>
+ <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId!}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a>
</#if>
<#if orderPaymentPreference.statusId == "PAYMENT_AUTHORIZED">
- <a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.AccountingCapture}</a>
+ <a href="/accounting/control/CaptureTransaction?orderId=${orderId!}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.AccountingCapture}</a>
</#if>
</div>
<#else>
@@ -374,7 +374,7 @@ under the License.
${(transactionCode.get("description",locale))?default("Unknown")}:
<#if gatewayResponse.transactionDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(gatewayResponse.transactionDate, "", locale, timeZone)!} </#if>
<@ofbizCurrency amount=gatewayResponse.amount isoCode=currencyUomId/><br />
- (<span class="label">${uiLabelMap.OrderReference}</span> ${gatewayResponse.referenceNum?if_exists}
+ (<span class="label">${uiLabelMap.OrderReference}</span> ${gatewayResponse.referenceNum!}
<span class="label">${uiLabelMap.OrderAvs}</span> ${gatewayResponse.gatewayAvsResult?default("N/A")}
<span class="label">${uiLabelMap.OrderScore}</span> ${gatewayResponse.gatewayScoreResult?default("N/A")})
<a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.CommonDetails}</a>
@@ -391,16 +391,16 @@ under the License.
<input type="hidden" name="orderId" value="${orderId}" />
<input type="hidden" name="orderPaymentPreferenceId" value="${orderPaymentPreference.orderPaymentPreferenceId}" />
<input type="hidden" name="statusId" value="PAYMENT_CANCELLED" />
- <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId?if_exists}" />
+ <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId!}" />
</form>
</#if>
</#if>
</td>
</tr>
- <#elseif paymentMethod.paymentMethodTypeId?if_exists == "EFT_ACCOUNT">
+ <#elseif paymentMethod.paymentMethodTypeId! == "EFT_ACCOUNT">
<#assign eftAccount = paymentMethod.getRelatedOne("EftAccount", false)>
<#if eftAccount?has_content>
- <#assign pmBillingAddress = eftAccount.getRelatedOne("PostalAddress", false)?if_exists>
+ <#assign pmBillingAddress = eftAccount.getRelatedOne("PostalAddress", false)!>
</#if>
<tr>
<td align="right" valign="top" width="29%">
@@ -414,8 +414,8 @@ under the License.
<td valign="top" width="60%">
<div>
<#if eftAccount?has_content>
- ${eftAccount.nameOnAccount?if_exists}<br />
- <#if eftAccount.companyNameOnAccount?exists>${eftAccount.companyNameOnAccount}<br /></#if>
+ ${eftAccount.nameOnAccount!}<br />
+ <#if eftAccount.companyNameOnAccount??>${eftAccount.companyNameOnAccount}<br /></#if>
${uiLabelMap.AccountingBankName}: ${eftAccount.bankName}, ${eftAccount.routingNumber}<br />
${uiLabelMap.AccountingAccount}#: ${eftAccount.accountNumber}
<#else>
@@ -431,7 +431,7 @@ under the License.
<input type="hidden" name="orderId" value="${orderId}" />
<input type="hidden" name="orderPaymentPreferenceId" value="${orderPaymentPreference.orderPaymentPreferenceId}" />
<input type="hidden" name="statusId" value="PAYMENT_CANCELLED" />
- <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId?if_exists}" />
+ <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId!}" />
</form>
</#if>
</#if>
@@ -452,10 +452,10 @@ under the License.
</td>
</tr>
</#if>
- <#elseif paymentMethod.paymentMethodTypeId?if_exists == "GIFT_CARD">
+ <#elseif paymentMethod.paymentMethodTypeId! == "GIFT_CARD">
<#assign giftCard = paymentMethod.getRelatedOne("GiftCard", false)>
- <#if giftCard?exists>
- <#assign pmBillingAddress = giftCard.getRelatedOne("PostalAddress", false)?if_exists>
+ <#if giftCard??>
+ <#assign pmBillingAddress = giftCard.getRelatedOne("PostalAddress", false)!>
</#if>
<tr>
<td align="right" valign="top" width="29%">
@@ -471,11 +471,11 @@ under the License.
<#if giftCard?has_content>
<#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)>
${giftCard.cardNumber?default("N/A")} [${giftCard.pinNumber?default("N/A")}]
- [<#if oppStatusItem?exists>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>]
+ [<#if oppStatusItem??>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>]
<#else>
- <@maskSensitiveNumber cardNumber=giftCard.cardNumber?if_exists/>
+ <@maskSensitiveNumber cardNumber=giftCard.cardNumber!/>
<#if !cardNumberDisplay?has_content>N/A</#if>
- [<#if oppStatusItem?exists>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>]
+ [<#if oppStatusItem??>${oppStatusItem.get("description",locale)}<#else>${orderPaymentPreference.statusId}</#if>]
</#if>
<#else>
${uiLabelMap.CommonInformation} ${uiLabelMap.CommonNot} ${uiLabelMap.CommonAvailable}
@@ -490,7 +490,7 @@ under the License.
<input type="hidden" name="orderId" value="${orderId}" />
<input type="hidden" name="orderPaymentPreferenceId" value="${orderPaymentPreference.orderPaymentPreferenceId}" />
<input type="hidden" name="statusId" value="PAYMENT_CANCELLED" />
- <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId?if_exists}" />
+ <input type="hidden" name="checkOutPaymentId" value="${paymentMethod.paymentMethodTypeId!}" />
</form>
</#if>
</#if>
@@ -525,8 +525,8 @@ under the License.
${pmBillingAddress.address1}<br />
<#if pmBillingAddress.address2?has_content>${pmBillingAddress.address2}<br /></#if>
${pmBillingAddress.city}<#if pmBillingAddress.stateProvinceGeoId?has_content>, ${pmBillingAddress.stateProvinceGeoId} </#if>
- ${pmBillingAddress.postalCode?if_exists}<br />
- ${pmBillingAddress.countryGeoId?if_exists}
+ ${pmBillingAddress.postalCode!}<br />
+ ${pmBillingAddress.countryGeoId!}
</div>
</td>
<td width="10%"> </td>
@@ -554,7 +554,7 @@ under the License.
<tr>
<td align="right" valign="top" width="29%"><span class="label">${uiLabelMap.OrderPONumber}</span></td>
<td width="1%"> </td>
- <td valign="top" width="60%">${customerPoNumber?if_exists}</td>
+ <td valign="top" width="60%">${customerPoNumber!}</td>
<td width="10%"> </td>
</tr>
</#if>
@@ -583,7 +583,7 @@ under the License.
<tr><td colspan="4"><hr /></td></tr>
<tr><td colspan="4">
<form name="addPaymentMethodToOrder" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="orderId" value="${orderId?if_exists}"/>
+ <input type="hidden" name="orderId" value="${orderId!}"/>
<table class="basic-table" cellspacing='0'>
<tr>
<td width="29%" align="right" nowrap="nowrap"><span class="label">${uiLabelMap.AccountingPaymentMethod}</span></td>
@@ -592,19 +592,19 @@ under the License.
<select name="paymentMethodId">
<#list paymentMethodValueMaps as paymentMethodValueMap>
<#assign paymentMethod = paymentMethodValueMap.paymentMethod/>
- <option value="${paymentMethod.get("paymentMethodId")?if_exists}">
+ <option value="${paymentMethod.get("paymentMethodId")!}">
<#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId>
<#assign creditCard = paymentMethodValueMap.creditCard/>
<#if (creditCard?has_content)>
<#if security.hasEntityPermission("PAY_INFO", "_VIEW", session) || security.hasEntityPermission("ACCOUNTING", "_VIEW", session)>
- ${creditCard.cardType?if_exists} <@maskSensitiveNumber cardNumber=creditCard.cardNumber?if_exists/> ${creditCard.expireDate?if_exists}
+ ${creditCard.cardType!} <@maskSensitiveNumber cardNumber=creditCard.cardNumber!/> ${creditCard.expireDate!}
<#else>
${Static["org.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}
</#if>
</#if>
<#else>
- ${paymentMethod.paymentMethodTypeId?if_exists}
- <#if paymentMethod.description?exists>${paymentMethod.description}</#if>
+ ${paymentMethod.paymentMethodTypeId!}
+ <#if paymentMethod.description??>${paymentMethod.description}</#if>
(${paymentMethod.paymentMethodId})
</#if>
</option>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Sat Aug 16 11:34:57 2014
@@ -48,7 +48,7 @@ under the License.
}
</script>
-<#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && (!orderHeader.salesChannelEnumId?exists || orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL")>
+<#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && (!orderHeader.salesChannelEnumId?? || orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL")>
<div class="screenlet">
<div class="screenlet-title-bar">
<ul><li class="h3"> ${uiLabelMap.OrderActions}</li></ul>
@@ -100,7 +100,7 @@ under the License.
<li>
<form name="receiveInventoryForm" action="/facility/control/ReceiveInventory" method="post">
<input type="hidden" name="initialSelected" value="Y"/>
- <input type="hidden" name="purchaseOrderId" value="${orderId?if_exists}"/>
+ <input type="hidden" name="purchaseOrderId" value="${orderId!}"/>
<select name="facilityId">
<#list ownedFacilities as facility>
<option value="${facility.facilityId}">${facility.facilityName}</option>
@@ -112,7 +112,7 @@ under the License.
<li>
<form name="partialReceiveInventoryForm" action="/facility/control/ReceiveInventory" method="post">
<input type="hidden" name="initialSelected" value="Y"/>
- <input type="hidden" name="purchaseOrderId" value="${orderId?if_exists}"/>
+ <input type="hidden" name="purchaseOrderId" value="${orderId!}"/>
<input type="hidden" name="partialReceive" value="Y"/>
<select name="facilityId">
<#list ownedFacilities as facility>
@@ -156,7 +156,7 @@ under the License.
<li>
<form name="quickreturn" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderId}"/>
- <input type="hidden" name="party_id" value="${partyId?if_exists}"/>
+ <input type="hidden" name="party_id" value="${partyId!}"/>
<input type="hidden" name="returnHeaderTypeId" value="${returnHeaderTypeId}"/>
<input type="hidden" name="needsInventoryReceive" value="${needsInventoryReceive?default("N")}"/>
</form>
@@ -189,10 +189,10 @@ under the License.
</div>
</#if>
-<#if shipGroups?has_content && (!orderHeader.salesChannelEnumId?exists || orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL")>
+<#if shipGroups?has_content && (!orderHeader.salesChannelEnumId?? || orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL")>
<#list shipGroups as shipGroup>
- <#assign shipmentMethodType = shipGroup.getRelatedOne("ShipmentMethodType", false)?if_exists>
- <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress", false)?if_exists>
+ <#assign shipmentMethodType = shipGroup.getRelatedOne("ShipmentMethodType", false)!>
+ <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress", false)!>
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
@@ -204,10 +204,10 @@ under the License.
</div>
<div class="screenlet-body" id="ShipGroupScreenletBody_${shipGroup.shipGroupSeqId}">
<form name="updateOrderItemShipGroup" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="orderId" value="${orderId?if_exists}"/>
- <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId?if_exists}"/>
+ <input type="hidden" name="orderId" value="${orderId!}"/>
+ <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId!}"/>
<input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
- <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId?if_exists}"/>
+ <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId!}"/>
<table class="basic-table" cellspacing='0'>
<tr>
<td align="right" valign="top" width="15%">
@@ -218,13 +218,13 @@ under the License.
<div>
<#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED">
<select name="contactMechId">
- <option selected="selected" value="${shipGroup.contactMechId?if_exists}">${(shipGroupAddress.address1)?default("")} - ${shipGroupAddress.city?default("")}</option>
+ <option selected="selected" value="${shipGroup.contactMechId!}">${(shipGroupAddress.address1)?default("")} - ${shipGroupAddress.city?default("")}</option>
<#if shippingContactMechList?has_content>
<option disabled="disabled" value=""></option>
<#list shippingContactMechList as shippingContactMech>
- <#assign shippingPostalAddress = shippingContactMech.getRelatedOne("PostalAddress", false)?if_exists>
+ <#assign shippingPostalAddress = shippingContactMech.getRelatedOne("PostalAddress", false)!>
<#if shippingContactMech.contactMechId?has_content>
- <option value="${shippingContactMech.contactMechId?if_exists}">${(shippingPostalAddress.address1)?default("")} - ${shippingPostalAddress.city?default("")}</option>
+ <option value="${shippingContactMech.contactMechId!}">${(shippingPostalAddress.address1)?default("")} - ${shippingPostalAddress.city?default("")}</option>
</#if>
</#list>
</#if>
@@ -252,18 +252,18 @@ under the License.
-->
<select name="shipmentMethod">
<#if shipGroup.shipmentMethodTypeId?has_content>
- <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if shipGroup.carrierPartyId?exists && shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId!}</#if> ${shipmentMethodType.get("description",locale)!}</option>
+ <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if shipGroup.carrierPartyId?? && shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId!}</#if> ${shipmentMethodType.get("description",locale)!}</option>
</#if>
<#list productStoreShipmentMethList as productStoreShipmentMethod>
<#assign shipmentMethodTypeAndParty = productStoreShipmentMethod.shipmentMethodTypeId + "@" + productStoreShipmentMethod.partyId + "@" + productStoreShipmentMethod.roleTypeId>
<#if productStoreShipmentMethod.partyId?has_content || productStoreShipmentMethod?has_content>
- <option value="${shipmentMethodTypeAndParty?if_exists}"><#if productStoreShipmentMethod.partyId != "_NA_">${productStoreShipmentMethod.partyId?if_exists}</#if> ${productStoreShipmentMethod.get("description",locale)?default("")}</option>
+ <option value="${shipmentMethodTypeAndParty!}"><#if productStoreShipmentMethod.partyId != "_NA_">${productStoreShipmentMethod.partyId!}</#if> ${productStoreShipmentMethod.get("description",locale)?default("")}</option>
</#if>
</#list>
</select>
<#else>
<#if (shipGroup.carrierPartyId)?default("_NA_") != "_NA_">
- ${shipGroup.carrierPartyId?if_exists}
+ ${shipGroup.carrierPartyId!}
</#if>
<#if shipmentMethodType?has_content>
${shipmentMethodType.get("description",locale)?default("")}
@@ -296,10 +296,10 @@ under the License.
</form>
<div id="newShippingAddressForm" class="popup" style="display: none;">
<form id="addShippingAddress" name="addShippingAddress" method="post" action="addShippingAddress">
- <input type="hidden" name="orderId" value="${orderId?if_exists}"/>
- <input type="hidden" name="partyId" value="${partyId?if_exists}"/>
- <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId?if_exists}"/>
- <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId?if_exists}"/>
+ <input type="hidden" name="orderId" value="${orderId!}"/>
+ <input type="hidden" name="partyId" value="${partyId!}"/>
+ <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId!}"/>
+ <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId!}"/>
<input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
<div class="form-row">
<label for="address1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-address1" style="display: none" class="custom-advice">(required)</span></label>
@@ -321,7 +321,7 @@ under the License.
<label for="countryGeoId">${uiLabelMap.CommonCountry}* <span id="advice-required-countryGeoId" style="display: none" class="custom-advice">(required)</span></label>
<div class="form-field">
<select name="shipToCountryGeoId" id="countryGeoId" class="required">
- <#if countryGeoId?exists>
+ <#if countryGeoId??>
<option value="${countryGeoId}">${countryGeoId}</option>
</#if>
${screens.render("component://common/widget/CommonScreens.xml#countries")}
@@ -396,8 +396,8 @@ under the License.
<tr>
<td>
<#assign shipmentMethodAndAmount = shippingRate.shipmentMethodTypeId + "@" + "UPS" + "*" + shippingRate.rate>
- <input type='radio' name='shipmentMethodAndAmount' value='${shipmentMethodAndAmount?if_exists}' />
- UPS ${shippingRate.shipmentMethodDescription?if_exists}
+ <input type='radio' name='shipmentMethodAndAmount' value='${shipmentMethodAndAmount!}' />
+ UPS ${shippingRate.shipmentMethodDescription!}
<#if (shippingRate.rate > -1)>
<@ofbizCurrency amount=shippingRate.rate isoCode=orderReadHelper.getCurrency()/>
<#else>
@@ -406,14 +406,14 @@ under the License.
</td>
</tr>
</#list>
- <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRouteSegmentId?if_exists}"/>
- <input type="hidden" name="shipmentId" value="${pickedShipmentId?if_exists}"/>
- <input type="hidden" name="orderAdjustmentId" value="${orderAdjustmentId?if_exists}"/>
- <input type="hidden" name="orderId" value="${orderId?if_exists}"/>
- <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId?if_exists}"/>
+ <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRouteSegmentId!}"/>
+ <input type="hidden" name="shipmentId" value="${pickedShipmentId!}"/>
+ <input type="hidden" name="orderAdjustmentId" value="${orderAdjustmentId!}"/>
+ <input type="hidden" name="orderId" value="${orderId!}"/>
+ <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId!}"/>
<input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/>
- <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId?if_exists}"/>
- <input type="hidden" name="shippingAmount" value="${shippingAmount?if_exists}"/>
+ <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId!}"/>
+ <input type="hidden" name="shippingAmount" value="${shippingAmount!}"/>
<tr>
<td valign="top" width="80%">
<input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/>
@@ -441,7 +441,7 @@ under the License.
</#if>
<#if orderShipmentInfoSummaryList?has_content>
<#list orderShipmentInfoSummaryList as orderShipmentInfoSummary>
- <#if orderShipmentInfoSummary.shipGroupSeqId?if_exists == shipGroup.shipGroupSeqId?if_exists>
+ <#if orderShipmentInfoSummary.shipGroupSeqId! == shipGroup.shipGroupSeqId!>
<div>
<#if (orderShipmentInfoSummaryList?size > 1)>${orderShipmentInfoSummary.shipmentPackageSeqId}: </#if>
${uiLabelMap.CommonIdCode}: ${orderShipmentInfoSummary.trackingCode?default("[${uiLabelMap.OrderNotYetKnown}]")}
@@ -508,7 +508,7 @@ under the License.
<a href="javascript:addInstruction('${shipGroup.shipGroupSeqId}');" class="buttontext" id="addInstruction_${shipGroup.shipGroupSeqId}">${uiLabelMap.CommonAdd}</a>
</#if>
<a href="javascript:saveInstruction('${shipGroup.shipGroupSeqId}');" class="buttontext" id="saveInstruction_${shipGroup.shipGroupSeqId}" style="display:none">${uiLabelMap.CommonSave}</a>
- <textarea name="shippingInstructions" id="shippingInstructions_${shipGroup.shipGroupSeqId}" style="display:none" rows="0" cols="0">${shipGroup.shippingInstructions?if_exists}</textarea>
+ <textarea name="shippingInstructions" id="shippingInstructions_${shipGroup.shipGroupSeqId}" style="display:none" rows="0" cols="0">${shipGroup.shippingInstructions!}</textarea>
</form>
<#else>
<#if shipGroup.shippingInstructions?has_content>
@@ -537,7 +537,7 @@ under the License.
<#else>
<a href="javascript:addGiftMessage('${shipGroup.shipGroupSeqId}');" class="buttontext" id="addGiftMessage_${shipGroup.shipGroupSeqId}">${uiLabelMap.CommonAdd}</a>
</#if>
- <textarea name="giftMessage" id="giftMessage_${shipGroup.shipGroupSeqId}" style="display:none" rows="0" cols="0">${shipGroup.giftMessage?if_exists}</textarea>
+ <textarea name="giftMessage" id="giftMessage_${shipGroup.shipGroupSeqId}" style="display:none" rows="0" cols="0">${shipGroup.giftMessage!}</textarea>
<a href="javascript:saveGiftMessage('${shipGroup.shipGroupSeqId}');" class="buttontext" id="saveGiftMessage_${shipGroup.shipGroupSeqId}" style="display:none">${uiLabelMap.CommonSave}</a>
</form>
</td>
@@ -554,9 +554,9 @@ under the License.
<form name="setShipGroupDates_${shipGroup.shipGroupSeqId}" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderHeader.orderId}"/>
<input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/>
- <@htmlTemplate.renderDateTimeField name="shipAfterDate" event="" action="" value="${shipGroup.shipAfterDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipAfterDate_${shipGroup.shipGroupSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="shipAfterDate" event="" action="" value="${shipGroup.shipAfterDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipAfterDate_${shipGroup.shipGroupSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<br/>
- <@htmlTemplate.renderDateTimeField name="shipByDate" event="" action="" value="${shipGroup.shipByDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipByDate_${shipGroup.shipGroupSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="shipByDate" event="" action="" value="${shipGroup.shipByDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipByDate_${shipGroup.shipGroupSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
<input type="submit" value="${uiLabelMap.CommonUpdate}"/>
</form>
</td>
@@ -578,7 +578,7 @@ under the License.
<#assign shipmentRouteSegments = delegator.findByAnd("ShipmentRouteSegment", {"shipmentId" : shipment.shipmentId}, null, false)>
<#if shipmentRouteSegments?has_content>
<#assign shipmentRouteSegment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentRouteSegments)>
- <#if "UPS" == (shipmentRouteSegment.carrierPartyId)?if_exists>
+ <#if "UPS" == (shipmentRouteSegment.carrierPartyId)!>
<a href="javascript:document.upsEmailReturnLabel${shipment_index}.submit();" class="buttontext">${uiLabelMap.ProductEmailReturnShippingLabelUPS}</a>
</#if>
<form name="upsEmailReturnLabel${shipment_index}" method="post" action="<@o...@ofbizUrl>">
@@ -605,7 +605,7 @@ under the License.
<#if orderHeader.orderTypeId == "SALES_ORDER">
<#if !shipGroup.supplierPartyId?has_content>
<#if orderHeader.statusId == "ORDER_APPROVED">
- <a href="/facility/control/PackOrder?facilityId=${storeFacilityId?if_exists}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup}</a>
+ <a href="/facility/control/PackOrder?facilityId=${storeFacilityId!}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup}</a>
<br />
</#if>
<a href="javascript:document.createShipment_${shipGroup.shipGroupSeqId}.submit()" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup}</a>
@@ -613,8 +613,8 @@ under the License.
<input type="hidden" name="primaryOrderId" value="${orderId}"/>
<input type="hidden" name="primaryShipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/>
<input type="hidden" name="statusId" value="SHIPMENT_INPUT" />
- <input type="hidden" name="facilityId" value="${storeFacilityId?if_exists}" />
- <input type="hidden" name="estimatedShipDate" value="${shipGroup.shipByDate?if_exists}"/>
+ <input type="hidden" name="facilityId" value="${storeFacilityId!}" />
+ <input type="hidden" name="estimatedShipDate" value="${shipGroup.shipByDate!}"/>
</form>
</#if>
<#else>
@@ -627,8 +627,8 @@ under the License.
<input type="hidden" name="shipmentTypeId" value="PURCHASE_SHIPMENT"/>
<input type="hidden" name="statusId" value="PURCH_SHIP_CREATED"/>
<input type="hidden" name="externalLoginKey" value="${externalLoginKey}"/>
- <input type="hidden" name="estimatedShipDate" value="${shipGroup.estimatedShipDate?if_exists}"/>
- <input type="hidden" name="estimatedArrivalDate" value="${shipGroup.estimatedDeliveryDate?if_exists}"/>
+ <input type="hidden" name="estimatedShipDate" value="${shipGroup.estimatedShipDate!}"/>
+ <input type="hidden" name="estimatedArrivalDate" value="${shipGroup.estimatedDeliveryDate!}"/>
<select name="destinationFacilityId">
<#list facilities as facility>
<option value="${facility.facilityId}">${facility.facilityName}</option>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/receivepayment.ftl Sat Aug 16 11:34:57 2014
@@ -30,7 +30,7 @@ under the License.
<a href="javascript:document.paysetupform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a>
<form method="post" action="<@o...@ofbizUrl>" name="paysetupform">
- <#if requestParameters.workEffortId?exists>
+ <#if requestParameters.workEffortId??>
<input type="hidden" name="workEffortId" value="${requestParameters.workEffortId}" />
</#if>
<input type="hidden" name="partyId" value="${orderRoles[0].partyId}" />
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/sendconfirmationemail.ftl Sat Aug 16 11:34:57 2014
@@ -30,11 +30,11 @@ under the License.
<a href="javascript:document.sendConfirmationForm.submit()" class="buttontext">${uiLabelMap.CommonSend}</a>
<br />
<form method="post" action="<@o...@ofbizUrl>" name="sendConfirmationForm">
- <input type="hidden" name="orderId" value="${orderId?if_exists}" />
- <#if ! productStoreEmailSetting?exists>
+ <input type="hidden" name="orderId" value="${orderId!}" />
+ <#if ! productStoreEmailSetting??>
<#assign productStoreEmailSetting = {} />
</#if>
- <input type="hidden" name="partyId" value="${partyId?if_exists}" />
+ <input type="hidden" name="partyId" value="${partyId!}" />
<input type="hidden" name="contentType" value="${productStoreEmailSetting.contentType?default("")}" />
<table class="basic-table" cellspacing='0'>
<tr>
@@ -65,7 +65,7 @@ under the License.
<tr>
<td width="26%" align="right" class="label">${uiLabelMap.CommonFrom} </td>
<td width="54%">
- <#if productStoreEmailSetting.fromAddress?exists>
+ <#if productStoreEmailSetting.fromAddress??>
<input type="hidden" name="sendFrom" value="${productStoreEmailSetting.fromAddress}" />
<#else>
<input type="text" size="40" name="sendFrom" value="" />
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl Sat Aug 16 11:34:57 2014
@@ -68,26 +68,26 @@ under the License.
<fo:table-body>
<fo:table-row>
<fo:table-cell number-rows-spanned="4">
- <#assign address = data.address?if_exists>
- <fo:block>${uiLabelMap.CommonTo}: ${address.toName?if_exists}</fo:block>
+ <#assign address = data.address!>
+ <fo:block>${uiLabelMap.CommonTo}: ${address.toName!}</fo:block>
<#if address.attnName?has_content>
- <fo:block>${uiLabelMap.CommonAttn}: ${address.attnName?if_exists}</fo:block>
+ <fo:block>${uiLabelMap.CommonAttn}: ${address.attnName!}</fo:block>
</#if>
- <fo:block>${address.address1?if_exists}</fo:block>
- <fo:block>${address.address2?if_exists}</fo:block>
+ <fo:block>${address.address1!}</fo:block>
+ <fo:block>${address.address2!}</fo:block>
<fo:block>
- ${address.city?if_exists}<#if address.stateProvinceGeoId?has_content>, ${address.stateProvinceGeoId}</#if>
- ${address.postalCode?if_exists} ${address.countryGeoId?if_exists}
+ ${address.city!}<#if address.stateProvinceGeoId?has_content>, ${address.stateProvinceGeoId}</#if>
+ ${address.postalCode!} ${address.countryGeoId!}
</fo:block>
- <#if data.phoneNumber?exists>
- <fo:block><#if data.phoneNumber.areaCode?exists>(${data.phoneNumber.areaCode}) </#if>${data.phoneNumber.contactNumber}</fo:block>
+ <#if data.phoneNumber??>
+ <fo:block><#if data.phoneNumber.areaCode??>(${data.phoneNumber.areaCode}) </#if>${data.phoneNumber.contactNumber}</fo:block>
</#if>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell><fo:block font-weight="bold">${uiLabelMap.ProductShipmentMethod}</fo:block></fo:table-cell>
- <fo:table-cell><#if data.carrierShipmentMethod?exists><fo:block>${data.carrierShipmentMethod.partyId} ${data.shipmentMethodType.description}</fo:block></#if></fo:table-cell>
+ <fo:table-cell><#if data.carrierShipmentMethod??><fo:block>${data.carrierShipmentMethod.partyId} ${data.shipmentMethodType.description}</fo:block></#if></fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell><fo:block font-weight="bold">${uiLabelMap.OrderShipBeforeDate}</fo:block></fo:table-cell>
@@ -141,7 +141,7 @@ under the License.
<fo:block>${line.product.productId}</fo:block>
</fo:table-cell>
<fo:table-cell background-color="${rowColor}">
- <fo:block>${line.orderItem.itemDescription?if_exists}</fo:block>
+ <fo:block>${line.orderItem.itemDescription!}</fo:block>
</fo:table-cell>
<fo:table-cell background-color="${rowColor}">
<fo:block text-align="right">${line.quantityInGroup?default(0)}</fo:block>
@@ -155,7 +155,7 @@ under the License.
</fo:table-row>
- <#list line.expandedList?if_exists as expandedLine>
+ <#list line.expandedList! as expandedLine>
<fo:table-row>
<fo:table-cell background-color="${rowColor}" font-style="italic">
<fo:block margin-left="20pt">${expandedLine.product.productId}</fo:block>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl Sat Aug 16 11:34:57 2014
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
-<#if inProcess?exists>
+<#if inProcess??>
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
@@ -64,7 +64,7 @@ under the License.
</div>
</#if>
<br />
-<#if wfTransitions?exists && wfTransitions?has_content>
+<#if wfTransitions?? && wfTransitions?has_content>
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
@@ -88,7 +88,7 @@ under the License.
<#list wfTransitions as trans>
<#if trans.extendedAttributes?has_content>
<#assign attrs = Static["org.ofbiz.base.util.StringUtil"].strToMap(trans.extendedAttributes)>
- <#if attrs.approvalCode?exists>
+ <#if attrs.approvalCode??>
<option value="${attrs.approvalCode}">${trans.transitionName}</option>
</#if>
</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/CopyQuote.ftl Sat Aug 16 11:34:57 2014
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<#if quote?exists>
+<#if quote??>
<form action="<@o...@ofbizUrl>" method="post">
<input type="hidden" name="quoteId" value="${quoteId}"/>
<div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl Sat Aug 16 11:34:57 2014
@@ -50,7 +50,7 @@ under the License.
<#assign totalQuoteAmount = 0.0>
<#assign alt_row = false/>
<#list quoteItems as quoteItem>
- <#if quoteItem.productId?exists>
+ <#if quoteItem.productId??>
<#assign product = quoteItem.getRelatedOne("Product", false)>
<#else>
<#assign product = null> <#-- don't drag it along to the next iteration -->
@@ -71,7 +71,7 @@ under the License.
<tr <#if alt_row>class="alternate-row" </#if>>
<td >
<div>
- <#if showQuoteManagementLinks?exists && quoteItem.isPromo?default("N") == "N" && quote.statusId=="QUO_CREATED">
+ <#if showQuoteManagementLinks?? && quoteItem.isPromo?default("N") == "N" && quote.statusId=="QUO_CREATED">
<a href="<@o...@ofbizUrl>" class="buttontext">${quoteItem.quoteItemSeqId}</a>
<#else>
${quoteItem.quoteItemSeqId}
@@ -81,23 +81,23 @@ under the License.
</td>
<td valign="top">
<div>
- ${(product.internalName)?if_exists}
- <#if showQuoteManagementLinks?exists>
- <a href="/catalog/control/EditProduct?productId=${quoteItem.productId?if_exists}" class="buttontext">
- <#if quoteItem.productId?exists>
+ ${(product.internalName)!}
+ <#if showQuoteManagementLinks??>
+ <a href="/catalog/control/EditProduct?productId=${quoteItem.productId!}" class="buttontext">
+ <#if quoteItem.productId??>
${quoteItem.productId}
<#else>
${uiLabelMap.ProductCreateProduct}
</#if>
</a>
<#else>
- <a href="<@o...@ofbizUrl>" class="buttontext">${quoteItem.productId?if_exists}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext">${quoteItem.productId!}</a>
</#if>
</div>
</td>
<td></td>
- <td align="right" valign="top">${quoteItem.quantity?if_exists}</td>
- <td align="right" valign="top">${quoteItem.selectedAmount?if_exists}</td>
+ <td align="right" valign="top">${quoteItem.quantity!}</td>
+ <td align="right" valign="top">${quoteItem.selectedAmount!}</td>
<td align="right" valign="top"><@ofbizCurrency amount=quoteItem.quoteUnitPrice isoCode=quote.currencyUomId/></td>
<td align="right" valign="top"><@ofbizCurrency amount=totalQuoteItemAdjustmentAmount isoCode=quote.currencyUomId/></td>
<td align="right" valign="top"><@ofbizCurrency amount=totalQuoteItemAmount isoCode=quote.currencyUomId/></td>
@@ -105,10 +105,10 @@ under the License.
<#list quoteTerms as quoteTerm>
<#assign termDescription = delegator.findOne("TermType",{"termTypeId":quoteTerm.termTypeId}, false)>
<tr <#if alt_row>class="alternate-row" </#if>>
- <td valign="top"> ${termDescription.description?if_exists}</td>
- <td valign="top"> ${quoteTerm.termValue?if_exists}</td>
- <td valign="top"><#if quoteTerm.termDays?exists> ${quoteTerm.termDays?if_exists}</#if></td>
- <td valign="top"><#if quoteTerm.description?exists> ${quoteTerm.description}</#if></td>
+ <td valign="top"> ${termDescription.description!}</td>
+ <td valign="top"> ${quoteTerm.termValue!}</td>
+ <td valign="top"><#if quoteTerm.termDays??> ${quoteTerm.termDays!}</#if></td>
+ <td valign="top"><#if quoteTerm.description??> ${quoteTerm.description}</#if></td>
<td align="right" valign="top"></td>
<td align="right" valign="top"></td>
<td align="right" valign="top"></td>
@@ -119,7 +119,7 @@ under the License.
<#list quoteItemAdjustments as quoteItemAdjustment>
<#assign adjustmentType = quoteItemAdjustment.getRelatedOne("OrderAdjustmentType", false)>
<tr class="alternate-row">
- <td align="right" colspan="4"><span class="label">${adjustmentType.get("description",locale)?if_exists}</span></td>
+ <td align="right" colspan="4"><span class="label">${adjustmentType.get("description",locale)!}</span></td>
<td align="right"><@ofbizCurrency amount=quoteItemAdjustment.amount isoCode=quote.currencyUomId/></td>
<td> </td>
</tr>
@@ -137,10 +137,10 @@ under the License.
<#assign findAdjustment = false>
<#list quoteAdjustments as quoteAdjustment>
<#assign adjustmentType = quoteAdjustment.getRelatedOne("OrderAdjustmentType", false)>
- <#if !quoteAdjustment.quoteItemSeqId?exists>
+ <#if !quoteAdjustment.quoteItemSeqId??>
<#assign totalQuoteHeaderAdjustmentAmount = quoteAdjustment.amount?default(0) + totalQuoteHeaderAdjustmentAmount>
<tr>
- <td align="right" colspan="6"><span class="label">${adjustmentType.get("description",locale)?if_exists}</span></td>
+ <td align="right" colspan="6"><span class="label">${adjustmentType.get("description",locale)!}</span></td>
<td align="right"><@ofbizCurrency amount=quoteAdjustment.amount isoCode=quote.currencyUomId/></td>
</tr>
</#if>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl Sat Aug 16 11:34:57 2014
@@ -28,7 +28,7 @@ under the License.
</td>
<td width="5%"> </td>
<td valign="top" width="80%">
- ${(quote.issueDate.toString())?if_exists}
+ ${(quote.issueDate.toString())!}
</td>
</tr>
<tr><td colspan="3"><hr /></td></tr>
@@ -38,7 +38,7 @@ under the License.
</td>
<td width="5%"> </td>
<td valign="top" width="80%">
- ${(quote.validFromDate.toString())?if_exists}
+ ${(quote.validFromDate.toString())!}
</td>
</tr>
<tr><td colspan="3"><hr /></td></tr>
@@ -48,7 +48,7 @@ under the License.
</td>
<td width="5%"> </td>
<td valign="top" width="80%">
- ${(quote.validThruDate.toString())?if_exists}
+ ${(quote.validThruDate.toString())!}
</td>
</tr>
</table>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl Sat Aug 16 11:34:57 2014
@@ -29,7 +29,7 @@ under the License.
</td>
<td width="5%"> </td>
<td valign="top" width="80%">
- ${(quoteType.get("description",locale))?default(quote.quoteTypeId?if_exists)}
+ ${(quoteType.get("description",locale))?default(quote.quoteTypeId!)}
</td>
</tr>
<tr><td colspan="3"><hr /></td></tr>
@@ -41,7 +41,7 @@ under the License.
</td>
<td width="5%"> </td>
<td valign="top" width="80%">
- ${(salesChannel.get("description",locale))?default(quote.salesChannelEnumId?if_exists)}
+ ${(salesChannel.get("description",locale))?default(quote.salesChannelEnumId!)}
</td>
</tr>
<tr><td colspan="3"><hr /></td></tr>
@@ -53,7 +53,7 @@ under the License.
</td>
<td width="5%"> </td>
<td valign="top" width="80%">
- ${(statusItem.get("description", locale))?default(quote.statusId?if_exists)}
+ ${(statusItem.get("description", locale))?default(quote.statusId!)}
</td>
</tr>
<#-- party -->
@@ -64,7 +64,7 @@ under the License.
</td>
<td width="5%"> </td>
<td valign="top" width="80%">
- ${quote.partyId?if_exists}
+ ${quote.partyId!}
</td>
</tr>
<#-- quote name -->
@@ -75,7 +75,7 @@ under the License.
</td>
<td width="5%"> </td>
<td valign="top" width="80%">
- ${quote.quoteName?if_exists}
+ ${quote.quoteName!}
</td>
</tr>
<#-- quote description -->
@@ -86,7 +86,7 @@ under the License.
</td>
<td width="5%"> </td>
<td valign="top" width="80%">
- ${quote.description?if_exists}
+ ${quote.description!}
</td>
</tr>
<#-- quote currency -->
@@ -97,7 +97,7 @@ under the License.
</td>
<td width="5%"> </td>
<td valign="top" width="80%">
- <#if currency?exists>${currency.get("description",locale)?default(quote.currencyUomId?if_exists)}</#if>
+ <#if currency??>${currency.get("description",locale)?default(quote.currencyUomId!)}</#if>
</td>
</tr>
<#-- quote currency -->
@@ -108,7 +108,7 @@ under the License.
</td>
<td width="5%"> </td>
<td valign="top" width="80%">
- <#if store?exists>${store.storeName?default(quote.productStoreId?if_exists)}</#if>
+ <#if store??>${store.storeName?default(quote.productStoreId!)}</#if>
</td>
</tr>
</table>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportBody.fo.ftl Sat Aug 16 11:34:57 2014
@@ -41,7 +41,7 @@ under the License.
<#assign rowColor = "white">
<#assign totalQuoteAmount = 0.0>
<#list quoteItems as quoteItem>
- <#if quoteItem.productId?exists>
+ <#if quoteItem.productId??>
<#assign product = quoteItem.getRelatedOne("Product", false)>
</#if>
<#assign quoteItemAmount = quoteItem.quoteUnitPrice?default(0) * quoteItem.quantity?default(0)>
@@ -58,13 +58,13 @@ under the License.
<fo:block>${quoteItem.quoteItemSeqId}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${(product.internalName)?if_exists} [${quoteItem.productId?if_exists}]</fo:block>
+ <fo:block>${(product.internalName)!} [${quoteItem.productId!}]</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block text-align="right">${quoteItem.quantity?if_exists}</fo:block>
+ <fo:block text-align="right">${quoteItem.quantity!}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block text-align="right">${quoteItem.selectedAmount?if_exists}</fo:block>
+ <fo:block text-align="right">${quoteItem.selectedAmount!}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
<fo:block text-align="right"><@ofbizCurrency amount=quoteItem.quoteUnitPrice isoCode=quote.currencyUomId/></fo:block>
@@ -89,7 +89,7 @@ under the License.
<fo:table-cell padding="2pt" background-color="${rowColor}">
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block font-size="7pt" text-align="right">${adjustmentType.get("description",locale)?if_exists}</fo:block>
+ <fo:block font-size="7pt" text-align="right">${adjustmentType.get("description",locale)!}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
<fo:block font-size="7pt" text-align="right"><@ofbizCurrency amount=quoteItemAdjustment.amount isoCode=quote.currencyUomId/></fo:block>
@@ -127,11 +127,11 @@ under the License.
<#assign totalQuoteHeaderAdjustmentAmount = 0.0>
<#list quoteAdjustments as quoteAdjustment>
<#assign adjustmentType = quoteAdjustment.getRelatedOne("OrderAdjustmentType", false)>
- <#if !quoteAdjustment.quoteItemSeqId?exists>
+ <#if !quoteAdjustment.quoteItemSeqId??>
<#assign totalQuoteHeaderAdjustmentAmount = quoteAdjustment.amount?default(0) + totalQuoteHeaderAdjustmentAmount>
<fo:table-row>
<fo:table-cell padding="2pt">
- <fo:block font-weight="bold" text-align="right">${adjustmentType.get("description", locale)?if_exists}</fo:block>
+ <fo:block font-weight="bold" text-align="right">${adjustmentType.get("description", locale)!}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt">
<fo:block text-align="right"><@ofbizCurrency amount=quoteAdjustment.amount isoCode=quote.currencyUomId/></fo:block>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportContactMechs.fo.ftl Sat Aug 16 11:34:57 2014
@@ -26,7 +26,7 @@ under the License.
<fo:table-cell>
<fo:block>
<fo:block font-weight="bold">${uiLabelMap.OrderAddress}: </fo:block>
- <#if quote.partyId?exists>
+ <#if quote.partyId??>
<#assign quotePartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", quote.partyId, "compareDate", quote.issueDate, "userLogin", userLogin))/>
<fo:block>${quotePartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")}</fo:block>
<#else>
@@ -38,7 +38,7 @@ under the License.
<fo:table-row>
<fo:table-cell>
<fo:block>
- <#if toPostalAddress?exists>
+ <#if toPostalAddress??>
${setContextField("postalAddress", toPostalAddress)}
${screens.render("component://party/widget/partymgr/PartyScreens.xml#postalAddressPdfFormatter")}
</#if>
@@ -55,23 +55,23 @@ under the License.
<fo:table-body>
<fo:table-row>
<fo:table-cell><fo:block>${uiLabelMap.OrderOrderQuoteName}:</fo:block></fo:table-cell>
- <fo:table-cell><fo:block>${quote.quoteName?if_exists}</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>${quote.quoteName!}</fo:block></fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell><fo:block>${uiLabelMap.CommonDescription}:</fo:block></fo:table-cell>
- <fo:table-cell><fo:block>${quote.description?if_exists}</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>${quote.description!}</fo:block></fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell><fo:block>${uiLabelMap.CommonCurrency}:</fo:block></fo:table-cell>
- <fo:table-cell><fo:block><#if currency?exists>${currency.get("description",locale)?default(quote.currencyUomId?if_exists)}</#if></fo:block></fo:table-cell>
+ <fo:table-cell><fo:block><#if currency??>${currency.get("description",locale)?default(quote.currencyUomId!)}</#if></fo:block></fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell><fo:block>${uiLabelMap.CommonValidFromDate}:</fo:block></fo:table-cell>
- <fo:table-cell><fo:block>${(quote.validFromDate.toString())?if_exists}</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>${(quote.validFromDate.toString())!}</fo:block></fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell><fo:block>${uiLabelMap.CommonValidThruDate}:</fo:block></fo:table-cell>
- <fo:table-cell><fo:block>${(quote.validThruDate.toString())?if_exists}</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>${(quote.validThruDate.toString())!}</fo:block></fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteReportHeaderInfo.fo.ftl Sat Aug 16 11:34:57 2014
@@ -24,7 +24,7 @@ under the License.
<fo:block font-weight="bold">${uiLabelMap.OrderOrderQuoteType}</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block font-weight="bold">${(quoteType.get("description",locale))?default(quote.quoteTypeId?if_exists)}</fo:block>
+ <fo:block font-weight="bold">${(quoteType.get("description",locale))?default(quote.quoteTypeId!)}</fo:block>
</fo:list-item-body>
</fo:list-item>
<fo:list-item>
@@ -32,7 +32,7 @@ under the License.
<fo:block>${uiLabelMap.OrderOrderQuoteIssueDate}</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block>${(quote.issueDate.toString())?if_exists}</fo:block>
+ <fo:block>${(quote.issueDate.toString())!}</fo:block>
</fo:list-item-body>
</fo:list-item>
<fo:list-item>
@@ -48,7 +48,7 @@ under the License.
<fo:block>${uiLabelMap.CommonStatus}</fo:block>
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
- <fo:block font-weight="bold">${(statusItem.get("description", locale))?default(quote.statusId?if_exists)}</fo:block>
+ <fo:block font-weight="bold">${(statusItem.get("description", locale))?default(quote.statusId!)}</fo:block>
</fo:list-item-body>
</fo:list-item>
</fo:list-block>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl Sat Aug 16 11:34:57 2014
@@ -30,7 +30,7 @@ under the License.
<#assign rolePartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", quoteRole.partyId, "compareDate", quote.issueDate, "userLogin", userLogin))/>
<tr>
<td align="right" valign="top" width="15%" class="label">
- ${roleType.get("description",locale)?if_exists}
+ ${roleType.get("description",locale)!}
</td>
<td width="5%"> </td>
<td valign="top" width="80%">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportPayment.fo.ftl Sat Aug 16 11:34:57 2014
@@ -70,29 +70,29 @@ under the License.
<fo:table-row>
<#if showProductStore>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${orderPurchasePaymentSummary.productStoreId?if_exists}</fo:block>
+ <fo:block>${orderPurchasePaymentSummary.productStoreId!}</fo:block>
</fo:table-cell>
</#if>
<#if showOriginFacility>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${orderPurchasePaymentSummary.originFacilityId?if_exists}</fo:block>
+ <fo:block>${orderPurchasePaymentSummary.originFacilityId!}</fo:block>
</fo:table-cell>
</#if>
<#if showTerminal>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${orderPurchasePaymentSummary.terminalId?if_exists}</fo:block>
+ <fo:block>${orderPurchasePaymentSummary.terminalId!}</fo:block>
</fo:table-cell>
</#if>
<#if showStatus>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${orderPurchasePaymentSummary.statusId?if_exists}</fo:block>
+ <fo:block>${orderPurchasePaymentSummary.statusId!}</fo:block>
</fo:table-cell>
</#if>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${orderPurchasePaymentSummary.get("description",locale)?if_exists}</fo:block>
+ <fo:block>${orderPurchasePaymentSummary.get("description",locale)!}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${orderPurchasePaymentSummary.maxAmount?if_exists}</fo:block>
+ <fo:block>${orderPurchasePaymentSummary.maxAmount!}</fo:block>
</fo:table-cell>
</fo:table-row>
<#-- toggle the row color -->
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl Sat Aug 16 11:34:57 2014
@@ -74,35 +74,35 @@ under the License.
<fo:table-row>
<#if showProductStore>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${orderPurchaseProductSummary.productStoreId?if_exists}</fo:block>
+ <fo:block>${orderPurchaseProductSummary.productStoreId!}</fo:block>
</fo:table-cell>
</#if>
<#if showOriginFacility>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${orderPurchaseProductSummary.originFacilityId?if_exists}</fo:block>
+ <fo:block>${orderPurchaseProductSummary.originFacilityId!}</fo:block>
</fo:table-cell>
</#if>
<#if showTerminal>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${orderPurchaseProductSummary.terminalId?if_exists}</fo:block>
+ <fo:block>${orderPurchaseProductSummary.terminalId!}</fo:block>
</fo:table-cell>
</#if>
<#if showStatus>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${orderPurchaseProductSummary.statusId?if_exists}</fo:block>
+ <fo:block>${orderPurchaseProductSummary.statusId!}</fo:block>
</fo:table-cell>
</#if>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${orderPurchaseProductSummary.productId?if_exists}</fo:block>
+ <fo:block>${orderPurchaseProductSummary.productId!}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${orderPurchaseProductSummary.internalName?if_exists}</fo:block>
+ <fo:block>${orderPurchaseProductSummary.internalName!}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${orderPurchaseProductSummary.quantity?if_exists}</fo:block>
+ <fo:block>${orderPurchaseProductSummary.quantity!}</fo:block>
</fo:table-cell>
<fo:table-cell padding="2pt" background-color="${rowColor}">
- <fo:block>${orderPurchaseProductSummary.cancelQuantity?if_exists}</fo:block>
+ <fo:block>${orderPurchaseProductSummary.cancelQuantity!}</fo:block>
</fo:table-cell>
</fo:table-row>
<#-- toggle the row color -->