svn commit: r1618554 [11/38] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1618554 [11/38] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderinfo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderinfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderinfo.ftl Mon Aug 18 07:42:27 2014 @@ -24,12 +24,12 @@ under the License. <#assign externalOrder = "(" + orderHeader.externalId + ")"/> </#if> <#assign orderType = orderHeader.getRelatedOne("OrderType", false)/> - <li class="h3"> ${orderType?if_exists.get("description", locale)?default(uiLabelMap.OrderOrder)} ${uiLabelMap.CommonNbr} <a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>">${orderId}</a> ${externalOrder?if_exists} [ <a href="<@ofbizUrl>order.pdf?orderId=${orderId}</@ofbizUrl>" target="_blank">PDF</a> ]</li> + <li class="h3"> ${(orderType.get("description", locale))?default(uiLabelMap.OrderOrder)} ${uiLabelMap.CommonNbr} <a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>">${orderId}</a> ${externalOrder!} [ <a href="<@ofbizUrl>order.pdf?orderId=${orderId}</@ofbizUrl>" target="_blank">PDF</a> ]</li> <#if currentStatus.statusId == "ORDER_APPROVED" && orderHeader.orderTypeId == "SALES_ORDER"> <li class="h3"><a href="javascript:document.PrintOrderPickSheet.submit()">${uiLabelMap.FormFieldTitle_printPickSheet}</a> <form name="PrintOrderPickSheet" method="post" action="<@ofbizUrl>orderPickSheet.pdf</@ofbizUrl>" target="_BLANK"> - <input type="hidden" name="facilityId" value="${storeFacilityId?if_exists}"/> - <input type="hidden" name="orderId" value="${orderHeader.orderId?if_exists}"/> + <input type="hidden" name="facilityId" value="${storeFacilityId!}"/> + <input type="hidden" name="orderId" value="${orderHeader.orderId!}"/> <input type="hidden" name="maxNumberOfOrdersToPrint" value="1"/> </form> </li> @@ -40,22 +40,22 @@ under the License. <input type="hidden" name="statusId" value="ORDER_APPROVED"/> <input type="hidden" name="newStatusId" value="ORDER_APPROVED"/> <input type="hidden" name="setItemStatus" value="Y"/> - <input type="hidden" name="workEffortId" value="${workEffortId?if_exists}"/> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="partyId" value="${assignPartyId?if_exists}"/> - <input type="hidden" name="roleTypeId" value="${assignRoleTypeId?if_exists}"/> - <input type="hidden" name="fromDate" value="${fromDate?if_exists}"/> + <input type="hidden" name="workEffortId" value="${workEffortId!}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="partyId" value="${assignPartyId!}"/> + <input type="hidden" name="roleTypeId" value="${assignRoleTypeId!}"/> + <input type="hidden" name="fromDate" value="${fromDate!}"/> </form> </li> <#elseif currentStatus.statusId == "ORDER_APPROVED"> <li><a href="javascript:document.OrderHold.submit()">${uiLabelMap.OrderHold}</a> <form name="OrderHold" method="post" action="<@ofbizUrl>changeOrderStatus/orderview</@ofbizUrl>"> <input type="hidden" name="statusId" value="ORDER_HOLD"/> - <input type="hidden" name="workEffortId" value="${workEffortId?if_exists}"/> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="partyId" value="${assignPartyId?if_exists}"/> - <input type="hidden" name="roleTypeId" value="${assignRoleTypeId?if_exists}"/> - <input type="hidden" name="fromDate" value="${fromDate?if_exists}"/> + <input type="hidden" name="workEffortId" value="${workEffortId!}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="partyId" value="${assignPartyId!}"/> + <input type="hidden" name="roleTypeId" value="${assignRoleTypeId!}"/> + <input type="hidden" name="fromDate" value="${fromDate!}"/> </form> </li> <#elseif currentStatus.statusId == "ORDER_HOLD"> @@ -63,11 +63,11 @@ under the License. <form name="OrderApproveOrder" method="post" action="<@ofbizUrl>changeOrderStatus/orderview</@ofbizUrl>"> <input type="hidden" name="statusId" value="ORDER_APPROVED"/> <input type="hidden" name="setItemStatus" value="Y"/> - <input type="hidden" name="workEffortId" value="${workEffortId?if_exists}"/> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="partyId" value="${assignPartyId?if_exists}"/> - <input type="hidden" name="roleTypeId" value="${assignRoleTypeId?if_exists}"/> - <input type="hidden" name="fromDate" value="${fromDate?if_exists}"/> + <input type="hidden" name="workEffortId" value="${workEffortId!}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="partyId" value="${assignPartyId!}"/> + <input type="hidden" name="roleTypeId" value="${assignRoleTypeId!}"/> + <input type="hidden" name="fromDate" value="${fromDate!}"/> </form> </li> </#if> @@ -76,11 +76,11 @@ under the License. <form name="OrderCancel" method="post" action="<@ofbizUrl>changeOrderStatus/orderview</@ofbizUrl>"> <input type="hidden" name="statusId" value="ORDER_CANCELLED"/> <input type="hidden" name="setItemStatus" value="Y"/> - <input type="hidden" name="workEffortId" value="${workEffortId?if_exists}"/> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="partyId" value="${assignPartyId?if_exists}"/> - <input type="hidden" name="roleTypeId" value="${assignRoleTypeId?if_exists}"/> - <input type="hidden" name="fromDate" value="${fromDate?if_exists}"/> + <input type="hidden" name="workEffortId" value="${workEffortId!}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="partyId" value="${assignPartyId!}"/> + <input type="hidden" name="roleTypeId" value="${assignRoleTypeId!}"/> + <input type="hidden" name="fromDate" value="${fromDate!}"/> </form> </li> </#if> @@ -88,7 +88,7 @@ under the License. <li><a href="javascript:document.OrderCompleteOrder.submit()">${uiLabelMap.OrderCompleteOrder}</a> <form name="OrderCompleteOrder" method="post" action="<@ofbizUrl>changeOrderStatus</@ofbizUrl>"> <input type="hidden" name="statusId" value="ORDER_COMPLETED"/> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> </form> </li> </#if> @@ -192,7 +192,7 @@ under the License. </#if> </td> </tr> - <#if (orderItem.cancelBackOrderDate)?exists> + <#if (orderItem.cancelBackOrderDate)??> <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.FormFieldTitle_cancelBackOrderDate}</td> @@ -200,7 +200,7 @@ under the License. <td valign="top" width="80%"><#if orderItem.cancelBackOrderDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderItem.cancelBackOrderDate, "", locale, timeZone)!}</#if></td> </tr> </#if> - <#if distributorId?exists> + <#if distributorId??> <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderDistributor}</td> @@ -211,7 +211,7 @@ under the License. </td> </tr> </#if> - <#if affiliateId?exists> + <#if affiliateId??> <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderAffiliate}</td> @@ -242,9 +242,9 @@ under the License. <form name="setOrderReservationPriority" method="post" action="<@ofbizUrl>setOrderReservationPriority</@ofbizUrl>"> <input type = "hidden" name="orderId" value="${orderId}"/> <select name="priority"> - <option value="1" <#if (orderHeader.priority)?if_exists == "1">selected="selected" </#if>>${uiLabelMap.CommonHigh}</option> - <option value="2" <#if (orderHeader.priority)?if_exists == "2">selected="selected" <#elseif !(orderHeader.priority)?has_content>selected="selected"</#if>>${uiLabelMap.CommonNormal}</option> - <option value="3" <#if (orderHeader.priority)?if_exists == "3">selected="selected" </#if>>${uiLabelMap.CommonLow}</option> + <option value="1" <#if (orderHeader.priority)! == "1">selected="selected" </#if>>${uiLabelMap.CommonHigh}</option> + <option value="2" <#if (orderHeader.priority)! == "2">selected="selected" <#elseif !(orderHeader.priority)?has_content>selected="selected"</#if>>${uiLabelMap.CommonNormal}</option> + <option value="3" <#if (orderHeader.priority)! == "3">selected="selected" </#if>>${uiLabelMap.CommonLow}</option> </select> <input type="submit" class="smallSubmit" value="${uiLabelMap.FormFieldTitle_reserveInventory}"/> </form> @@ -259,8 +259,8 @@ under the License. <form name="setInvoicePerShipment" method="post" action="<@ofbizUrl>setInvoicePerShipment</@ofbizUrl>"> <input type = "hidden" name="orderId" value="${orderId}"/> <select name="invoicePerShipment"> - <option value="Y" <#if (orderHeader.invoicePerShipment)?if_exists == "Y">selected="selected" </#if>>${uiLabelMap.CommonYes}</option> - <option value="N" <#if (orderHeader.invoicePerShipment)?if_exists == "N">selected="selected" </#if>>${uiLabelMap.CommonNo}</option> + <option value="Y" <#if (orderHeader.invoicePerShipment)! == "Y">selected="selected" </#if>>${uiLabelMap.CommonYes}</option> + <option value="N" <#if (orderHeader.invoicePerShipment)! == "N">selected="selected" </#if>>${uiLabelMap.CommonNo}</option> </select> <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonUpdate}"/> </form> @@ -282,7 +282,7 @@ under the License. <td valign="top" width="80%"> <form id="orderViewed" action=""> <input type="checkbox" name="checkViewed" onclick="javascript:markOrderViewed();"/> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> <input type="hidden" name="isViewed" value="Y"/> </form> </td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderitems.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderitems.ftl Mon Aug 18 07:42:27 2014 @@ -49,25 +49,25 @@ under the License. <#assign orderItemShipGrpInvResList = orderReadHelper.getOrderItemShipGrpInvResList(orderItem)> <#if orderHeader.orderTypeId == "SALES_ORDER"><#assign pickedQty = orderReadHelper.getItemPickedQuantityBd(orderItem)></#if> <tr<#if itemClass == "1"> class="alternate-row"</#if>> - <#assign orderItemType = orderItem.getRelatedOne("OrderItemType", false)?if_exists> - <#assign productId = orderItem.productId?if_exists> - <#if productId?exists && productId == "shoppingcart.CommentLine"> + <#assign orderItemType = orderItem.getRelatedOne("OrderItemType", false)!> + <#assign productId = orderItem.productId!> + <#if productId?? && productId == "shoppingcart.CommentLine"> <td colspan="7" valign="top" class="label"> >> ${orderItem.itemDescription}</td> <#else> <td colspan="7"> <div class="order-item-description"> <#if orderItem.supplierProductId?has_content> - ${orderItem.supplierProductId} - ${orderItem.itemDescription?if_exists} - <#elseif productId?exists> - ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?if_exists} - <#if (product.salesDiscontinuationDate)?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(product.salesDiscontinuationDate)> + ${orderItem.supplierProductId} - ${orderItem.itemDescription!} + <#elseif productId??> + ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription!} + <#if (product.salesDiscontinuationDate)?? && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(product.salesDiscontinuationDate)> <br /> <span style="color: red;">${uiLabelMap.OrderItemDiscontinued}: ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(product.salesDiscontinuationDate, "", locale, timeZone)!}</span> </#if> - <#elseif orderItemType?exists> - ${orderItemType.description} - ${orderItem.itemDescription?if_exists} + <#elseif orderItemType??> + ${orderItemType.description} - ${orderItem.itemDescription!} <#else> - ${orderItem.itemDescription?if_exists} + ${orderItem.itemDescription!} </#if> <#assign orderItemAttributes = orderItem.getRelated("OrderItemAttribute", null, null, false)/> <#if orderItemAttributes?has_content> @@ -98,16 +98,16 @@ under the License. </#if> </tr> <tr<#if itemClass == "1"> class="alternate-row"</#if>> - <#if productId?exists && productId == "shoppingcart.CommentLine"> + <#if productId?? && productId == "shoppingcart.CommentLine"> <td colspan="7" valign="top" class="label"> >> ${orderItem.itemDescription}</td> <#else> <td valign="top"> <#if productId?has_content> <#assign product = orderItem.getRelatedOne("Product", true)> </#if> - <#if productId?exists> + <#if productId??> <#-- INVENTORY --> - <#if (orderHeader.statusId != "ORDER_COMPLETED") && availableToPromiseMap?exists && quantityOnHandMap?exists && availableToPromiseMap.get(productId)?exists && quantityOnHandMap.get(productId)?exists> + <#if (orderHeader.statusId != "ORDER_COMPLETED") && availableToPromiseMap?? && quantityOnHandMap?? && availableToPromiseMap.get(productId)?? && quantityOnHandMap.get(productId)??> <#assign quantityToProduce = 0> <#assign atpQuantity = availableToPromiseMap.get(productId)?default(0)> <#assign qohQuantity = quantityOnHandMap.get(productId)?default(0)> @@ -133,12 +133,12 @@ under the License. <td>${uiLabelMap.OrderRequiredForSO}</td> <td style="padding-left: 15px; text-align: left;">${requiredQuantity}</td> </tr> - <#if availableToPromiseByFacilityMap?exists && quantityOnHandByFacilityMap?exists && quantityOnHandByFacilityMap.get(productId)?exists && availableToPromiseByFacilityMap.get(productId)?exists> + <#if availableToPromiseByFacilityMap?? && quantityOnHandByFacilityMap?? && quantityOnHandByFacilityMap.get(productId)?? && availableToPromiseByFacilityMap.get(productId)??> <#assign atpQuantityByFacility = availableToPromiseByFacilityMap.get(productId)?default(0)> <#assign qohQuantityByFacility = quantityOnHandByFacilityMap.get(productId)?default(0)> <tr> <td> - ${uiLabelMap.ProductInInventory} [${facility.facilityName?if_exists}] ${uiLabelMap.ProductQoh} + ${uiLabelMap.ProductInInventory} [${facility.facilityName!}] ${uiLabelMap.ProductQoh} </td> <td style="padding-left: 15px; text-align: left;"> ${qohQuantityByFacility} (${uiLabelMap.ProductAtp}: ${atpQuantityByFacility}) @@ -192,8 +192,8 @@ under the License. <a href="javascript:document.OrderApproveOrderItem_${orderItem.orderItemSeqId?default("")}.submit()" class="buttontext">${uiLabelMap.OrderApproveOrder}</a> <form name="OrderApproveOrderItem_${orderItem.orderItemSeqId?default("")}" method="post" action="<@ofbizUrl>changeOrderItemStatus</@ofbizUrl>"> <input type="hidden" name="statusId" value="ITEM_APPROVED"/> - <input type="hidden" name="orderId" value="${orderId?if_exists}"/> - <input type="hidden" name="orderItemSeqId" value="${orderItem.orderItemSeqId?if_exists}"/> + <input type="hidden" name="orderId" value="${orderId!}"/> + <input type="hidden" name="orderItemSeqId" value="${orderItem.orderItemSeqId!}"/> </form> </div> </#if> @@ -204,7 +204,7 @@ under the License. </#list> </div> </div> - <#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 returnItem> <#assign returnHeader = returnItem.getRelatedOne("ReturnHeader", false)> @@ -224,13 +224,13 @@ under the License. <#assign shippedQuantity = orderReadHelper.getItemShippedQuantity(orderItem)> <#assign shipmentReceipts = delegator.findByAnd("ShipmentReceipt", {"orderId" : orderHeader.getString("orderId"), "orderItemSeqId" : orderItem.orderItemSeqId}, null, false)/> <#assign totalReceived = 0.0> - <#if shipmentReceipts?exists && shipmentReceipts?has_content> + <#if shipmentReceipts?? && shipmentReceipts?has_content> <#list shipmentReceipts as shipmentReceipt> - <#if shipmentReceipt.quantityAccepted?exists && shipmentReceipt.quantityAccepted?has_content> + <#if shipmentReceipt.quantityAccepted?? && shipmentReceipt.quantityAccepted?has_content> <#assign quantityAccepted = shipmentReceipt.quantityAccepted> <#assign totalReceived = quantityAccepted + totalReceived> </#if> - <#if shipmentReceipt.quantityRejected?exists && shipmentReceipt.quantityRejected?has_content> + <#if shipmentReceipt.quantityRejected?? && shipmentReceipt.quantityRejected?has_content> <#assign quantityRejected = shipmentReceipt.quantityRejected> <#assign totalReceived = quantityRejected + totalReceived> </#if> @@ -272,8 +272,13 @@ under the License. <tr valign="top"> <td><b>${uiLabelMap.OrderRemaining}</b></td> <td>${remainingQuantity}</td> - <td><b>${uiLabelMap.OrderQtyShipped}</b></td> - <td>${shippedQuantity}</td> + <#if orderHeader.orderTypeId == "PURCHASE_ORDER"> + <td><b>${uiLabelMap.OrderPlannedInReceive}</b></td> + <td>${totalReceived}</td> + <#else> + <td><b>${uiLabelMap.OrderQtyShipped}</b></td> + <td>${shippedQuantity}</td> + </#if> </tr> <tr valign="top"> <td><b>${uiLabelMap.OrderShortfalled}</b></td> @@ -318,7 +323,7 @@ under the License. </#if> </tr> <#-- show info from workeffort --> - <#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 workEffort = workOrderItemFulfillment.getRelatedOne("WorkEffort", true)> @@ -330,7 +335,7 @@ under the License. <a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${workEffort.workEffortId}</a> ${uiLabelMap.OrderCurrentStatus} - ${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists} + ${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))!} <#else> ${uiLabelMap.CommonFrom} : <#if workEffort.estimatedStartDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(workEffort.estimatedStartDate, "", locale, timeZone)!}</#if> ${uiLabelMap.CommonTo} @@ -355,9 +360,9 @@ under the License. <tr<#if itemClass == "1"> class="alternate-row"</#if>> <td> </td> <td colspan="6"> - <span class="label">${uiLabelMap.OrderLinkedToOrderItem}</span> (${description?if_exists}) + <span class="label">${uiLabelMap.OrderLinkedToOrderItem}</span> (${description!}) <a href="/ordermgr/control/orderview?orderId=${linkedOrderId}" - class="buttontext">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description?if_exists} + class="buttontext">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description!} </td> </tr> </#list> @@ -372,15 +377,15 @@ under the License. <tr<#if itemClass == "1"> class="alternate-row"</#if>> <td> </td> <td colspan="6"> - <span class="label">${uiLabelMap.OrderLinkedFromOrderItem}</span> (${description?if_exists}) + <span class="label">${uiLabelMap.OrderLinkedFromOrderItem}</span> (${description!}) <a href="/ordermgr/control/orderview?orderId=${linkedOrderId}" - class="buttontext">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description?if_exists} + class="buttontext">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description!} </td> </tr> </#list> </#if> <#-- show linked requirements --> - <#assign linkedRequirements = orderItem.getRelated("OrderRequirementCommitment", null, null, false)?if_exists> + <#assign linkedRequirements = orderItem.getRelated("OrderRequirementCommitment", null, null, false)!> <#if linkedRequirements?has_content> <#list linkedRequirements as linkedRequirement> <tr<#if itemClass == "1"> class="alternate-row"</#if>> @@ -394,7 +399,7 @@ under the License. </#list> </#if> <#-- show linked quote --> - <#assign linkedQuote = orderItem.getRelatedOne("QuoteItem", true)?if_exists> + <#assign linkedQuote = orderItem.getRelatedOne("QuoteItem", true)!> <#if linkedQuote?has_content> <tr<#if itemClass == "1"> class="alternate-row"</#if>> <td> </td> @@ -407,13 +412,13 @@ under the License. </#if> <#-- now show adjustment details per line item --> <#assign orderItemAdjustments = Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentList(orderItem, orderAdjustments)> - <#if orderItemAdjustments?exists && orderItemAdjustments?has_content> + <#if orderItemAdjustments?? && orderItemAdjustments?has_content> <#list orderItemAdjustments as orderItemAdjustment> <#assign adjustmentType = orderItemAdjustment.getRelatedOne("OrderAdjustmentType", true)> <tr<#if itemClass == "1"> class="alternate-row"</#if>> <td align="right" colspan="2"> <span class="label">${uiLabelMap.OrderAdjustment}</span> ${adjustmentType.get("description",locale)} - ${StringUtil.wrapString(orderItemAdjustment.get("description",locale)?if_exists)} + ${StringUtil.wrapString(orderItemAdjustment.get("description",locale)!)} <#if orderItemAdjustment.comments?has_content> (${orderItemAdjustment.comments?default("")}) </#if> @@ -425,20 +430,20 @@ under the License. <#if orderItemAdjustment.primaryGeoId?has_content> <#assign primaryGeo = orderItemAdjustment.getRelatedOne("PrimaryGeo", true)/> <#if primaryGeo.geoName?has_content> - <span class="label">${uiLabelMap.OrderJurisdiction}</span> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}] + <span class="label">${uiLabelMap.OrderJurisdiction}</span> ${primaryGeo.geoName} [${primaryGeo.abbreviation!}] </#if> <#if orderItemAdjustment.secondaryGeoId?has_content> <#assign secondaryGeo = orderItemAdjustment.getRelatedOne("SecondaryGeo", true)/> - <span class="label">${uiLabelMap.CommonIn}</span> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}]) + <span class="label">${uiLabelMap.CommonIn}</span> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation!}]) </#if> </#if> - <#if orderItemAdjustment.sourcePercentage?exists> + <#if orderItemAdjustment.sourcePercentage??> <span class="label">${uiLabelMap.OrderRate}</span> ${orderItemAdjustment.sourcePercentage?string("0.######")} </#if> <#if orderItemAdjustment.customerReferenceId?has_content> <span class="label">${uiLabelMap.OrderCustomerTaxId}</span> ${orderItemAdjustment.customerReferenceId} </#if> - <#if orderItemAdjustment.exemptAmount?exists> + <#if orderItemAdjustment.exemptAmount??> <span class="label">${uiLabelMap.OrderExemptAmount}</span> ${orderItemAdjustment.exemptAmount} </#if> </#if> @@ -454,15 +459,15 @@ under the License. </#if> <#-- now show price info per line item --> <#assign orderItemPriceInfos = orderReadHelper.getOrderItemPriceInfos(orderItem)> - <#if orderItemPriceInfos?exists && orderItemPriceInfos?has_content> + <#if orderItemPriceInfos?? && orderItemPriceInfos?has_content> <tr<#if itemClass == "1"> class="alternate-row"</#if>> <td colspan="7"> </td> </tr> <#list orderItemPriceInfos as orderItemPriceInfo> <tr<#if itemClass == "1"> class="alternate-row"</#if>> <td align="right" colspan="2"> - <span class="label">${uiLabelMap.ProductPriceRuleNameId}</span> [${orderItemPriceInfo.productPriceRuleId?if_exists}:${orderItemPriceInfo.productPriceActionSeqId?if_exists}] - ${orderItemPriceInfo.description?if_exists} + <span class="label">${uiLabelMap.ProductPriceRuleNameId}</span> [${orderItemPriceInfo.productPriceRuleId!}:${orderItemPriceInfo.productPriceActionSeqId!}] + ${orderItemPriceInfo.description!} </td> <td> </td> <td align="right"> @@ -474,7 +479,7 @@ under the License. </#if> <#-- now show survey information per line item --> <#assign orderItemSurveyResponses = Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemSurveyResponse(orderItem)> - <#if orderItemSurveyResponses?exists && orderItemSurveyResponses?has_content> + <#if orderItemSurveyResponses?? && orderItemSurveyResponses?has_content> <#list orderItemSurveyResponses as survey> <tr<#if itemClass == "1"> class="alternate-row"</#if>> <td align="right" colspan="2"> @@ -487,7 +492,7 @@ under the License. </#list> </#if> <#-- display the ship estimated/before/after dates --> - <#if orderItem.estimatedShipDate?exists> + <#if orderItem.estimatedShipDate??> <tr<#if itemClass == "1"> class="alternate-row"</#if>> <td align="right" colspan="2"> <span class="label">${uiLabelMap.OrderEstimatedShipDate}</span> ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.estimatedShipDate, "", locale, timeZone)!} @@ -495,7 +500,7 @@ under the License. <td colspan="5"> </td> </tr> </#if> - <#if orderItem.estimatedDeliveryDate?exists> + <#if orderItem.estimatedDeliveryDate??> <tr<#if itemClass == "1"> class="alternate-row"</#if>> <td align="right" colspan="2"> <span class="label">${uiLabelMap.OrderOrderQuoteEstimatedDeliveryDate}</span> ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.estimatedDeliveryDate, "", locale, timeZone)!} @@ -503,7 +508,7 @@ under the License. <td colspan="5"> </td> </tr> </#if> - <#if orderItem.shipAfterDate?exists> + <#if orderItem.shipAfterDate??> <tr<#if itemClass == "1"> class="alternate-row"</#if>> <td align="right" colspan="2"> <span class="label">${uiLabelMap.OrderShipAfterDate}</span> ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.shipAfterDate, "", locale, timeZone)!} @@ -511,7 +516,7 @@ under the License. <td colspan="5"> </td> </tr> </#if> - <#if orderItem.shipBeforeDate?exists> + <#if orderItem.shipBeforeDate??> <tr<#if itemClass == "1"> class="alternate-row"</#if>> <td align="right" colspan="2"> <span class="label">${uiLabelMap.OrderShipBeforeDate}</span> ${Static["org.ofbiz.base.util.UtilFormatOut"].formatDate(orderItem.shipBeforeDate, "", locale, timeZone)!} @@ -520,11 +525,11 @@ under the License. </tr> </#if> <#-- now show ship group info per line item --> - <#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)> - <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress", false)?if_exists> + <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress", false)!> <tr<#if itemClass == "1"> class="alternate-row"</#if>> <td align="right" colspan="2"> <span class="label">${uiLabelMap.OrderShipGroup}</span> [${shipGroup.shipGroupSeqId}] @@ -538,7 +543,7 @@ under the License. </#list> </#if> <#-- now show inventory reservation info per line item --> - <#if orderItemShipGrpInvResList?exists && orderItemShipGrpInvResList?has_content> + <#if orderItemShipGrpInvResList?? && orderItemShipGrpInvResList?has_content> <#list orderItemShipGrpInvResList as orderItemShipGrpInvRes> <tr<#if itemClass == "1"> class="alternate-row"</#if>> <td align="right" colspan="2"> @@ -564,7 +569,7 @@ under the License. </#list> </#if> <#-- now show planned shipment info per line item --> - <#assign orderShipments = orderItem.getRelated("OrderShipment", null, null, false)?if_exists> + <#assign orderShipments = orderItem.getRelated("OrderShipment", null, null, false)!> <#if orderShipments?has_content> <#list orderShipments as orderShipment> <tr<#if itemClass == "1"> class="alternate-row"</#if>> @@ -582,7 +587,7 @@ under the License. </#list> </#if> <#-- now show item issuances (shipment) per line item --> - <#assign itemIssuances = itemIssuancesPerItem.get(orderItem.get("orderItemSeqId"))?if_exists> + <#assign itemIssuances = itemIssuancesPerItem.get(orderItem.get("orderItemSeqId"))!> <#if itemIssuances?has_content> <#list itemIssuances as itemIssuance> <tr<#if itemClass == "1"> class="alternate-row"</#if>> @@ -591,7 +596,7 @@ under the License. <span class="label">${uiLabelMap.OrderIssuedToShipmentItem}</span> <a target="facility" href="/facility/control/ViewShipment?shipmentId=${itemIssuance.shipmentId}${StringUtil.wrapString(externalKeyParam)}" - class="buttontext">${itemIssuance.shipmentId}</a>: ${itemIssuance.shipmentItemSeqId?if_exists} + class="buttontext">${itemIssuance.shipmentId}</a>: ${itemIssuance.shipmentItemSeqId!} <#else> <span class="label">${uiLabelMap.OrderIssuedWithoutShipment}</span> </#if> @@ -613,7 +618,7 @@ under the License. <span class="label">${uiLabelMap.CommonInventory}</span> <a href="/facility/control/EditInventoryItem?inventoryItemId=${itemIssuance.inventoryItemId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${itemIssuance.inventoryItemId}</a> - <span class="label">${uiLabelMap.OrderShipGroup}</span> ${itemIssuance.shipGroupSeqId?if_exists} + <span class="label">${uiLabelMap.OrderShipGroup}</span> ${itemIssuance.shipGroupSeqId!} <#if (inventoryItem.serialNumber?has_content)> <br /> <span class="label">${uiLabelMap.ProductSerialNumber}</span> ${inventoryItem.serialNumber} @@ -628,7 +633,7 @@ under the License. </#list> </#if> <#-- now show shipment receipts per line item --> - <#assign shipmentReceipts = orderItem.getRelated("ShipmentReceipt", null, null, false)?if_exists> + <#assign shipmentReceipts = orderItem.getRelated("ShipmentReceipt", null, null, false)!> <#if shipmentReceipts?has_content> <#list shipmentReceipts as shipmentReceipt> <tr<#if itemClass == "1"> class="alternate-row"</#if>> @@ -637,7 +642,7 @@ under the License. <span class="label">${uiLabelMap.OrderShipmentReceived}</span> <a target="facility" href="/facility/control/ViewShipment?shipmentId=${shipmentReceipt.shipmentId}${StringUtil.wrapString(externalKeyParam)}" - class="buttontext">${shipmentReceipt.shipmentId}</a>:${shipmentReceipt.shipmentItemSeqId?if_exists} + class="buttontext">${shipmentReceipt.shipmentId}</a>:${shipmentReceipt.shipmentItemSeqId!} </#if> <#if shipmentReceipt.datetimeReceived?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(shipmentReceipt.datetimeReceived, "", locale, timeZone)!}</#if> <span class="label">${uiLabelMap.CommonInventory}</span> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderlist.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderlist.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderlist.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderlist.ftl Mon Aug 18 07:42:27 2014 @@ -40,12 +40,12 @@ under the License. <tr> <td> <#if state.hasPrevious()> - <a href="<@ofbizUrl>orderlist?viewIndex=${state.getViewIndex() - 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> + <a href="<@ofbizUrl>orderlist?viewIndex=${state.getViewIndex() - 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate!}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> </#if> </td> <td align="right"> <#if state.hasNext()> - <a href="<@ofbizUrl>orderlist?viewIndex=${state.getViewIndex() + 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a> + <a href="<@ofbizUrl>orderlist?viewIndex=${state.getViewIndex() + 1}&viewSize=${state.getViewSize()}&filterDate=${filterDate!}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a> </#if> </td> </tr> @@ -168,37 +168,37 @@ under the License. <#list orderHeaderList as orderHeader> <#assign status = orderHeader.getRelatedOne("StatusItem", true)> <#assign orh = Static["org.ofbiz.order.order.OrderReadHelper"].getHelper(orderHeader)> - <#assign billToParty = orh.getBillToParty()?if_exists> - <#assign billFromParty = orh.getBillFromParty()?if_exists> + <#assign billToParty = orh.getBillToParty()!> + <#assign billFromParty = orh.getBillFromParty()!> <#if billToParty?has_content> <#assign billToPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billToParty.partyId, "compareDate", orderHeader.orderDate, "userLogin", userLogin))/> <#assign billTo = billToPartyNameResult.fullName?default("[${uiLabelMap.OrderPartyNameNotFound}]")/> - <#-- <#assign billTo = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(billToParty, true)?if_exists> --> + <#-- <#assign billTo = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(billToParty, true)!> --> <#else> <#assign billTo = ''/> </#if> <#if billFromParty?has_content> - <#assign billFrom = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(billFromParty, true)?if_exists> + <#assign billFrom = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(billFromParty, true)!> <#else> <#assign billFrom = ''/> </#if> - <#assign productStore = orderHeader.getRelatedOne("ProductStore", true)?if_exists /> + <#assign productStore = orderHeader.getRelatedOne("ProductStore", true)! /> <tr> <td><#if orderHeader.orderDate?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(orderHeader.orderDate, "", locale, timeZone)!}</#if></td> <td> <a href="<@ofbizUrl>orderview?orderId=${orderHeader.orderId}</@ofbizUrl>" class="buttontext">${orderHeader.orderId}</a> </td> - <td>${orderHeader.orderName?if_exists}</td> + <td>${orderHeader.orderName!}</td> <td>${orderHeader.getRelatedOne("OrderType", true).get("description",locale)}</td> - <td>${billFrom?if_exists}</td> - <td>${billTo?if_exists}</td> + <td>${billFrom!}</td> + <td>${billTo!}</td> <td><#if productStore?has_content>${productStore.storeName?default(productStore.productStoreId)}</#if></td> <td><@ofbizCurrency amount=orderHeader.grandTotal isoCode=orderHeader.currencyUom/></td> <td> <#assign trackingCodes = orderHeader.getRelated("TrackingCodeOrder", null, null, false)> <#list trackingCodes as trackingCode> <#if trackingCode?has_content> - <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey?if_exists}">${trackingCode.trackingCodeId}</a><br /> + <a href="/marketing/control/FindTrackingCodeOrders?trackingCodeId=${trackingCode.trackingCodeId}&externalLoginKey=${requestAttributes.externalLoginKey!}">${trackingCode.trackingCodeId}</a><br /> </#if> </#list> </td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordernotes.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordernotes.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordernotes.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordernotes.ftl Mon Aug 18 07:42:27 2014 @@ -47,7 +47,7 @@ under the License. ${note.noteInfo?replace("\n", "<br/>")} </td> <td align="right" valign="top" width="15%"> - <#if note.internalNote?if_exists == "N"> + <#if note.internalNote! == "N"> ${uiLabelMap.OrderPrintableNote} <form name="privateNotesForm_${note_index}" method="post" action="<@ofbizUrl>updateOrderNote</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderId}"/> @@ -56,7 +56,7 @@ under the License. <a href="javascript:document.privateNotesForm_${note_index}.submit()" class="buttontext">${uiLabelMap.OrderNotesPrivate}</a> </form> </#if> - <#if note.internalNote?if_exists == "Y"> + <#if note.internalNote! == "Y"> ${uiLabelMap.OrderNotPrintableNote} <form name="publicNotesForm_${note_index}" method="post" action="<@ofbizUrl>updateOrderNote</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderId}"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Mon Aug 18 07:42:27 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="<@ofbizUrl>addPaymentMethodToOrder</@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> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |