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 10:40:32 UTC
svn commit: r1618313 [8/11] - in /ofbiz/trunk:
specialpurpose/assetmaint/webapp/assetmaint/assetmaint/
specialpurpose/cmssite/template/cms/ specialpurpose/ebay/webapp/ebay/find/
specialpurpose/ebaystore/webapp/ebaystore/store/ specialpurpose/ecommerce/...
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/optionsettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/optionsettings.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/optionsettings.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/optionsettings.ftl Sat Aug 16 08:40:28 2014
@@ -27,16 +27,16 @@ under the License.
<#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId>
<input type="radio" id="shipping_method_${shippingMethod}" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if>/>
<label for="shipping_method_${shippingMethod}">
- <#if shoppingCart.getShippingContactMechId()?exists>
+ <#if shoppingCart.getShippingContactMechId()??>
<#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)>
</#if>
- <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId?if_exists} </#if>${carrierShipmentMethod.description?if_exists}
+ <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId!} </#if>${carrierShipmentMethod.description!}
<#if shippingEst?has_content> - <#if (shippingEst > -1)><@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/><#else>${uiLabelMap.OrderCalculatedOffline}</#if>
</#if>
</label>
</li>
</#list>
- <#if !carrierShipmentMethodList?exists || carrierShipmentMethodList?size == 0>
+ <#if !carrierShipmentMethodList?? || carrierShipmentMethodList?size == 0>
<div>
<input type="radio" name="shipping_method" value="Default" checked="checked"/>
<label for="shipping_method">${uiLabelMap.OrderUseDefault}.</label>
@@ -56,14 +56,14 @@ under the License.
<fieldset>
<div>
<label for="shipping_instructions">${uiLabelMap.OrderSpecialInstructions}</label>
- <textarea cols="30" rows="3" name="shipping_instructions">${shoppingCart.getShippingInstructions()?if_exists}</textarea>
+ <textarea cols="30" rows="3" name="shipping_instructions">${shoppingCart.getShippingInstructions()!}</textarea>
</div>
<div>
<label for="correspondingPoId">${uiLabelMap.OrderPoNumber}</label>
- <input type="text" name="correspondingPoId" value="${shoppingCart.getPoNumber()?if_exists}"/>
+ <input type="text" name="correspondingPoId" value="${shoppingCart.getPoNumber()!}"/>
</div>
</fieldset>
- <#if productStore.showCheckoutGiftOptions?if_exists != "N">
+ <#if productStore.showCheckoutGiftOptions! != "N">
<fieldset><legend>${uiLabelMap.OrderIsThisGift}</legend>
<div>
<input type="radio" id="is_gift_Y" <#if shoppingCart.getIsGift()?default("Y") == "Y">checked="checked"</#if> name="is_gift" value="true"/>
@@ -75,7 +75,7 @@ under the License.
</div>
<div>
<label for="gift_message">${uiLabelMap.OrderGiftMessage}</label>
- <textarea class="textAreaBox" name="gift_message">${shoppingCart.getGiftMessage()?if_exists}</textarea>
+ <textarea class="textAreaBox" name="gift_message">${shoppingCart.getGiftMessage()!}</textarea>
</div>
</fieldset>
</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/ordercomplete.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/ordercomplete.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/ordercomplete.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/ordercomplete.ftl Sat Aug 16 08:40:28 2014
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<h2>${uiLabelMap.EcommerceOrderConfirmation}</h2>
-<#if !isDemoStore?exists || isDemoStore><p>${uiLabelMap.OrderDemoFrontNote}.</p></#if>
+<#if !isDemoStore?? || isDemoStore><p>${uiLabelMap.OrderDemoFrontNote}.</p></#if>
<#if orderHeader?has_content>
${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")}
${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")}
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl Sat Aug 16 08:40:28 2014
@@ -19,8 +19,8 @@ under the License.
<#-- NOTE: this template is used for the orderstatus screen in ecommerce AND for order notification emails through the OrderNoticeEmail.ftl file -->
<#-- the "urlPrefix" value will be prepended to URLs by the ofbizUrl transform if/when there is no "request" object in the context -->
-<#if baseEcommerceSecureUrl?exists><#assign urlPrefix = baseEcommerceSecureUrl/></#if>
-<#if (orderHeader.externalId)?exists && (orderHeader.externalId)?has_content >
+<#if baseEcommerceSecureUrl??><#assign urlPrefix = baseEcommerceSecureUrl/></#if>
+<#if (orderHeader.externalId)?? && (orderHeader.externalId)?has_content >
<#assign externalOrder = "(" + orderHeader.externalId + ")"/>
</#if>
@@ -29,7 +29,7 @@ under the License.
<div class="columnLeft">
<div class="screenlet">
<h3>
- <#if maySelectItems?default("N") == "Y" && returnLink?default("N") == "Y" && (orderHeader.statusId)?if_exists == "ORDER_COMPLETED" && roleTypeId?if_exists == "PLACING_CUSTOMER">
+ <#if maySelectItems?default("N") == "Y" && returnLink?default("N") == "Y" && (orderHeader.statusId)! == "ORDER_COMPLETED" && roleTypeId! == "PLACING_CUSTOMER">
<a href="<@ofbizUrl fullPath="true">makeReturn?orderId=${orderHeader.orderId}</...@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderRequestReturn}</a>
</#if>
${uiLabelMap.OrderOrder}
@@ -37,14 +37,14 @@ under the License.
${uiLabelMap.CommonNbr}<a href="<@ofbizUrl fullPath="true">orderstatus?orderId=${orderHeader.orderId}</...@ofbizUrl>" class="lightbuttontext">${orderHeader.orderId}</a>
</#if>
${uiLabelMap.CommonInformation}
- <#if (orderHeader.orderId)?exists>
- ${externalOrder?if_exists} [ <a href="<@ofbizUrl fullPath="true">order.pdf?orderId=${(orderHeader.orderId)?if_exists}</...@ofbizUrl>" class="lightbuttontext">PDF</a> ]
+ <#if (orderHeader.orderId)??>
+ ${externalOrder!} [ <a href="<@ofbizUrl fullPath="true">order.pdf?orderId=${(orderHeader.orderId)!}</...@ofbizUrl>" class="lightbuttontext">PDF</a> ]
</#if>
</h3>
<#-- placing customer information -->
<ul>
- <#if localOrderReadHelper?exists && orderHeader?has_content>
- <#assign displayParty = localOrderReadHelper.getPlacingParty()?if_exists/>
+ <#if localOrderReadHelper?? && orderHeader?has_content>
+ <#assign displayParty = localOrderReadHelper.getPlacingParty()!/>
<#if displayParty?has_content>
<#assign displayPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", displayParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/>
</#if>
@@ -69,7 +69,7 @@ under the License.
${orderHeader.orderDate.toString()}
</li>
</#if>
- <#if distributorId?exists>
+ <#if distributorId??>
<li>
${uiLabelMap.OrderDistributor}
${distributorId}
@@ -94,10 +94,10 @@ under the License.
<#if paymentAddress.attnName?has_content>${uiLabelMap.PartyAddrAttnName}: ${paymentAddress.attnName}</#if>
${paymentAddress.address1}
<#if paymentAddress.address2?has_content>${paymentAddress.address2}</#if>
- <#assign paymentStateGeo = (delegator.findOne("Geo", {"geoId", paymentAddress.stateProvinceGeoId?if_exists}, false))?if_exists />
- ${paymentAddress.city}<#if paymentStateGeo?has_content>, ${paymentStateGeo.geoName?if_exists}</#if> ${paymentAddress.postalCode?if_exists}
- <#assign paymentCountryGeo = (delegator.findOne("Geo", {"geoId", paymentAddress.countryGeoId?if_exists}, false))?if_exists />
- <#if paymentCountryGeo?has_content>${paymentCountryGeo.geoName?if_exists}</#if>
+ <#assign paymentStateGeo = (delegator.findOne("Geo", {"geoId", paymentAddress.stateProvinceGeoId!}, false))! />
+ ${paymentAddress.city}<#if paymentStateGeo?has_content>, ${paymentStateGeo.geoName!}</#if> ${paymentAddress.postalCode!}
+ <#assign paymentCountryGeo = (delegator.findOne("Geo", {"geoId", paymentAddress.countryGeoId!}, false))! />
+ <#if paymentCountryGeo?has_content>${paymentCountryGeo.geoName!}</#if>
${uiLabelMap.EcommerceBeSureToIncludeYourOrderNb}
</#if>
<#else>
@@ -120,7 +120,7 @@ under the License.
<#if "CREDIT_CARD" == paymentMethod.paymentMethodTypeId && creditCard?has_content>
<#if outputted?default(false)>
</#if>
- <#assign pmBillingAddress = creditCard.getRelatedOne("PostalAddress", false)?if_exists>
+ <#assign pmBillingAddress = creditCard.getRelatedOne("PostalAddress", false)!>
<li>
<ul>
<li> ${uiLabelMap.AccountingCreditCard}
@@ -139,7 +139,7 @@ under the License.
<#if outputted?default(false)>
</#if>
<#if giftCard?has_content && giftCard.cardNumber?has_content>
- <#assign pmBillingAddress = giftCard.getRelatedOne("PostalAddress", false)?if_exists>
+ <#assign pmBillingAddress = giftCard.getRelatedOne("PostalAddress", false)!>
<#assign giftCardNumber = "">
<#assign pcardNumber = giftCard.cardNumber>
<#if pcardNumber?has_content>
@@ -162,12 +162,12 @@ under the License.
<#elseif "EFT_ACCOUNT" == paymentMethod.paymentMethodTypeId && eftAccount?has_content>
<#if outputted?default(false)>
</#if>
- <#assign pmBillingAddress = eftAccount.getRelatedOne("PostalAddress", false)?if_exists>
+ <#assign pmBillingAddress = eftAccount.getRelatedOne("PostalAddress", false)!>
<li>
<ul>
<li>
${uiLabelMap.AccountingEFTAccount}
- ${eftAccount.nameOnAccount?if_exists}
+ ${eftAccount.nameOnAccount!}
</li>
<li>
<#if eftAccount.companyNameOnAccount?has_content>${eftAccount.companyNameOnAccount}</#if>
@@ -197,10 +197,10 @@ under the License.
<#if pmBillingAddress.address2?has_content>${pmBillingAddress.address2}</#if>
</li>
<li>
- <#assign pmBillingStateGeo = (delegator.findOne("Geo", {"geoId", pmBillingAddress.stateProvinceGeoId?if_exists}, false))?if_exists />
- ${pmBillingAddress.city}<#if pmBillingStateGeo?has_content>, ${ pmBillingStateGeo.geoName?if_exists}</#if> ${pmBillingAddress.postalCode?if_exists}
- <#assign pmBillingCountryGeo = (delegator.findOne("Geo", {"geoId", pmBillingAddress.countryGeoId?if_exists}, false))?if_exists />
- <#if pmBillingCountryGeo?has_content>${pmBillingCountryGeo.geoName?if_exists}</#if>
+ <#assign pmBillingStateGeo = (delegator.findOne("Geo", {"geoId", pmBillingAddress.stateProvinceGeoId!}, false))! />
+ ${pmBillingAddress.city}<#if pmBillingStateGeo?has_content>, ${ pmBillingStateGeo.geoName!}</#if> ${pmBillingAddress.postalCode!}
+ <#assign pmBillingCountryGeo = (delegator.findOne("Geo", {"geoId", pmBillingAddress.countryGeoId!}, false))! />
+ <#if pmBillingCountryGeo?has_content>${pmBillingCountryGeo.geoName!}</#if>
</li>
</ul>
</li>
@@ -215,14 +215,14 @@ under the License.
<#assign outputted = true>
<li>
${uiLabelMap.AccountingBillingAccount}
- #${billingAccount.billingAccountId?if_exists} - ${billingAccount.description?if_exists}
+ #${billingAccount.billingAccountId!} - ${billingAccount.description!}
</li>
</#if>
<#if (customerPoNumberSet?has_content)>
<li>
${uiLabelMap.OrderPurchaseOrderNumber}
<#list customerPoNumberSet as customerPoNumber>
- ${customerPoNumber?if_exists}
+ ${customerPoNumber!}
</#list>
</li>
</#if>
@@ -238,10 +238,10 @@ under the License.
<#assign groupIdx = 0>
<#list orderItemShipGroups as shipGroup>
<#if orderHeader?has_content>
- <#assign shippingAddress = shipGroup.getRelatedOne("PostalAddress", false)?if_exists>
- <#assign groupNumber = shipGroup.shipGroupSeqId?if_exists>
+ <#assign shippingAddress = shipGroup.getRelatedOne("PostalAddress", false)!>
+ <#assign groupNumber = shipGroup.shipGroupSeqId!>
<#else>
- <#assign shippingAddress = cart.getShippingAddress(groupIdx)?if_exists>
+ <#assign shippingAddress = cart.getShippingAddress(groupIdx)!>
<#assign groupNumber = groupIdx + 1>
</#if>
<ul>
@@ -262,12 +262,12 @@ under the License.
<#if shippingAddress.address2?has_content>${shippingAddress.address2}</#if>
</li>
<li>
- <#assign shippingStateGeo = (delegator.findOne("Geo", {"geoId", shippingAddress.stateProvinceGeoId?if_exists}, false))?if_exists />
- ${shippingAddress.city}<#if shippingStateGeo?has_content>, ${shippingStateGeo.geoName?if_exists}</#if> ${shippingAddress.postalCode?if_exists}
+ <#assign shippingStateGeo = (delegator.findOne("Geo", {"geoId", shippingAddress.stateProvinceGeoId!}, false))! />
+ ${shippingAddress.city}<#if shippingStateGeo?has_content>, ${shippingStateGeo.geoName!}</#if> ${shippingAddress.postalCode!}
</li>
<li>
- <#assign shippingCountryGeo = (delegator.findOne("Geo", {"geoId", shippingAddress.countryGeoId?if_exists}, false))?if_exists />
- <#if shippingCountryGeo?has_content>${shippingCountryGeo.geoName?if_exists}</#if>
+ <#assign shippingCountryGeo = (delegator.findOne("Geo", {"geoId", shippingAddress.countryGeoId!}, false))! />
+ <#if shippingCountryGeo?has_content>${shippingCountryGeo.geoName!}</#if>
</li>
</ul>
</li>
@@ -277,17 +277,17 @@ under the License.
<li>
${uiLabelMap.OrderMethod}:
<#if orderHeader?has_content>
- <#assign shipmentMethodType = shipGroup.getRelatedOne("ShipmentMethodType", false)?if_exists>
- <#assign carrierPartyId = shipGroup.carrierPartyId?if_exists>
+ <#assign shipmentMethodType = shipGroup.getRelatedOne("ShipmentMethodType", false)!>
+ <#assign carrierPartyId = shipGroup.carrierPartyId!>
<#else>
- <#assign shipmentMethodType = cart.getShipmentMethodType(groupIdx)?if_exists>
- <#assign carrierPartyId = cart.getCarrierPartyId(groupIdx)?if_exists>
+ <#assign shipmentMethodType = cart.getShipmentMethodType(groupIdx)!>
+ <#assign carrierPartyId = cart.getCarrierPartyId(groupIdx)!>
</#if>
- <#if carrierPartyId?exists && carrierPartyId != "_NA_">${carrierPartyId?if_exists}</#if>
+ <#if carrierPartyId?? && carrierPartyId != "_NA_">${carrierPartyId!}</#if>
${(shipmentMethodType.description)?default("N/A")}
</li>
<li>
- <#if shippingAccount?exists>${uiLabelMap.AccountingUseAccount}: ${shippingAccount}</#if>
+ <#if shippingAccount??>${uiLabelMap.AccountingUseAccount}: ${shippingAccount}</#if>
</li>
</ul>
</li>
@@ -322,9 +322,9 @@ under the License.
</li>
<#-- shipping instructions -->
<#if orderHeader?has_content>
- <#assign shippingInstructions = shipGroup.shippingInstructions?if_exists>
+ <#assign shippingInstructions = shipGroup.shippingInstructions!>
<#else>
- <#assign shippingInstructions = cart.getShippingInstructions(groupIdx)?if_exists>
+ <#assign shippingInstructions = cart.getShippingInstructions(groupIdx)!>
</#if>
<#if shippingInstructions?has_content>
<li>
@@ -335,12 +335,12 @@ under the License.
<#-- gift settings -->
<#if orderHeader?has_content>
<#assign isGift = shipGroup.isGift?default("N")>
- <#assign giftMessage = shipGroup.giftMessage?if_exists>
+ <#assign giftMessage = shipGroup.giftMessage!>
<#else>
<#assign isGift = cart.getIsGift(groupIdx)?default("N")>
- <#assign giftMessage = cart.getGiftMessage(groupIdx)?if_exists>
+ <#assign giftMessage = cart.getGiftMessage(groupIdx)!>
</#if>
- <#if productStore.showCheckoutGiftOptions?if_exists != "N">
+ <#if productStore.showCheckoutGiftOptions! != "N">
<li>
${uiLabelMap.OrderGift}?
<#if isGift?default("N") == "N">${uiLabelMap.OrderThisIsNotGift}.</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderhistory.ftl Sat Aug 16 08:40:28 2014
@@ -109,8 +109,8 @@ under the License.
<tr>
<td>${downloadOrderRoleAndProductContentInfo.orderId}</td>
<td>${downloadOrderRoleAndProductContentInfo.productName}</td>
- <td>${downloadOrderRoleAndProductContentInfo.contentName?if_exists}</td>
- <td>${downloadOrderRoleAndProductContentInfo.description?if_exists}</td>
+ <td>${downloadOrderRoleAndProductContentInfo.contentName!}</td>
+ <td>${downloadOrderRoleAndProductContentInfo.description!}</td>
<td>
<a href="<@o...@ofbizUrl>" class="button">Download</a>
</td>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl Sat Aug 16 08:40:28 2014
@@ -19,11 +19,11 @@ under the License.
<#-- NOTE: this template is used for the orderstatus screen in ecommerce AND for order notification emails through the OrderNoticeEmail.ftl file -->
<#-- the "urlPrefix" value will be prepended to URLs by the ofbizUrl transform if/when there is no "request" object in the context -->
-<#if baseEcommerceSecureUrl?exists><#assign urlPrefix = baseEcommerceSecureUrl/></#if>
+<#if baseEcommerceSecureUrl??><#assign urlPrefix = baseEcommerceSecureUrl/></#if>
<div class="screenlet">
<h3>
<#assign numColumns = 8>
- <#if maySelectItems?default("N") == "Y" && roleTypeId?if_exists == "PLACING_CUSTOMER">
+ <#if maySelectItems?default("N") == "Y" && roleTypeId! == "PLACING_CUSTOMER">
<#assign numColumns = 11>
<a href="javascript:document.addCommonToCartForm.add_all.value='true';document.addCommonToCartForm.submit()" class="submenutext">${uiLabelMap.OrderAddAllToCart}</a><a href="javascript:document.addCommonToCartForm.add_all.value='false';document.addCommonToCartForm.submit()" class="submenutext">${uiLabelMap.OrderAddCheckedToCart}</a><a href="<@ofbizUrl fullPath="true">createShoppingListFromOrder?orderId=${orderHeader.orderId}&frequency=6&intervalNumber=1&shoppingListTypeId=SLT_AUTO_REODR</...@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderSendMeThisEveryMonth}</a>
</#if>
@@ -47,7 +47,7 @@ under the License.
<th >${uiLabelMap.EcommerceUnitPrice}</th>
<th >${uiLabelMap.OrderAdjustments}</th>
<th >${uiLabelMap.CommonSubtotal}</th>
- <#if maySelectItems?default("N") == "Y" && roleTypeId?if_exists == "PLACING_CUSTOMER">
+ <#if maySelectItems?default("N") == "Y" && roleTypeId! == "PLACING_CUSTOMER">
<th colspan="3"></th>
</#if>
</tr>
@@ -96,7 +96,7 @@ under the License.
<#list orderItems as orderItem>
<#-- get info from workeffort and calculate rental quantity, if it was a rental item -->
<#assign rentalQuantity = 1> <#-- no change if no rental item -->
- <#if orderItem.orderItemTypeId == "RENTAL_ORDER_ITEM" && workEfforts?exists>
+ <#if orderItem.orderItemTypeId == "RENTAL_ORDER_ITEM" && workEfforts??>
<#list workEfforts as workEffort>
<#if workEffort.workEffortId == orderItem.orderItemSeqId>
<#assign rentalQuantity = localOrderReadHelper.getWorkEffortRentalQuantity(workEffort)>
@@ -105,22 +105,22 @@ under the License.
</#if>
</#list>
<#else>
- <#assign WorkOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment", null, null, false)?if_exists>
+ <#assign WorkOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment", null, null, false)!>
<#if WorkOrderItemFulfillments?has_content>
<#list WorkOrderItemFulfillments as WorkOrderItemFulfillment>
- <#assign workEffortSave = WorkOrderItemFulfillment.getRelatedOne("WorkEffort", true)?if_exists>
+ <#assign workEffortSave = WorkOrderItemFulfillment.getRelatedOne("WorkEffort", true)!>
<#break>
</#list>
</#if>
</#if>
<tr><td colspan="${numColumns}"></td></tr>
<tr>
- <#if !orderItem.productId?exists || orderItem.productId == "_?_">
+ <#if !orderItem.productId?? || orderItem.productId == "_?_">
<td >
${orderItem.itemDescription?default("")}
</td>
<#else>
- <#assign product = orderItem.getRelatedOne("Product", true)?if_exists/> <#-- should always exist because of FK constraint, but just in case -->
+ <#assign product = orderItem.getRelatedOne("Product", true)!/> <#-- should always exist because of FK constraint, but just in case -->
<td >
<a href="<@ofbizCatalogAltUrl fullPath="true" secure="false" productId=orderItem.productId/>" class="linktext">${orderItem.productId} - ${orderItem.itemDescription?default("")}</a>
<#assign orderItemAttributes = orderItem.getRelated("OrderItemAttribute", null, null, false)/>
@@ -134,32 +134,32 @@ under the License.
</ul>
</#if>
<#if product?has_content>
- <#if product.piecesIncluded?exists && product.piecesIncluded?long != 0>
+ <#if product.piecesIncluded?? && product.piecesIncluded?long != 0>
[${uiLabelMap.OrderPieces}: ${product.piecesIncluded}]
</#if>
- <#if (product.quantityIncluded?exists && product.quantityIncluded != 0) || product.quantityUomId?has_content>
- <#assign quantityUom = product.getRelatedOne("QuantityUom", true)?if_exists/>
- [${uiLabelMap.CommonQuantity}: ${product.quantityIncluded?if_exists} ${((quantityUom.abbreviation)?default(product.quantityUomId))?if_exists}]
+ <#if (product.quantityIncluded?? && product.quantityIncluded != 0) || product.quantityUomId?has_content>
+ <#assign quantityUom = product.getRelatedOne("QuantityUom", true)!/>
+ [${uiLabelMap.CommonQuantity}: ${product.quantityIncluded!} ${((quantityUom.abbreviation)?default(product.quantityUomId))!}]
</#if>
- <#if (product.weight?exists && product.weight != 0) || product.weightUomId?has_content>
- <#assign weightUom = product.getRelatedOne("WeightUom", true)?if_exists/>
- [${uiLabelMap.CommonWeight}: ${product.weight?if_exists} ${((weightUom.abbreviation)?default(product.weightUomId))?if_exists}]
+ <#if (product.weight?? && product.weight != 0) || product.weightUomId?has_content>
+ <#assign weightUom = product.getRelatedOne("WeightUom", true)!/>
+ [${uiLabelMap.CommonWeight}: ${product.weight!} ${((weightUom.abbreviation)?default(product.weightUomId))!}]
</#if>
- <#if (product.productHeight?exists && product.productHeight != 0) || product.heightUomId?has_content>
- <#assign heightUom = product.getRelatedOne("HeightUom", true)?if_exists/>
- [${uiLabelMap.CommonHeight}: ${product.productHeight?if_exists} ${((heightUom.abbreviation)?default(product.heightUomId))?if_exists}]
+ <#if (product.productHeight?? && product.productHeight != 0) || product.heightUomId?has_content>
+ <#assign heightUom = product.getRelatedOne("HeightUom", true)!/>
+ [${uiLabelMap.CommonHeight}: ${product.productHeight!} ${((heightUom.abbreviation)?default(product.heightUomId))!}]
</#if>
- <#if (product.productWidth?exists && product.productWidth != 0) || product.widthUomId?has_content>
- <#assign widthUom = product.getRelatedOne("WidthUom", true)?if_exists/>
- [${uiLabelMap.CommonWidth}: ${product.productWidth?if_exists} ${((widthUom.abbreviation)?default(product.widthUomId))?if_exists}]
+ <#if (product.productWidth?? && product.productWidth != 0) || product.widthUomId?has_content>
+ <#assign widthUom = product.getRelatedOne("WidthUom", true)!/>
+ [${uiLabelMap.CommonWidth}: ${product.productWidth!} ${((widthUom.abbreviation)?default(product.widthUomId))!}]
</#if>
- <#if (product.productDepth?exists && product.productDepth != 0) || product.depthUomId?has_content>
- <#assign depthUom = product.getRelatedOne("DepthUom", true)?if_exists/>
- [${uiLabelMap.CommonDepth}: ${product.productDepth?if_exists} ${((depthUom.abbreviation)?default(product.depthUomId))?if_exists}]
+ <#if (product.productDepth?? && product.productDepth != 0) || product.depthUomId?has_content>
+ <#assign depthUom = product.getRelatedOne("DepthUom", true)!/>
+ [${uiLabelMap.CommonDepth}: ${product.productDepth!} ${((depthUom.abbreviation)?default(product.depthUomId))!}]
</#if>
</#if>
<#if maySelectItems?default("N") == "Y">
- <#assign returns = orderItem.getRelated("ReturnItem", null, null, false)?if_exists>
+ <#assign returns = orderItem.getRelated("ReturnItem", null, null, false)!>
<#if returns?has_content>
<#list returns as return>
<#assign returnHeader = return.getRelatedOne("ReturnHeader", false)>
@@ -204,13 +204,13 @@ under the License.
<@ofbizCurrency amount=localOrderReadHelper.getOrderItemAdjustmentsTotal(orderItem) isoCode=currencyUomId/>
</td>
<td>
- <#if workEfforts?exists>
+ <#if workEfforts??>
<@ofbizCurrency amount=localOrderReadHelper.getOrderItemTotal(orderItem)*rentalQuantity isoCode=currencyUomId/>
<#else>
<@ofbizCurrency amount=localOrderReadHelper.getOrderItemTotal(orderItem) isoCode=currencyUomId/>
</#if>
</td>
- <#if maySelectItems?default("N") == "Y" && roleTypeId?if_exists == "PLACING_CUSTOMER">
+ <#if maySelectItems?default("N") == "Y" && roleTypeId! == "PLACING_CUSTOMER">
<td></td>
<td>
<input name="item_id" value="${orderItem.orderItemSeqId}" type="checkbox"/>
@@ -239,7 +239,7 @@ under the License.
</#if>
<#-- show info from workeffort if it was a rental item -->
<#if orderItem.orderItemTypeId == "RENTAL_ORDER_ITEM">
- <#if workEffortSave?exists>
+ <#if workEffortSave??>
<tr><td></td><td colspan="${numColumns}">${uiLabelMap.CommonFrom}: ${workEffortSave.estimatedStartDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonUntil} ${workEffortSave.estimatedCompletionDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonFor} ${workEffortSave.reservPersons} ${uiLabelMap.CommonPerson}(s)</td></tr>
</#if>
</#if>
@@ -254,16 +254,16 @@ under the License.
<#if orderItemAdjustment.primaryGeoId?has_content>
<#assign primaryGeo = orderItemAdjustment.getRelatedOne("PrimaryGeo", true)/>
<#if primaryGeo.geoName?has_content>
- ${uiLabelMap.OrderJurisdiction}: ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}]
+ ${uiLabelMap.OrderJurisdiction}: ${primaryGeo.geoName} [${primaryGeo.abbreviation!}]
</#if>
<#if orderItemAdjustment.secondaryGeoId?has_content>
<#assign secondaryGeo = orderItemAdjustment.getRelatedOne("SecondaryGeo", true)/>
- (${uiLabelMap.CommonIn}: ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}])
+ (${uiLabelMap.CommonIn}: ${secondaryGeo.geoName} [${secondaryGeo.abbreviation!}])
</#if>
</#if>
- <#if orderItemAdjustment.sourcePercentage?exists>${uiLabelMap.EcommerceRate}: ${orderItemAdjustment.sourcePercentage}</#if>
+ <#if orderItemAdjustment.sourcePercentage??>${uiLabelMap.EcommerceRate}: ${orderItemAdjustment.sourcePercentage}</#if>
<#if orderItemAdjustment.customerReferenceId?has_content>${uiLabelMap.OrderCustomerTaxId}: ${orderItemAdjustment.customerReferenceId}</#if>
- <#if orderItemAdjustment.exemptAmount?exists>${uiLabelMap.EcommerceExemptAmount}: ${orderItemAdjustment.exemptAmount}</#if>
+ <#if orderItemAdjustment.exemptAmount??>${uiLabelMap.EcommerceExemptAmount}: ${orderItemAdjustment.exemptAmount}</#if>
</#if>
</td>
<td colspan="5"></td>
@@ -275,11 +275,11 @@ under the License.
</tr>
</#list>
<#-- show the order item ship group info -->
- <#assign orderItemShipGroupAssocs = orderItem.getRelated("OrderItemShipGroupAssoc", null, null, false)?if_exists>
+ <#assign orderItemShipGroupAssocs = orderItem.getRelated("OrderItemShipGroupAssoc", null, null, false)!>
<#if orderItemShipGroupAssocs?has_content>
<#list orderItemShipGroupAssocs as shipGroupAssoc>
- <#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup", false)?if_exists>
- <#assign shipGroupAddress = (shipGroup.getRelatedOne("PostalAddress", false))?if_exists>
+ <#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup", false)!>
+ <#assign shipGroupAddress = (shipGroup.getRelatedOne("PostalAddress", false))!>
<tr>
<td>
${uiLabelMap.OrderShipGroup}: [${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("N/A")}
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl Sat Aug 16 08:40:28 2014
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<#if requestParameters.paymentMethodTypeId?has_content>
- <#assign paymentMethodTypeId = "${requestParameters.paymentMethodTypeId?if_exists}">
+ <#assign paymentMethodTypeId = "${requestParameters.paymentMethodTypeId!}">
</#if>
<script language="JavaScript" type="text/javascript">
function shipBillAddr() {
@@ -27,9 +27,9 @@ function shipBillAddr() {
<#assign singleUse = "">
</#if>
if (document.billsetupform.useShipAddr.checked) {
- window.location.replace("setPaymentInformation?createNew=Y&addGiftCard=${requestParameters.addGiftCard?if_exists}&paymentMethodTypeId=${paymentMethodTypeId?if_exists}&useShipAddr=Y${singleUse}");
+ window.location.replace("setPaymentInformation?createNew=Y&addGiftCard=${requestParameters.addGiftCard!}&paymentMethodTypeId=${paymentMethodTypeId!}&useShipAddr=Y${singleUse}");
} else {
- window.location.replace("setPaymentInformation?createNew=Y&addGiftCard=${requestParameters.addGiftCard?if_exists}&paymentMethodTypeId=${paymentMethodTypeId?if_exists}${singleUse}");
+ window.location.replace("setPaymentInformation?createNew=Y&addGiftCard=${requestParameters.addGiftCard!}&paymentMethodTypeId=${paymentMethodTypeId!}${singleUse}");
}
}
</script>
@@ -40,32 +40,32 @@ function shipBillAddr() {
</div>
<div class="screenlet-body">
<#-- after initial screen; show detailed screens for selected type -->
- <#if paymentMethodTypeId?if_exists == "CREDIT_CARD">
- <#if creditCard?has_content && postalAddress?has_content && !requestParameters.useShipAddr?exists>
+ <#if paymentMethodTypeId! == "CREDIT_CARD">
+ <#if creditCard?has_content && postalAddress?has_content && !requestParameters.useShipAddr??>
<form method="post" action="<@o...@ofbizUrl>" name="${parameters.formNameValue}">
- <input type="hidden" name="paymentMethodId" value="${creditCard.paymentMethodId?if_exists}"/>
- <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId?if_exists}"/>
- <#elseif requestParameters.useShipAddr?exists>
+ <input type="hidden" name="paymentMethodId" value="${creditCard.paymentMethodId!}"/>
+ <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId!}"/>
+ <#elseif requestParameters.useShipAddr??>
<form method="post" action="<@o...@ofbizUrl>" name="${parameters.formNameValue}">
<#else>
<form method="post" action="<@o...@ofbizUrl>" name="${parameters.formNameValue}">
</#if>
- <#elseif paymentMethodTypeId?if_exists == "EFT_ACCOUNT">
+ <#elseif paymentMethodTypeId! == "EFT_ACCOUNT">
<#if eftAccount?has_content && postalAddress?has_content>
<form method="post" action="<@o...@ofbizUrl>" name="${parameters.formNameValue}">
- <input type="hidden" name="paymentMethodId" value="${eftAccount.paymentMethodId?if_exists}"/>
- <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId?if_exists}"/>
- <#elseif requestParameters.useShipAddr?exists>
+ <input type="hidden" name="paymentMethodId" value="${eftAccount.paymentMethodId!}"/>
+ <input type="hidden" name="contactMechId" value="${postalAddress.contactMechId!}"/>
+ <#elseif requestParameters.useShipAddr??>
<form method="post" action="<@o...@ofbizUrl>" name="${parameters.formNameValue}">
<#else>
<form method="post" action="<@o...@ofbizUrl>" name="${parameters.formNameValue}">
</#if>
- <#elseif paymentMethodTypeId?if_exists == "GIFT_CARD"> <#--Don't know much how this is handled -->
+ <#elseif paymentMethodTypeId! == "GIFT_CARD"> <#--Don't know much how this is handled -->
<form method="post" action="<@o...@ofbizUrl>" name="${parameters.formNameValue}">
- <#elseif paymentMethodTypeId?if_exists == "EXT_OFFLINE">
+ <#elseif paymentMethodTypeId! == "EXT_OFFLINE">
<form method="post" action="<@o...@ofbizUrl>" name="${parameters.formNameValue}">
<#else>
- <div>${uiLabelMap.AccountingPaymentMethodTypeNotHandled} ${paymentMethodTypeId?if_exists}</div>
+ <div>${uiLabelMap.AccountingPaymentMethodTypeNotHandled} ${paymentMethodTypeId!}</div>
</#if>
<#if requestParameters.singleUsePayment?default("N") == "Y">
@@ -74,17 +74,17 @@ function shipBillAddr() {
</#if>
<input type="hidden" name="contactMechTypeId" value="POSTAL_ADDRESS"/>
<input type="hidden" name="partyId" value="${partyId}"/>
- <input type="hidden" name="paymentMethodTypeId" value="${paymentMethodTypeId?if_exists}"/>
+ <input type="hidden" name="paymentMethodTypeId" value="${paymentMethodTypeId!}"/>
<input type="hidden" name="createNew" value="Y"/>
- <#if requestParameters.useShipAddr?exists>
- <input type="hidden" name="contactMechId" value="${parameters.contactMechId?if_exists}"/>
+ <#if requestParameters.useShipAddr??>
+ <input type="hidden" name="contactMechId" value="${parameters.contactMechId!}"/>
</#if>
<table width="100%" border="0" cellpadding="1" cellspacing="0">
- <#if cart.getShippingContactMechId()?exists && paymentMethodTypeId?if_exists != "GIFT_CARD">
+ <#if cart.getShippingContactMechId()?? && paymentMethodTypeId! != "GIFT_CARD">
<tr>
<td width="26%" align="right" valign="top">
- <input type="checkbox" name="useShipAddr" value="Y" onclick="javascript:shipBillAddr();" <#if useShipAddr?exists>checked="checked"</#if>/>
+ <input type="checkbox" name="useShipAddr" value="Y" onclick="javascript:shipBillAddr();" <#if useShipAddr??>checked="checked"</#if>/>
</td>
<td colspan="2" valign="middle">
<div>${uiLabelMap.FacilityBillingAddressSameShipping}</div>
@@ -95,7 +95,7 @@ function shipBillAddr() {
</tr>
</#if>
- <#if (paymentMethodTypeId?if_exists == "CREDIT_CARD" || paymentMethodTypeId?if_exists == "EFT_ACCOUNT")>
+ <#if (paymentMethodTypeId! == "CREDIT_CARD" || paymentMethodTypeId! == "EFT_ACCOUNT")>
<tr>
<td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.PartyBillingAddress}</div></td>
<td width="5"> </td>
@@ -105,7 +105,7 @@ function shipBillAddr() {
</#if>
<#-- credit card fields -->
- <#if paymentMethodTypeId?if_exists == "CREDIT_CARD">
+ <#if paymentMethodTypeId! == "CREDIT_CARD">
<#if !creditCard?has_content>
<#assign creditCard = requestParameters>
</#if>
@@ -122,7 +122,7 @@ function shipBillAddr() {
</#if>
<#-- eft fields -->
- <#if paymentMethodTypeId?if_exists =="EFT_ACCOUNT">
+ <#if paymentMethodTypeId! =="EFT_ACCOUNT">
<#if !eftAccount?has_content>
<#assign eftAccount = requestParameters>
</#if>
@@ -138,28 +138,28 @@ function shipBillAddr() {
<td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingNameOnAccount}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount?if_exists}"/>
+ <input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccount.nameOnAccount!}"/>
*</td>
</tr>
<tr>
<td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingCompanyNameOnAccount}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount?if_exists}"/>
+ <input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccount.companyNameOnAccount!}"/>
</td>
</tr>
<tr>
<td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingBankName}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName?if_exists}"/>
+ <input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccount.bankName!}"/>
*</td>
</tr>
<tr>
<td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingRoutingNumber}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber?if_exists}"/>
+ <input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccount.routingNumber!}"/>
*</td>
</tr>
<tr>
@@ -167,7 +167,7 @@ function shipBillAddr() {
<td width="5"> </td>
<td width="74%">
<select name="accountType" class="selectBox">
- <option>${eftAccount.accountType?if_exists}</option>
+ <option>${eftAccount.accountType!}</option>
<option></option>
<option>Checking</option>
<option>Savings</option>
@@ -178,23 +178,23 @@ function shipBillAddr() {
<td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingAccountNumber}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber?if_exists}"/>
+ <input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccount.accountNumber!}"/>
*</td>
</tr>
<tr>
<td width="26%" align="right" valign="middle"><div>${uiLabelMap.CommonDescription}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${eftAccount.description?if_exists}"/>
+ <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${eftAccount.description!}"/>
</td>
</tr>
</#if>
<#-- gift card fields -->
- <#if requestParameters.addGiftCard?default("") == "Y" || paymentMethodTypeId?if_exists == "GIFT_CARD">
+ <#if requestParameters.addGiftCard?default("") == "Y" || paymentMethodTypeId! == "GIFT_CARD">
<input type="hidden" name="addGiftCard" value="Y"/>
- <#assign giftCard = giftCard?if_exists>
- <#if paymentMethodTypeId?if_exists != "GIFT_CARD">
+ <#assign giftCard = giftCard!>
+ <#if paymentMethodTypeId! != "GIFT_CARD">
<tr>
<td colspan="3"><hr /></td>
</tr>
@@ -208,29 +208,29 @@ function shipBillAddr() {
<td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingGiftCardNumber}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="20" maxlength="60" name="giftCardNumber" value="${giftCard.cardNumber?if_exists}"/>
+ <input type="text" class="inputBox" size="20" maxlength="60" name="giftCardNumber" value="${giftCard.cardNumber!}"/>
*</td>
</tr>
<tr>
<td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingPINNumber}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="10" maxlength="60" name="giftCardPin" value="${giftCard.pinNumber?if_exists}"/>
+ <input type="text" class="inputBox" size="10" maxlength="60" name="giftCardPin" value="${giftCard.pinNumber!}"/>
*</td>
</tr>
<tr>
<td width="26%" align="right" valign="middle"><div>${uiLabelMap.CommonDescription}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${giftCard.description?if_exists}"/>
+ <input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${giftCard.description!}"/>
</td>
</tr>
- <#if paymentMethodTypeId?if_exists != "GIFT_CARD">
+ <#if paymentMethodTypeId! != "GIFT_CARD">
<tr>
<td width="26%" align="right" valign="middle"><div>${uiLabelMap.AccountingAmountToUse}</div></td>
<td width="5"> </td>
<td width="74%">
- <input type="text" class="inputBox" size="5" maxlength="10" name="giftCardAmount" value="${giftCard.pinNumber?if_exists}"/>
+ <input type="text" class="inputBox" size="5" maxlength="10" name="giftCardAmount" value="${giftCard.pinNumber!}"/>
*</td>
</tr>
</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl Sat Aug 16 08:40:28 2014
@@ -22,33 +22,33 @@ under the License.
<#-- initial screen show a list of options -->
<form id="editPaymentOptions" method="post" action="<@o...@ofbizUrl>" name="${parameters.formNameValue}">
<fieldset>
- <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists>
+ <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??>
<div>
- <input type="checkbox" name="addGiftCard" value="Y" <#if addGiftCard?exists && addGiftCard == "Y">checked="checked"</#if> />
+ <input type="checkbox" name="addGiftCard" value="Y" <#if addGiftCard?? && addGiftCard == "Y">checked="checked"</#if> />
<label for="addGiftCard">${uiLabelMap.AccountingCheckGiftCard}</label>
</div>
</#if>
- <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists>
+ <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE??>
<div>
- <input type="radio" id="paymentMethodTypeId_EXT_OFFLINE" name="paymentMethodTypeId" value="EXT_OFFLINE" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EXT_OFFLINE">checked="checked"</#if> />
+ <input type="radio" id="paymentMethodTypeId_EXT_OFFLINE" name="paymentMethodTypeId" value="EXT_OFFLINE" <#if paymentMethodTypeId?? && paymentMethodTypeId == "EXT_OFFLINE">checked="checked"</#if> />
<label for="paymentMethodTypeId_EXT_OFFLINE">${uiLabelMap.OrderPaymentOfflineCheckMoney}</label>
</div>
</#if>
- <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists>
+ <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??>
<div>
- <input type="radio" id="paymentMethodTypeId_CREDIT_CARD" name="paymentMethodTypeId" value="CREDIT_CARD" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "CREDIT_CARD">checked="checked"</#if> />
+ <input type="radio" id="paymentMethodTypeId_CREDIT_CARD" name="paymentMethodTypeId" value="CREDIT_CARD" <#if paymentMethodTypeId?? && paymentMethodTypeId == "CREDIT_CARD">checked="checked"</#if> />
<label for="paymentMethodTypeId_CREDIT_CARD">${uiLabelMap.AccountingVisaMastercardAmexDiscover}</label>
</div>
</#if>
- <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists>
+ <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??>
<div>
- <input type="radio" id="paymentMethodTypeId_EFT_ACCOUNT" name="paymentMethodTypeId" value="EFT_ACCOUNT" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EFT_ACCOUNT">checked="checked"</#if> />
+ <input type="radio" id="paymentMethodTypeId_EFT_ACCOUNT" name="paymentMethodTypeId" value="EFT_ACCOUNT" <#if paymentMethodTypeId?? && paymentMethodTypeId == "EFT_ACCOUNT">checked="checked"</#if> />
<label for="paymentMethodTypeId_EFT_ACCOUNT">${uiLabelMap.AccountingAHCElectronicCheck}</label>
</div>
</#if>
- <#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL?exists>
+ <#if productStorePaymentMethodTypeIdMap.EXT_PAYPAL??>
<div>
- <input type="radio" id="paymentMethodTypeId_EXT_PAYPAL" name="paymentMethodTypeId" value="EXT_PAYPAL" <#if paymentMethodTypeId?exists && paymentMethodTypeId == "EXT_PAYPAL">checked="checked"</#if> />
+ <input type="radio" id="paymentMethodTypeId_EXT_PAYPAL" name="paymentMethodTypeId" value="EXT_PAYPAL" <#if paymentMethodTypeId?? && paymentMethodTypeId == "EXT_PAYPAL">checked="checked"</#if> />
<label for="paymentMethodTypeId_EXT_PAYPAL">${uiLabelMap.AccountingPayWithPayPal}</label>
</div>
</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutLinks.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutLinks.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutLinks.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutLinks.ftl Sat Aug 16 08:40:28 2014
@@ -22,9 +22,9 @@ function submitForm(form) {
}
</script>
<div>
- <a href="<@o...@ofbizUrl>" class="buttontext" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Personal Info</a>
- <#if (enableShipmentMethod)?exists>
- <a href="<@o...@ofbizUrl>" class="buttontext" <#if callSubmitForm?exists>onclick="javascript:submitForm(document.${parameters.formNameValue?if_exists});"</#if>>Review Order</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext" <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>>Personal Info</a>
+ <#if (enableShipmentMethod)??>
+ <a href="<@o...@ofbizUrl>" class="buttontext" <#if callSubmitForm??>onclick="javascript:submitForm(document.${parameters.formNameValue!});"</#if>>Review Order</a>
<#else>
<span class="buttontextdisabled">Review Order</span>
</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl Sat Aug 16 08:40:28 2014
@@ -47,9 +47,9 @@ under the License.
</script>
<h1>${uiLabelMap.OrderFinalCheckoutReview}</h1>
-<#if !isDemoStore?exists || isDemoStore><p>${uiLabelMap.OrderDemoFrontNote}.</p></#if>
+<#if !isDemoStore?? || isDemoStore><p>${uiLabelMap.OrderDemoFrontNote}.</p></#if>
-<#if cart?exists && 0 < cart.size()>
+<#if cart?? && 0 < cart.size()>
${screens.render("component://ecommerce/widget/OrderScreens.xml#quickAnonOrderHeader")}
<br />
<div id="orderItemsSection">${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")}</div>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl Sat Aug 16 08:40:28 2014
@@ -45,11 +45,11 @@ under the License.
</div>
<div class="screenlet-body">
<form name="${parameters.formNameValue}" id="quickAnonProcessCustomer" method="post" action="<@o...@ofbizUrl>">
- <input type="hidden" name="partyId" value="${parameters.partyId?if_exists}"/>
- <input type="hidden" name="shippingContactMechId" value="${parameters.shippingContactMechId?if_exists}"/>
- <input type="hidden" name="billingContactMechId" value="${parameters.billingContactMechId?if_exists}"/>
- <input type="hidden" name="shippingContactMechPurposeTypeId" value="${parameters.shippingContactMechPurposeTypeId?if_exists}"/>
- <input type="hidden" name="billingContactMechPurposeTypeId" value="${parameters.billingContactMechPurposeTypeId?if_exists}"/>
+ <input type="hidden" name="partyId" value="${parameters.partyId!}"/>
+ <input type="hidden" name="shippingContactMechId" value="${parameters.shippingContactMechId!}"/>
+ <input type="hidden" name="billingContactMechId" value="${parameters.billingContactMechId!}"/>
+ <input type="hidden" name="shippingContactMechPurposeTypeId" value="${parameters.shippingContactMechPurposeTypeId!}"/>
+ <input type="hidden" name="billingContactMechPurposeTypeId" value="${parameters.billingContactMechPurposeTypeId!}"/>
<table width="100%" border="0" cellpadding="1" cellspacing="0">
<tr>
@@ -70,14 +70,14 @@ under the License.
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="firstName"/>
- <input type="text" class="inputBox required" name="firstName" id="firstName" value="${parameters.firstName?if_exists}" size="30" maxlength="30"/>*<span id="advice-required-firstName" class="required" style="display:none">(${uiLabelMap.CommonRequired})</span>
+ <input type="text" class="inputBox required" name="firstName" id="firstName" value="${parameters.firstName!}" size="30" maxlength="30"/>*<span id="advice-required-firstName" class="required" style="display:none">(${uiLabelMap.CommonRequired})</span>
</td>
</tr>
<tr>
<td width="26%" align="right"><div>${uiLabelMap.PartyMiddleInitial}</div></td>
<td width="2%"> </td>
<td width="72%">
- <input type="text" class="inputBox" name="middleName" value="${parameters.middleName?if_exists}" size="4" maxlength="4"/>
+ <input type="text" class="inputBox" name="middleName" value="${parameters.middleName!}" size="4" maxlength="4"/>
</td>
</tr>
<tr>
@@ -85,7 +85,7 @@ under the License.
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="lastName"/>
- <input type="text" class="inputBox required" name="lastName" value="${parameters.lastName?if_exists}" size="30" maxlength="30"/>*<span id="advice-required-lastName" class="required" style="display:none">(${uiLabelMap.CommonRequired})</span>
+ <input type="text" class="inputBox required" name="lastName" value="${parameters.lastName!}" size="30" maxlength="30"/>*<span id="advice-required-lastName" class="required" style="display:none">(${uiLabelMap.CommonRequired})</span>
</td>
</tr>
<tr>
@@ -99,11 +99,11 @@ under the License.
<td width="88%">
<@fieldErrorsMulti fieldName1="homeCountryCode" fieldName2="homeAreaCode" fieldName3="homeContactNumber" fieldName4="homeExt"/>
<div>
- <input type="hidden" name="homePhoneContactMechId" value="${parameters.homePhoneContactMechId?if_exists}"/>
- <input type="text" class="inputBox required" name="homeCountryCode" value="${parameters.homeCountryCode?if_exists}" size="4" maxlength="10"/>
- - <input type="text" class="inputBox required" name="homeAreaCode" value="${parameters.homeAreaCode?if_exists}" size="4" maxlength="10"/>
- - <input type="text" class="inputBox required" name="homeContactNumber" value="${parameters.homeContactNumber?if_exists}" size="15" maxlength="15"/>
- - <input type="text" class="inputBox" name="homeExt" value="${parameters.homeExt?if_exists}" size="6" maxlength="10"/> *
+ <input type="hidden" name="homePhoneContactMechId" value="${parameters.homePhoneContactMechId!}"/>
+ <input type="text" class="inputBox required" name="homeCountryCode" value="${parameters.homeCountryCode!}" size="4" maxlength="10"/>
+ - <input type="text" class="inputBox required" name="homeAreaCode" value="${parameters.homeAreaCode!}" size="4" maxlength="10"/>
+ - <input type="text" class="inputBox required" name="homeContactNumber" value="${parameters.homeContactNumber!}" size="15" maxlength="15"/>
+ - <input type="text" class="inputBox" name="homeExt" value="${parameters.homeExt!}" size="6" maxlength="10"/> *
</div>
</td>
</tr>
@@ -111,11 +111,11 @@ under the License.
<td width="26%" align="right"><div>${uiLabelMap.PartyBusinessPhone}</div></td>
<td width="2%"> </td>
<td width="72%">
- <input type="hidden" name="workPhoneContactMechId" value="${parameters.workPhoneContactMechId?if_exists}"/>
- <input type="text" class="inputBox" name="workCountryCode" value="${parameters.workCountryCode?if_exists}" size="4" maxlength="10"/>
- - <input type="text" class="inputBox" name="workAreaCode" value="${parameters.workAreaCode?if_exists}" size="4" maxlength="10"/>
- - <input type="text" class="inputBox" name="workContactNumber" value="${parameters.workContactNumber?if_exists}" size="15" maxlength="15"/>
- - <input type="text" class='inputBox' name="workExt" value="${parameters.workExt?if_exists}" size="6" maxlength="10"/>
+ <input type="hidden" name="workPhoneContactMechId" value="${parameters.workPhoneContactMechId!}"/>
+ <input type="text" class="inputBox" name="workCountryCode" value="${parameters.workCountryCode!}" size="4" maxlength="10"/>
+ - <input type="text" class="inputBox" name="workAreaCode" value="${parameters.workAreaCode!}" size="4" maxlength="10"/>
+ - <input type="text" class="inputBox" name="workContactNumber" value="${parameters.workContactNumber!}" size="15" maxlength="15"/>
+ - <input type="text" class='inputBox' name="workExt" value="${parameters.workExt!}" size="6" maxlength="10"/>
</td>
</tr>
<tr>
@@ -123,8 +123,8 @@ under the License.
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="emailAddress"/>
- <input type="hidden" name="emailContactMechId" value="${parameters.emailContactMechId?if_exists}"/>
- <input type="text" class="inputBox required validate-email" name="emailAddress" value="${parameters.emailAddress?if_exists}" size="40" maxlength="255"/> *
+ <input type="hidden" name="emailContactMechId" value="${parameters.emailContactMechId!}"/>
+ <input type="text" class="inputBox required validate-email" name="emailAddress" value="${parameters.emailAddress!}" size="40" maxlength="255"/> *
</td>
</tr>
</table>
@@ -151,7 +151,7 @@ under the License.
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="shipToName"/>
- <input type="text" class="inputBox" name="shipToName" id="shipToName" value="${parameters.shipToName?if_exists}" size="30" maxlength="30"/>
+ <input type="text" class="inputBox" name="shipToName" id="shipToName" value="${parameters.shipToName!}" size="30" maxlength="30"/>
</td>
</tr>
<tr>
@@ -159,7 +159,7 @@ under the License.
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="shipToAttnName"/>
- <input type="text" class="inputBox" id="shipToAttnName" name="shipToAttnName" value="${parameters.shipToAttnName?if_exists}" size="30" maxlength="30"/>
+ <input type="text" class="inputBox" id="shipToAttnName" name="shipToAttnName" value="${parameters.shipToAttnName!}" size="30" maxlength="30"/>
</td>
</tr>
<tr>
@@ -167,14 +167,14 @@ under the License.
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="shipToAddress1"/>
- <input type="text" class="inputBox required" size="30" maxlength="30" id="shipToAddress1" name="shipToAddress1" value="${parameters.shipToAddress1?if_exists}" />
+ <input type="text" class="inputBox required" size="30" maxlength="30" id="shipToAddress1" name="shipToAddress1" value="${parameters.shipToAddress1!}" />
*</td>
</tr>
<tr>
<td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyAddressLine2}</div></td>
<td width="2%"> </td>
<td width="72%">
- <input type="text" class="inputBox" size="30" maxlength="30" id="shipToAddress2" name="shipToAddress2" value="${parameters.shipToAddress2?if_exists}" />
+ <input type="text" class="inputBox" size="30" maxlength="30" id="shipToAddress2" name="shipToAddress2" value="${parameters.shipToAddress2!}" />
</td>
</tr>
<tr>
@@ -182,7 +182,7 @@ under the License.
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="shipToCity"/>
- <input type="text" class="inputBox required" size="30" maxlength="30" id="shipToCity" name="shipToCity" value="${parameters.shipToCity?if_exists}" />
+ <input type="text" class="inputBox required" size="30" maxlength="30" id="shipToCity" name="shipToCity" value="${parameters.shipToCity!}" />
*</td>
</tr>
<tr>
@@ -191,7 +191,7 @@ under the License.
<td width="72%">
<@fieldErrors fieldName="shipToStateProvinceGeoId"/>
<select name="shipToStateProvinceGeoId" id="shipToStateProvinceGeoId" class="selectBox">
- <#if (parameters.shipToStateProvinceGeoId)?exists>
+ <#if (parameters.shipToStateProvinceGeoId)??>
<option>${parameters.shipToStateProvinceGeoId}</option>
<option value="${parameters.shipToStateProvinceGeoId}">---</option>
<#else>
@@ -206,7 +206,7 @@ under the License.
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="shipToPostalCode"/>
- <input type="text" class="inputBox required" size="12" maxlength="10" id="shipToPostalCode" name="shipToPostalCode" value="${parameters.shipToPostalCode?if_exists}" />
+ <input type="text" class="inputBox required" size="12" maxlength="10" id="shipToPostalCode" name="shipToPostalCode" value="${parameters.shipToPostalCode!}" />
*</td>
</tr>
<tr>
@@ -215,7 +215,7 @@ under the License.
<td width="72%">
<@fieldErrors fieldName="shipToCountryGeoId"/>
<select name="shipToCountryGeoId" id="shipToCountryGeoId" class="selectBox">
- <#if (parameters.shipToCountryGeoId)?exists>
+ <#if (parameters.shipToCountryGeoId)??>
<option>${parameters.shipToCountryGeoId}</option>
<option value="${parameters.shipToCountryGeoId}">---</option>
</#if>
@@ -246,7 +246,7 @@ under the License.
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="billToName"/>
- <input type="text" class="inputBox" id="billToName" name="billToName" value="${parameters.billToName?if_exists}" size="30" maxlength="30"/>
+ <input type="text" class="inputBox" id="billToName" name="billToName" value="${parameters.billToName!}" size="30" maxlength="30"/>
</td>
</tr>
<tr>
@@ -254,7 +254,7 @@ under the License.
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="billToAttnName"/>
- <input type="text" class="inputBox" id="billToAttnName" name="billToAttnName" value="${parameters.billToAttnName?if_exists}" size="30" maxlength="30"/>
+ <input type="text" class="inputBox" id="billToAttnName" name="billToAttnName" value="${parameters.billToAttnName!}" size="30" maxlength="30"/>
</td>
</tr>
<tr>
@@ -262,14 +262,14 @@ under the License.
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="billToAddress1"/>
- <input type="text" class="inputBox required" id="billToAddress1" size="30" maxlength="30" name="billToAddress1" value="${parameters.billToAddress1?if_exists}" />
+ <input type="text" class="inputBox required" id="billToAddress1" size="30" maxlength="30" name="billToAddress1" value="${parameters.billToAddress1!}" />
*</td>
</tr>
<tr>
<td width="26%" align="right" valign="middle"><div>${uiLabelMap.PartyAddressLine2}</div></td>
<td width="2%"> </td>
<td width="72%">
- <input type="text" class="inputBox" id="billToAddress2" size="30" maxlength="30" name="billToAddress2" value="${parameters.billToAddress2?if_exists}" />
+ <input type="text" class="inputBox" id="billToAddress2" size="30" maxlength="30" name="billToAddress2" value="${parameters.billToAddress2!}" />
</td>
</tr>
<tr>
@@ -277,7 +277,7 @@ under the License.
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="billToCity"/>
- <input type="text" class="inputBox required" id="billToCity" size="30" maxlength="30" name="billToCity" value="${parameters.billToCity?if_exists}" />
+ <input type="text" class="inputBox required" id="billToCity" size="30" maxlength="30" name="billToCity" value="${parameters.billToCity!}" />
*</td>
</tr>
<tr>
@@ -286,7 +286,7 @@ under the License.
<td width="72%">
<@fieldErrors fieldName="billToStateProvinceGeoId"/>
<select name="billToStateProvinceGeoId" id="billToStateProvinceGeoId" class="selectBox">
- <#if (parameters.billToStateProvinceGeoId)?exists>
+ <#if (parameters.billToStateProvinceGeoId)??>
<option>${parameters.billToStateProvinceGeoId}</option>
<option value="${parameters.billToStateProvinceGeoId}">---</option>
<#else>
@@ -301,7 +301,7 @@ under the License.
<td width="2%"> </td>
<td width="72%">
<@fieldErrors fieldName="billToPostalCode"/>
- <input type="text" class="inputBox required" size="12" maxlength="10" id="billToPostalCode" name="billToPostalCode" value="${parameters.billToPostalCode?if_exists}" />
+ <input type="text" class="inputBox required" size="12" maxlength="10" id="billToPostalCode" name="billToPostalCode" value="${parameters.billToPostalCode!}" />
*</td>
</tr>
<tr>
@@ -310,7 +310,7 @@ under the License.
<td width="72%">
<@fieldErrors fieldName="billToCountryGeoId"/>
<select name="billToCountryGeoId" id="billToCountryGeoId" class="selectBox">
- <#if (parameters.billToCountryGeoId)?exists>
+ <#if (parameters.billToCountryGeoId)??>
<option>${parameters.billToCountryGeoId}</option>
<option value="${parameters.billToCountryGeoId}">---</option>
</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl Sat Aug 16 08:40:28 2014
@@ -79,16 +79,16 @@ function onClickShippingMethod(e) {
<div>
<#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId>
<input type="radio" onclick="return onClickShippingMethod(event)" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked="checked"</#if>/>
- <#if shoppingCart.getShippingContactMechId()?exists>
+ <#if shoppingCart.getShippingContactMechId()??>
<#assign shippingEst = shippingEstWpr.getShippingEstimate(carrierShipmentMethod)?default(-1)>
</#if>
- <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId?if_exists} </#if>${carrierShipmentMethod.description?if_exists}
+ <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId!} </#if>${carrierShipmentMethod.description!}
<#if shippingEst?has_content> - <#if (shippingEst > -1)><@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/><#else>${uiLabelMap.OrderCalculatedOffline}</#if></#if>
</div>
</td>
</tr>
</#list>
- <#if !carrierShipmentMethodList?exists || carrierShipmentMethodList?size == 0>
+ <#if !carrierShipmentMethodList?? || carrierShipmentMethodList?size == 0>
<tr>
<td width="1%" valign="top">
<div><input type="radio" onclick="return onClickShippingMethod(event)" name="shipping_method" value="Default" checked="checked"/>${uiLabelMap.OrderUseDefault}.</div>
@@ -107,17 +107,17 @@ function onClickShippingMethod(e) {
</tr>
<tr>
<td colspan="2">
- <textarea class='textAreaBox' cols="30" rows="3" name="shipping_instructions">${shoppingCart.getShippingInstructions()?if_exists}</textarea>
+ <textarea class='textAreaBox' cols="30" rows="3" name="shipping_instructions">${shoppingCart.getShippingInstructions()!}</textarea>
</td>
</tr>
<tr><td colspan="2"><hr /></td></tr>
<tr>
<td colspan="2">
<h2>${uiLabelMap.OrderPoNumber}</h2>
- <input type="text" class='inputBox' name="correspondingPoId" size="15" value='${shoppingCart.getPoNumber()?if_exists}'/>
+ <input type="text" class='inputBox' name="correspondingPoId" size="15" value='${shoppingCart.getPoNumber()!}'/>
</td>
</tr>
- <#if productStore.showCheckoutGiftOptions?if_exists != "N">
+ <#if productStore.showCheckoutGiftOptions! != "N">
<tr><td colspan="2"><hr /></td></tr>
<tr>
<td colspan="2">
@@ -136,7 +136,7 @@ function onClickShippingMethod(e) {
</tr>
<tr>
<td colspan="2">
- <textarea class='textAreaBox' cols="30" rows="3" name="gift_message">${shoppingCart.getGiftMessage()?if_exists}</textarea>
+ <textarea class='textAreaBox' cols="30" rows="3" name="gift_message">${shoppingCart.getGiftMessage()!}</textarea>
</td>
</tr>
</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl Sat Aug 16 08:40:28 2014
@@ -19,7 +19,7 @@ under the License.
<#-- NOTE: this template is used for the orderstatus screen in ecommerce AND for order notification emails through the OrderNoticeEmail.ftl file -->
<#-- the "urlPrefix" value will be prepended to URLs by the ofbizUrl transform if/when there is no "request" object in the context -->
-<#if baseEcommerceSecureUrl?exists><#assign urlPrefix = baseEcommerceSecureUrl/></#if>
+<#if baseEcommerceSecureUrl??><#assign urlPrefix = baseEcommerceSecureUrl/></#if>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
@@ -29,7 +29,7 @@ under the License.
<div class="screenlet">
<div class="screenlet-title-bar">
<div class="boxlink">
- <#if maySelectItems?default("N") == "Y" && returnLink?default("N") == "Y" && (orderHeader.statusId)?if_exists == "ORDER_COMPLETED">
+ <#if maySelectItems?default("N") == "Y" && returnLink?default("N") == "Y" && (orderHeader.statusId)! == "ORDER_COMPLETED">
<a href="<@o...@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderRequestReturn}</a>
</#if>
</div>
@@ -38,8 +38,8 @@ under the License.
<div class="screenlet-body">
<table width="100%" border="0" cellpadding="1">
<#-- placing customer information -->
- <#if localOrderReadHelper?exists && orderHeader?has_content>
- <#assign displayParty = localOrderReadHelper.getPlacingParty()?if_exists/>
+ <#if localOrderReadHelper?? && orderHeader?has_content>
+ <#assign displayParty = localOrderReadHelper.getPlacingParty()!/>
<#if displayParty?has_content>
<#assign displayPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", displayParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/>
</#if>
@@ -83,7 +83,7 @@ under the License.
</td>
</tr>
</#if>
- <#if distributorId?exists>
+ <#if distributorId??>
<tr><td colspan="7"><hr /></td></tr>
<tr>
<td align="right" valign="top" width="15%">
@@ -116,10 +116,10 @@ under the License.
<#assign groupIdx = 0>
<#list orderItemShipGroups as shipGroup>
<#if orderHeader?has_content>
- <#assign shippingAddress = shipGroup.getRelatedOne("PostalAddress", false)?if_exists>
- <#assign groupNumber = shipGroup.shipGroupSeqId?if_exists>
+ <#assign shippingAddress = shipGroup.getRelatedOne("PostalAddress", false)!>
+ <#assign groupNumber = shipGroup.shipGroupSeqId!>
<#else>
- <#assign shippingAddress = cart.getShippingAddress(groupIdx)?if_exists>
+ <#assign shippingAddress = cart.getShippingAddress(groupIdx)!>
<#assign groupNumber = groupIdx + 1>
</#if>
@@ -137,8 +137,8 @@ under the License.
${shippingAddress.address1}<br />
<#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if>
${shippingAddress.city}<#if shippingAddress.stateProvinceGeoId?has_content>, ${shippingAddress.stateProvinceGeoId} </#if>
- ${shippingAddress.postalCode?if_exists}<br />
- ${shippingAddress.countryGeoId?if_exists}
+ ${shippingAddress.postalCode!}<br />
+ ${shippingAddress.countryGeoId!}
</div>
</td>
</tr>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl Sat Aug 16 08:40:28 2014
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<#if requestParameters.paymentMethodTypeId?has_content>
- <#assign paymentMethodTypeId = "${requestParameters.paymentMethodTypeId?if_exists}">
+ <#assign paymentMethodTypeId = "${requestParameters.paymentMethodTypeId!}">
</#if>
<script language="JavaScript" type="text/javascript">
@@ -116,11 +116,11 @@ function getPaymentInformation() {
<input type="hidden" name="appendPayment" value="Y"/>
</#if>
<input type="hidden" name="contactMechTypeId" value="POSTAL_ADDRESS"/>
- <input type="hidden" name="partyId" value="${partyId?if_exists}"/>
- <input type="hidden" name="paymentMethodTypeId" value="${paymentMethodTypeId?if_exists}"/>
+ <input type="hidden" name="partyId" value="${partyId!}"/>
+ <input type="hidden" name="paymentMethodTypeId" value="${paymentMethodTypeId!}"/>
<input type="hidden" name="createNew" value="Y"/>
- <#if session.getAttribute("billingContactMechId")?exists>
- <input type="hidden" name="contactMechId" value="${session.getAttribute("billingContactMechId")?if_exists}"/>
+ <#if session.getAttribute("billingContactMechId")??>
+ <input type="hidden" name="contactMechId" value="${session.getAttribute("billingContactMechId")!}"/>
</#if>
<table width="100%" border="0" cellpadding="1" cellspacing="0">
@@ -130,13 +130,13 @@ function getPaymentInformation() {
<td colspan="2">
<select name="paymentMethodTypeOptionList" class="selectBox" onchange="javascript:getPaymentInformation();">
<option value="none">Select One</option>
- <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD?exists>
+ <#if productStorePaymentMethodTypeIdMap.CREDIT_CARD??>
<option value="CREDIT_CARD" <#if (parameters.paymentMethodTypeId?default("") == "CREDIT_CARD")> selected="selected"</#if>>${uiLabelMap.AccountingVisaMastercardAmexDiscover}</option>
</#if>
- <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT?exists>
+ <#if productStorePaymentMethodTypeIdMap.EFT_ACCOUNT??>
<option value="EFT_ACCOUNT" <#if (parameters.paymentMethodTypeId?default("") == "EFT_ACCOUNT")> selected="selected"</#if>>${uiLabelMap.AccountingAHCElectronicCheck}</option>
</#if>
- <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE?exists>
+ <#if productStorePaymentMethodTypeIdMap.EXT_OFFLINE??>
<option value="EXT_OFFLINE" <#if (parameters.paymentMethodTypeId?default("") == "EXT_OFFLINE")> selected="selected"</#if>>${uiLabelMap.OrderPaymentOfflineCheckMoney}</option>
</#if>
</select>
@@ -145,7 +145,7 @@ function getPaymentInformation() {
<tr><td nowrap="nowrap" colspan="3"><div id="paymentInfoSection"></div></td></tr>
<tr><td colspan="3"><hr /></td></tr>
<#-- gift card fields -->
- <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists>
+ <#if productStorePaymentMethodTypeIdMap.GIFT_CARD??>
<tr>
<td width='26%' nowrap="nowrap" align="right">
<input type="checkbox" id="addGiftCard" name="addGiftCard" value="Y" onclick="javascript:getGCInfo();"/>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl?rev=1618313&r1=1618312&r2=1618313&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl Sat Aug 16 08:40:28 2014
@@ -32,7 +32,7 @@ under the License.
<input type="hidden" name="_useRowSubmit" value="Y"/>
<input type="hidden" name="returnHeaderTypeId" value="CUSTOMER_RETURN"/>
<input type="hidden" name="fromPartyId" value="${party.partyId}"/>
- <input type="hidden" name="toPartyId" value="${toPartyId?if_exists}"/>
+ <input type="hidden" name="toPartyId" value="${toPartyId!}"/>
<input type="hidden" name="orderId" value="${orderId}"/>
<#if (orderHeader.currencyUom)?has_content>
<input type="hidden" name="currencyUomId" value="${orderHeader.currencyUom}"/>
@@ -60,7 +60,7 @@ under the License.
<#if !orderItem.orderAdjustmentId?has_content> <#-- filter orderAdjustments -->
<input type="hidden" name="orderId_o_${rowCount}" value="${orderItem.orderId}"/>
<input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/>
- <input type="hidden" name="description_o_${rowCount}" value="${orderItem.itemDescription?if_exists}"/>
+ <input type="hidden" name="description_o_${rowCount}" value="${orderItem.itemDescription!}"/>
<#-- <input type="hidden" name="returnItemType_o_${rowCount}" value="ITEM"/> -->
<#assign returnItemType = returnItemTypeMap.get(returnableItems.get(orderItem).get("itemTypeKey"))/>
<input type="hidden" name="returnItemTypeId_o_${rowCount}" value="${returnItemType}"/>
@@ -75,7 +75,7 @@ under the License.
<tr>
<td>
<div>
- <#if orderItem.productId?exists>
+ <#if orderItem.productId??>
<a href="<@o...@ofbizUrl>" class="buttontext">${orderItem.productId}</a>
<input type="hidden" name="productId_o_${rowCount}" value="${orderItem.productId}"/>
</#if>