svn commit: r1643778 [4/5] - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1643778 [4/5] - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/editorderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=1643778&r1=1643777&r2=1643778&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/editorderitems.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/editorderitems.ftl Mon Dec 8 10:21:56 2014 @@ -245,27 +245,40 @@ under the License. <#assign shipGroupQty = shipGroupAssoc.quantity - shipGroupAssoc.cancelQuantity?default(0)> <#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup", false)> <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress", false)!> - <#assign itemStatusOkay = (orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && (shipGroupAssoc.cancelQuantity?default(0) < shipGroupAssoc.quantity?default(0)) && ("Y" != orderItem.isPromo!))> - <#assign itemSelectable = (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && itemStatusOkay) || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && itemStatusOkay && orderHeader.statusId != "ORDER_SENT")> - <tr> - <td class="align-text" colspan="2"> - <span class="label">${uiLabelMap.OrderShipGroup}</span> [${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("${uiLabelMap.OrderNotShipped}")} - </td> - <td align="center"> - <input type="text" name="iqm_${shipGroupAssoc.orderItemSeqId}:${shipGroupAssoc.shipGroupSeqId}" size="6" value="${shipGroupQty?string.number}"/> - <#if itemSelectable> - <input type="checkbox" name="selectedItem" value="${orderItem.orderItemSeqId}" /> - </#if> - </td> - <td colspan="4"> </td> - <td> - <#if itemSelectable> - <a href="javascript:document.updateItemInfo.action='<@ofbizUrl>cancelOrderItem</@ofbizUrl>';document.updateItemInfo.orderItemSeqId.value='${orderItem.orderItemSeqId}';document.updateItemInfo.shipGroupSeqId.value='${shipGroup.shipGroupSeqId}';document.updateItemInfo.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a> - <#else> - - </#if> - </td> - </tr> + <#assign shippedQuantity = orderReadHelper.getItemShipGroupAssocShippedQuantity(orderItem, shipGroup.shipGroupSeqId)> + <#if shipGroupAssoc.quantity != shippedQuantity> + <#assign itemStatusOkay = (orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && (shipGroupAssoc.cancelQuantity?default(0) < shipGroupAssoc.quantity?default(0)) && ("Y" != orderItem.isPromo!))> + <#assign itemSelectable = (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && itemStatusOkay) || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && itemStatusOkay && orderHeader.statusId != "ORDER_SENT")> + <tr> + <td class="align-text" colspan="2"> + <span class="label">${uiLabelMap.OrderShipGroup}</span> [${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("${uiLabelMap.OrderNotShipped}")} + </td> + <td align="center"> + <input type="text" name="iqm_${shipGroupAssoc.orderItemSeqId}:${shipGroupAssoc.shipGroupSeqId}" size="6" value="${shipGroupQty?string.number}"/> + <#if itemSelectable> + <input type="checkbox" name="selectedItem" value="${orderItem.orderItemSeqId}" /> + </#if> + </td> + <td colspan="4"> </td> + <td> + <#if itemSelectable> + <a href="javascript:document.updateItemInfo.action='<@ofbizUrl>cancelOrderItem</@ofbizUrl>';document.updateItemInfo.orderItemSeqId.value='${orderItem.orderItemSeqId}';document.updateItemInfo.shipGroupSeqId.value='${shipGroup.shipGroupSeqId}';document.updateItemInfo.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a> + <#else> + + </#if> + </td> + </tr> + <#else> + <tr> + <td class="align-text" colspan="2"> + <span class="label">${uiLabelMap.OrderQtyShipped}</span> [${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("${uiLabelMap.OrderNotShipped}")} + </td> + <td align="center"> + ${shippedQuantity?default(0)}<input type="hidden" name="iqm_${shipGroupAssoc.orderItemSeqId}:${shipGroupAssoc.shipGroupSeqId}" size="6" value="${shippedQuantity?string.number}"/> + </td> + <td colspan="5"> </td> + </tr> + </#if> </#list> </#if> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1643778&r1=1643777&r2=1643778&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Mon Dec 8 10:21:56 2014 @@ -166,13 +166,13 @@ under the License. </#if> <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED"> - <#if orderHeader.statusId != "ORDER_COMPLETED"> + <#if orderHeader.statusId != "ORDER_SENT" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED" && orderHeader.statusId != "ORDER_CANCELLED"> <#-- <li><a href="<@ofbizUrl>cancelOrderItem?${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCancelAllItems}</a></li> --> <li><a href="<@ofbizUrl>editOrderItems?${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderEditItems}</a></li> <li> - <form name="createOrderItemShipGroup" method="post" action="<@ofbizUrl>createOrderItemShipGroup</@ofbizUrl>"> + <form name="createOrderItemShipGroup" method="post" action="<@ofbizUrl>AddOrderItemShipGroup</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderId}"/> </form> <a href="javascript:document.createOrderItemShipGroup.submit()" class="buttontext">${uiLabelMap.OrderCreateShipGroup}</a> @@ -184,483 +184,644 @@ under the License. </#if> </#if> <li><a href="<@ofbizUrl>OrderHistory?orderId=${orderId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewOrderHistory}</a></li> + <#if !parameters.view?has_content> + <li><a href="<@ofbizUrl>orderview?orderId=${orderId}&view=OISGA</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderShipmentInformationByOrderItem}</a></li> + </#if> </ul> </div> </div> </#if> <#if shipGroups?has_content && (!orderHeader.salesChannelEnumId?? || orderHeader.salesChannelEnumId != "POS_SALES_CHANNEL")> -<#list shipGroups as shipGroup> - <#assign shipmentMethodType = shipGroup.getRelatedOne("ShipmentMethodType", false)!> - <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress", false)!> + <#if parameters.view?has_content && parameters.view = "OISGA"> <div class="screenlet"> - <div class="screenlet-title-bar"> - <ul> - <li class="h3"> ${uiLabelMap.OrderShipmentInformation} - ${shipGroup.shipGroupSeqId}</li> - <li class="expanded"><a onclick="javascript:toggleScreenlet(this, 'ShipGroupScreenletBody_${shipGroup.shipGroupSeqId}', 'true', '${uiLabelMap.CommonExpand}', '${uiLabelMap.CommonCollapse}');" title="Collapse"> </a></li> - <li><a target="_BLANK" href="<@ofbizUrl>shipGroups.pdf?orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}</@ofbizUrl>">${uiLabelMap.OrderShipGroup} PDF</a></li> - </ul> - <br class="clear"/> + <div class="screenlet-title-bar"> + <ul> + <li class="h3"> ${uiLabelMap.OrderShipmentInformation}</li> + <li><a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>">${uiLabelMap.OrderShipmentInformationByOISG}</a></li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <table width="100%" cellspacing="0" cellpadding="2" border="1" class="basic-table"> + <tr class="header-row"> + <td width="10%">${uiLabelMap.OrderItemId}</td> + <td width="25%">${uiLabelMap.ProductProduct}</td> + <td width="10%">${uiLabelMap.CommonQuantity}</td> + <td width="40%">${uiLabelMap.ProductQuantityNotAvailable}</td> + <td width="5%"> </td> + </tr> + <#assign index = 0> + <#list orderItemDatas as orderItemData> + <#assign orderItem = orderItemData.orderItem> + <#assign OISGAssContents = orderItemData.OISGAssContents> + <#assign product = orderItemData.product!> + <#assign quantityOrdered = orderItemData.quantityOrdered?default(0)> + <#assign totalQuantityToPlan = orderItemData.totalQuantityToPlan> + <#assign quantityNotAvailable = orderItemData.quantityNotAvailable> + <#assign rowCount = 0> + + <#if index != 0> + <tr><td colspan="4"><hr/></td></tr> + </#if> + <#if (quantityOrdered > 0) > + <tr id="tableevenrow"> + <td><div><a name="orderItem${index}">${orderItem.orderItemSeqId}</a></div></td> + <td><div>${product.internalName!} [<a href="/catalog/control/EditProduct?productId=${orderItem.productId!}" class="link">${orderItem.productId!}</a>]</div></td> + <td><div>${quantityOrdered}</div></td> + <td><div>${quantityNotAvailable}</div></td> + <td> + <#if !orderItem.statusId?exists || orderItem.statusId == "ITEM_CREATED" || orderItem.statusId == "ITEM_APPROVED"> + <div class="tabletext" id="display${index}"> + <a name="display${index}" href="javascript: showEdit('edit', '${index}');" class="smallSubmit"> ${uiLabelMap.CommonEdit}</a> + </div> + <div class="tabletext" id="edit${index}" style="display: none"> + <a style="float: left;" href="javascript: document.UpdateOrderItemShipGroupAssoc${index}.submit()" class="smallSubmit">${uiLabelMap.CommonValidate}</a> + <a style="float: left;" href="javascript:showEdit('display', '${index}'); restoreEditField('${index}');" class="smallSubmit">${uiLabelMap.CommonCancel}</a> + </div> + </#if> + </td> + <td class="tableList"></td> + </tr> + <tr><td colspan="4"><hr/></td></tr> + <form method="post" action="<@ofbizUrl>UpdateOrderItemShipGroupAssoc?view=OISGA</@ofbizUrl>" name="UpdateOrderItemShipGroupAssoc${index}"/> + <input type="hidden" name="orderId" value="${orderId}"/> + <input type="hidden" name="orderItemSeqId" value="${orderItem.orderItemSeqId}"/> + <#list OISGAssContents as OISGAssContent> + <#assign OISG = OISGAssContent.getRelatedOne("OrderItemShipGroup")> + <#assign orderShipments = OISGAssContent.getRelated("OrderShipment")> + <tr> + <input name="_rowSubmit_o_${rowCount}" value="Y" type="hidden"> + <input type="hidden" name="orderId_o_${rowCount}" value="${orderId}"/> + <input type="hidden" name="orderItemSeqId_o_${rowCount}" value="${orderItem.orderItemSeqId}"/> + <input type="hidden" name="shipGroupSeqId_o_${rowCount}" value="${OISG.shipGroupSeqId}"/> + <input type="hidden" name="rowCount_o_${rowCount}" value="${rowCount}"/> + <td colspan="2"> </td> + <td colspan="2"> + <div class="tabletext"> [${OISG.shipGroupSeqId}] <#if OISG.shipByDate?has_content>, ${uiLabelMap.OrderShipBeforeDate} : ${OISG.shipByDate?date}</#if></div> + <#if orderType == "SALES_ORDER"> + <#list orderShipments as orderShipment> + <div>${uiLabelMap.OrderPlannedInShipment} : </b><a target="facility" href="/facility/control/ViewShipment?shipmentId=${orderShipment.shipmentId!}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${orderShipment.shipmentId!}</a>:${orderShipment.shipmentItemSeqId!} - ${orderShipment.quantity!}</div> + </#list> + <#elseif orderType == "PURCHASE_ORDER"> + <#list orderShipments as orderShipment> + <#if orderShipment.quantity?has_content & orderShipment.quantity!=0.0 > + <div>${uiLabelMap.OrderPlannedInReceive} : </b><a target="facility" href="/facility/control/ViewReceiveShipment?shipmentId=${orderShipment.shipmentId!}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${orderShipment.shipmentId!}</a>:${orderShipment.shipmentItemSeqId!} - ${orderShipment.quantity!}</div> + <#else> + <#assign shipmentItem = orderShipment.getShipmentItem()> + <div>${uiLabelMap.OrderPlannedRejected} : </b><a target="facility" href="/facility/control/ViewReceiveShipment?shipmentId=${orderShipment.shipmentId!}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${orderShipment.shipmentId!}</a>:${orderShipment.shipmentItemSeqId!} - ${shipmentItem.quantity!}</div> + </#if> + </#list> + </#if> + </td> + <td class="tableList"> + <div id="displayQuantity${index}${rowCount}" class="tabletext">${OISGAssContent.quantity!}</div> + <#if (orderShipments.size()?default(0)) == 0> + <div id="editQuantity${index}${rowCount}" style="display: none;"><input id="edit${index}_o_${rowCount}" name="quantity_o_${rowCount}" size="5" value="${OISGAssContent.quantity!}" title="${OISGAssContent.quantity!}" class="inputBox"/></div> + <#else> + <div id="editQuantity${index}${rowCount}" style="display: none;">${OISGAssContent.quantity!}</div> + <input type="hidden" name="quantity_o_${rowCount}" value="${OISGAssContent.quantity!}"/> + </#if> + </td> + </tr> + <#assign rowCount = rowCount + 1> + </#list> + <input type="hidden" name="_rowCount" value="${rowCount}"/> + </form> + <#if !orderItem.statusId?exists || orderItem.statusId == "ITEM_CREATED" || orderItem.statusId == "ITEM_APPROVED" && (orderHeader.statusId != "ORDER_SENT" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED" && orderHeader.statusId != "ORDER_CANCELLED")> + <tr> + <form method="post" action="<@ofbizUrl>AddOrderItemShipGroupAssoc?view=OISGA</@ofbizUrl>" name="addOISGForm${index}"/> + <input type="hidden" name="editQuantity" value="edit"/> + <input type="hidden" name="editQuantityIndex" value="${index}"/> + <input type="hidden" name="orderId" value="${orderId}"/> + <input type="hidden" name="orderItemSeqId" value="${orderItem.orderItemSeqId}"/> + <input type="hidden" name="quantity" value="0"/> + <td colspan="3" class="tableList"> </td> + <td class="tableList"> + <table class="basic-table" cellspacing='0'> + <tr> + <td> + <div class="label">${uiLabelMap.OrderAddToshipGroup} : </div> + <div> + <select name="shipGroupSeqId" class="selectBox" onChange="showShipByDate(this, 'shipByDate${index}')"> + <#list shipGroups as shipGroup> + <option value="${shipGroup.shipGroupSeqId}">[${shipGroup.shipGroupSeqId}]<#if shipGroup.shipByDate?has_content>, ${shipGroup.shipByDate?date}</#if></option> + </#list> + <option value="new">${uiLabelMap.CommonNew}</option> + </select> + </div> + </td> + <td class="tableList"></td> + </tr> + <tr> + <td> + <div style="display:none" id="shipByDate${index}"> + <span class="tabletext">${uiLabelMap.OrderShipBeforeDate}</span> + <span class="view-calendar"><@htmlTemplate.renderDateTimeField name="shipByDate" event="" action="" value="${requestParameters.maxDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipByDate_${index}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/></span> + </div> + </td> + </tr> + <tr> + <td> + <span class="tabletext"> + <a href="javascript:document.addOISGForm${index}.submit()" class="smallSubmit">${uiLabelMap.CommonAdd}</a> + </span> + </td> + </tr> + </table> + </td> + </form> + </tr> + </#if> + </#if> + <#assign index = index + 1> + </#list> + </table> </div> - <div class="screenlet-body" id="ShipGroupScreenletBody_${shipGroup.shipGroupSeqId}"> - <form name="updateOrderItemShipGroup" method="post" action="<@ofbizUrl>updateOrderItemShipGroup</@ofbizUrl>"> + </div> +<#else> + <#list shipGroups as shipGroup> + <#assign shipmentMethodType = shipGroup.getRelatedOne("ShipmentMethodType", false)!> + <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress", false)!> + <div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="h3"> ${uiLabelMap.OrderShipmentInformation} - ${shipGroup.shipGroupSeqId}</li> + <li class="expanded"><a onclick="javascript:toggleScreenlet(this, 'ShipGroupScreenletBody_${shipGroup.shipGroupSeqId}', 'true', '${uiLabelMap.CommonExpand}', '${uiLabelMap.CommonCollapse}');" title="Collapse"> </a></li> + <li><a target="_BLANK" href="<@ofbizUrl>shipGroups.pdf?orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}</@ofbizUrl>">${uiLabelMap.OrderShipGroup} PDF</a></li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body" id="ShipGroupScreenletBody_${shipGroup.shipGroupSeqId}"> + <form name="updateOrderItemShipGroup" method="post" action="<@ofbizUrl>updateOrderItemShipGroup</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderId!}"/> <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId!}"/> <input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId!}"/> - <table class="basic-table" cellspacing='0'> - <tr> - <td align="right" valign="top" width="15%"> - <span class="label"> ${uiLabelMap.OrderAddress}</span> - </td> - <td width="5"> </td> - <td valign="top" width="80%"> - <div> - <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> - <select name="contactMechId"> + <table class="basic-table" cellspacing='0'> + <tr> + <td align="right" valign="top" width="15%"> + <span class="label"> ${uiLabelMap.OrderAddress}</span> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + <div> + <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> + <select name="contactMechId"> <option selected="selected" value="${shipGroup.contactMechId!}">${(shipGroupAddress.address1)?default("")} - ${shipGroupAddress.city?default("")}</option> - <#if shippingContactMechList?has_content> - <option disabled="disabled" value=""></option> - <#list shippingContactMechList as shippingContactMech> + <#if shippingContactMechList?has_content> + <option disabled="disabled" value=""></option> + <#list shippingContactMechList as shippingContactMech> <#assign shippingPostalAddress = shippingContactMech.getRelatedOne("PostalAddress", false)!> - <#if shippingContactMech.contactMechId?has_content> + <#if shippingContactMech.contactMechId?has_content> <option value="${shippingContactMech.contactMechId!}">${(shippingPostalAddress.address1)?default("")} - ${shippingPostalAddress.city?default("")}</option> - </#if> - </#list> - </#if> - </select> - <#else> - ${(shipGroupAddress.address1)?default("")} - </#if> - </div> - </td> - </tr> - - <#-- the setting of shipping method is only supported for sales orders at this time --> - <#if orderHeader.orderTypeId == "SALES_ORDER"> - <tr> - <td align="right" valign="top" width="15%"> - <span class="label"> <b>${uiLabelMap.CommonMethod}</b></span> - </td> - <td width="5"> </td> - <td valign="top" width="80%"> - <div> - <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> - <#-- passing the shipmentMethod value as the combination of three fields value - i.e shipmentMethodTypeId & carrierPartyId & roleTypeId. Values are separated by - "@" symbol. - --> - <select name="shipmentMethod"> - <#if shipGroup.shipmentMethodTypeId?has_content> + </#if> + </#list> + </#if> + </select> + <#else> + ${(shipGroupAddress.address1)?default("")} + </#if> + </div> + </td> + </tr> + + <#-- the setting of shipping method is only supported for sales orders at this time --> + <#if orderHeader.orderTypeId == "SALES_ORDER"> + <tr> + <td align="right" valign="top" width="15%"> + <span class="label"> <b>${uiLabelMap.CommonMethod}</b></span> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + <div> + <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> + <#-- passing the shipmentMethod value as the combination of three fields value + i.e shipmentMethodTypeId & carrierPartyId & roleTypeId. Values are separated by + "@" symbol. + --> + <select name="shipmentMethod"> + <#if shipGroup.shipmentMethodTypeId?has_content> <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId!}@${shipGroup.carrierRoleTypeId!}"><#if shipGroup.carrierPartyId?? && shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId!}</#if> ${shipmentMethodType.get("description",locale)!}</option> - </#if> - <#list productStoreShipmentMethList as productStoreShipmentMethod> - <#assign shipmentMethodTypeAndParty = productStoreShipmentMethod.shipmentMethodTypeId + "@" + productStoreShipmentMethod.partyId + "@" + productStoreShipmentMethod.roleTypeId> - <#if productStoreShipmentMethod.partyId?has_content || productStoreShipmentMethod?has_content> - <option value="${shipmentMethodTypeAndParty!}"><#if productStoreShipmentMethod.partyId != "_NA_">${productStoreShipmentMethod.partyId!}</#if> ${productStoreShipmentMethod.get("description",locale)?default("")}</option> </#if> - </#list> - </select> - <#else> - <#if (shipGroup.carrierPartyId)?default("_NA_") != "_NA_"> + <#list productStoreShipmentMethList as productStoreShipmentMethod> + <#assign shipmentMethodTypeAndParty = productStoreShipmentMethod.shipmentMethodTypeId + "@" + productStoreShipmentMethod.partyId + "@" + productStoreShipmentMethod.roleTypeId> + <#if productStoreShipmentMethod.partyId?has_content || productStoreShipmentMethod?has_content> + <option value="${shipmentMethodTypeAndParty!}"><#if productStoreShipmentMethod.partyId != "_NA_">${productStoreShipmentMethod.partyId!}</#if> ${productStoreShipmentMethod.get("description",locale)?default("")}</option> + </#if> + </#list> + </select> + <#else> + <#if (shipGroup.carrierPartyId)?default("_NA_") != "_NA_"> ${shipGroup.carrierPartyId!} - </#if> - <#if shipmentMethodType?has_content> - ${shipmentMethodType.get("description",locale)?default("")} - </#if> - </#if> - </div> - </td> + </#if> + <#if shipmentMethodType?has_content> + ${shipmentMethodType.get("description",locale)?default("")} + </#if> + </#if> + </div> + </td> + </tr> + </#if> + <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> + <tr> + <td align="right" valign="top" width="15%"> </td> + <td width="5"> </td> + <td valign="top" width="80%"> + <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/> + <a class="buttontext" id="newShippingAddress" href="javascript:void(0);">${uiLabelMap.OrderNewShippingAddress}</a> + <script type="text/javascript"> + jQuery("#newShippingAddress").click(function(){jQuery("#newShippingAddressForm").dialog("open")}); + </script> + </td> </tr> - </#if> - <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> - <tr> - <td align="right" valign="top" width="15%"> </td> - <td width="5"> </td> - <td valign="top" width="80%"> - <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/> - <a class="buttontext" id="newShippingAddress" href="javascript:void(0);">${uiLabelMap.OrderNewShippingAddress}</a> - <script type="text/javascript"> - jQuery("#newShippingAddress").click(function(){jQuery("#newShippingAddressForm").dialog("open")}); - </script> - </td> - </tr> - </#if> - <#if !shipGroup.contactMechId?has_content && !shipGroup.shipmentMethodTypeId?has_content> - <#assign noShipment = "true"> - <tr> - <td colspan="3" align="center">${uiLabelMap.OrderNotShipped}</td> - </tr> - </#if> - </table> - </form> - <div id="newShippingAddressForm" class="popup" style="display: none;"> - <form id="addShippingAddress" name="addShippingAddress" method="post" action="addShippingAddress"> + </#if> + <#if !shipGroup.contactMechId?has_content && !shipGroup.shipmentMethodTypeId?has_content> + <#assign noShipment = "true"> + <tr> + <td colspan="3" align="center">${uiLabelMap.OrderNotShipped}</td> + </tr> + </#if> + </table> + </form> + <div id="newShippingAddressForm" class="popup" style="display: none;"> + <form id="addShippingAddress" name="addShippingAddress" method="post" action="addShippingAddress"> <input type="hidden" name="orderId" value="${orderId!}"/> <input type="hidden" name="partyId" value="${partyId!}"/> <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId!}"/> <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId!}"/> - <input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> - <div class="form-row"> - <label for="address1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-address1" style="display: none" class="custom-advice">(required)</span></label> - <div class="form-field"><input type="text" class="required" name="shipToAddress1" id="address1" value="" size="30" maxlength="30" /></div> - </div> - <div class="form-row"> - <label for="address2">${uiLabelMap.PartyAddressLine2}</label> - <div class="form-field"><input type="text" name="shipToAddress2" id="address2" value="" size="30" maxlength="30" /></div> - </div> - <div class="form-row"> - <label for="city">${uiLabelMap.PartyCity}* <span id="advice-required-city" style="display: none" class="custom-advice">(required)</span></label> - <div class="form-field"><input type="text" class="required" name="shipToCity" id="city" value="" size="30" maxlength="30" /></div> - </div> - <div class="form-row"> - <label for="postalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-postalCode" style="display: none" class="custom-advice">(required)</span></label> - <div class="form-field"><input type="text" class="required number" name="shipToPostalCode" id="postalCode" value="" size="30" maxlength="10" /></div> - </div> - <div class="form-row"> - <label for="countryGeoId">${uiLabelMap.CommonCountry}* <span id="advice-required-countryGeoId" style="display: none" class="custom-advice">(required)</span></label> - <div class="form-field"> - <select name="shipToCountryGeoId" id="countryGeoId" class="required"> - <#if countryGeoId??> - <option value="${countryGeoId}">${countryGeoId}</option> - </#if> - ${screens.render("component://common/widget/CommonScreens.xml#countries")} - </select> + <input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> + <div class="form-row"> + <label for="address1">${uiLabelMap.PartyAddressLine1}* <span id="advice-required-address1" style="display: none" class="custom-advice">(required)</span></label> + <div class="form-field"><input type="text" class="required" name="shipToAddress1" id="address1" value="" size="30" maxlength="30" /></div> </div> - </div> - <div class="form-row"> - <label for="stateProvinceGeoId">${uiLabelMap.PartyState}* <span id="advice-required-stateProvinceGeoId" style="display: none" class="custom-advice">(required)</span></label> - <div class="form-field"> - <select name="shipToStateProvinceGeoId" id="stateProvinceGeoId"> - <#if stateProvinceGeoId?has_content> - <option value="${stateProvinceGeoId}">${stateProvinceGeoId}</option> - <#else> - <option value="_NA_">${uiLabelMap.PartyNoState}</option> - </#if> - </select> + <div class="form-row"> + <label for="address2">${uiLabelMap.PartyAddressLine2}</label> + <div class="form-field"><input type="text" name="shipToAddress2" id="address2" value="" size="30" maxlength="30" /></div> </div> - </div> - <div class="form-row"> - <input id="submitAddShippingAddress" type="button" value="${uiLabelMap.CommonSubmit}" style="display:none"/> - <form action=""> - <input class="popup_closebox buttontext" type="button" value="${uiLabelMap.CommonClose}" style="display:none"/> - </form> - </div> - </form> - </div> - <script language="JavaScript" type="text/javascript"> - jQuery(document).ready( function() { - jQuery("#newShippingAddressForm").dialog({autoOpen: false, modal: true, - buttons: { - '${uiLabelMap.CommonSubmit}': function() { - var addShippingAddress = jQuery("#addShippingAddress"); - jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(addShippingAddress); - addShippingAddress.submit(); - }, - '${uiLabelMap.CommonClose}': function() { - jQuery(this).dialog('close'); - } - } - }); - }); - </script> - <table width="100%" border="0" cellpadding="1" cellspacing="0"> - <#if shipGroup.supplierPartyId?has_content> - <tr><td colspan="3"><hr /></td></tr> - <tr> - <td align="right" valign="top" width="15%"> - <span class="label"> ${uiLabelMap.ProductDropShipment} - ${uiLabelMap.PartySupplier}</span> - </td> - <td width="5"> </td> - <td valign="top" width="80%"> - ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, shipGroup.supplierPartyId, false)!shipGroup.supplierPartyId} - </td> - </tr> - </#if> - - <#-- This section appears when Shipment of order is in picked status and its items are packed,this case comes when new shipping estimates based on weight of packages are more than or less than default percentage (defined in shipment.properties) of original shipping estimate--> - <#-- getShipGroupEstimate method of ShippingEvents class can be used for get shipping estimate from system, on the basis of new package's weight --> - <#if shippingRateList?has_content> - <#if orderReadHelper.getOrderTypeId() != "PURCHASE_ORDER"> - <tr><td colspan="3"><hr /></td></tr> + <div class="form-row"> + <label for="city">${uiLabelMap.PartyCity}* <span id="advice-required-city" style="display: none" class="custom-advice">(required)</span></label> + <div class="form-field"><input type="text" class="required" name="shipToCity" id="city" value="" size="30" maxlength="30" /></div> + </div> + <div class="form-row"> + <label for="postalCode">${uiLabelMap.PartyZipCode}* <span id="advice-required-postalCode" style="display: none" class="custom-advice">(required)</span></label> + <div class="form-field"><input type="text" class="required number" name="shipToPostalCode" id="postalCode" value="" size="30" maxlength="10" /></div> + </div> + <div class="form-row"> + <label for="countryGeoId">${uiLabelMap.CommonCountry}* <span id="advice-required-countryGeoId" style="display: none" class="custom-advice">(required)</span></label> + <div class="form-field"> + <select name="shipToCountryGeoId" id="countryGeoId" class="required"> + <#if countryGeoId??> + <option value="${countryGeoId}">${countryGeoId}</option> + </#if> + ${screens.render("component://common/widget/CommonScreens.xml#countries")} + </select> + </div> + </div> + <div class="form-row"> + <label for="stateProvinceGeoId">${uiLabelMap.PartyState}* <span id="advice-required-stateProvinceGeoId" style="display: none" class="custom-advice">(required)</span></label> + <div class="form-field"> + <select name="shipToStateProvinceGeoId" id="stateProvinceGeoId"> + <#if stateProvinceGeoId?has_content> + <option value="${stateProvinceGeoId}">${stateProvinceGeoId}</option> + <#else> + <option value="_NA_">${uiLabelMap.PartyNoState}</option> + </#if> + </select> + </div> + </div> + <div class="form-row"> + <input id="submitAddShippingAddress" type="button" value="${uiLabelMap.CommonSubmit}" style="display:none"/> + <form action=""> + <input class="popup_closebox buttontext" type="button" value="${uiLabelMap.CommonClose}" style="display:none"/> + </form> + </div> + </form> + </div> + <script language="JavaScript" type="text/javascript"> + jQuery(document).ready( function() { + jQuery("#newShippingAddressForm").dialog({autoOpen: false, modal: true, + buttons: { + '${uiLabelMap.CommonSubmit}': function() { + var addShippingAddress = jQuery("#addShippingAddress"); + jQuery("<p>${uiLabelMap.CommonUpdatingData}</p>").insertBefore(addShippingAddress); + addShippingAddress.submit(); + }, + '${uiLabelMap.CommonClose}': function() { + jQuery(this).dialog('close'); + } + } + }); + }); + </script> + <table width="100%" border="0" cellpadding="1" cellspacing="0"> + <#if shipGroup.supplierPartyId?has_content> + <tr><td colspan="3"><hr /></td></tr> + <#assign OISGAContent = shipGroup.getRelated("OrderItemShipGroupAssoc")> + <#if OISGAContent.size() == 0> + <tr> + <td colspan="3" valign="top" width="100%" align="center"> + <a href="javascript:document.deleteOISG_${shipGroup.shipGroupSeqId}.submit()" class="buttontext">${uiLabelMap.DeleteOrderItemShipGroup}</a> + <form name="deleteOISG_${shipGroup.shipGroupSeqId}" method="post" action="/ordermgr/control/DeleteOrderItemShipGroup"> + <input type="hidden" name="orderId" value="${orderId}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> + </form> + </td> + </tr> + </#if> <tr> - <td colspan="3"> - <table> - <tr> - <td> - <span class="label"> ${uiLabelMap.OrderOnlineUPSShippingEstimates}</span> - </td> - </tr> - <form name="UpdateShippingMethod" method="post" action="<@ofbizUrl>updateShippingMethodAndCharges</@ofbizUrl>"> - <#list shippingRateList as shippingRate> - <tr> - <td> - <#assign shipmentMethodAndAmount = shippingRate.shipmentMethodTypeId + "@" + "UPS" + "*" + shippingRate.rate> + <td align="right" valign="top" width="15%"> + <span class="label"> ${uiLabelMap.ProductDropShipment} - ${uiLabelMap.PartySupplier}</span> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + ${Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, shipGroup.supplierPartyId, false)!shipGroup.supplierPartyId} + </td> + </tr> + </#if> + + <#-- This section appears when Shipment of order is in picked status and its items are packed,this case comes when new shipping estimates based on weight of packages are more than or less than default percentage (defined in shipment.properties) of original shipping estimate--> + <#-- getShipGroupEstimate method of ShippingEvents class can be used for get shipping estimate from system, on the basis of new package's weight --> + <#if shippingRateList?has_content> + <#if orderReadHelper.getOrderTypeId() != "PURCHASE_ORDER"> + <tr><td colspan="3"><hr /></td></tr> + <tr> + <td colspan="3"> + <table> + <tr> + <td> + <span class="label"> ${uiLabelMap.OrderOnlineUPSShippingEstimates}</span> + </td> + </tr> + <form name="UpdateShippingMethod" method="post" action="<@ofbizUrl>updateShippingMethodAndCharges</@ofbizUrl>"> + <#list shippingRateList as shippingRate> + <tr> + <td> + <#assign shipmentMethodAndAmount = shippingRate.shipmentMethodTypeId + "@" + "UPS" + "*" + shippingRate.rate> <input type='radio' name='shipmentMethodAndAmount' value='${shipmentMethodAndAmount!}' /> UPS ${shippingRate.shipmentMethodDescription!} - <#if (shippingRate.rate > -1)> - <@ofbizCurrency amount=shippingRate.rate isoCode=orderReadHelper.getCurrency()/> - <#else> - ${uiLabelMap.OrderCalculatedOffline} - </#if> - </td> - </tr> - </#list> + <#if (shippingRate.rate > -1)> + <@ofbizCurrency amount=shippingRate.rate isoCode=orderReadHelper.getCurrency()/> + <#else> + ${uiLabelMap.OrderCalculatedOffline} + </#if> + </td> + </tr> + </#list> <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRouteSegmentId!}"/> <input type="hidden" name="shipmentId" value="${pickedShipmentId!}"/> <input type="hidden" name="orderAdjustmentId" value="${orderAdjustmentId!}"/> <input type="hidden" name="orderId" value="${orderId!}"/> <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId!}"/> - <input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> + <input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId!}"/> <input type="hidden" name="shippingAmount" value="${shippingAmount!}"/> - <tr> - <td valign="top" width="80%"> - <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/> - </td> - </tr> - </form> - </table> + <tr> + <td valign="top" width="80%"> + <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/> + </td> + </tr> + </form> + </table> + </td> + </tr> + </#if> + </#if> + + <#-- tracking number --> + <#if shipGroup.trackingNumber?has_content || orderShipmentInfoSummaryList?has_content> + <tr><td colspan="3"><hr /></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <span class="label"> ${uiLabelMap.OrderTrackingNumber}</span> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + <#-- TODO: add links to UPS/FEDEX/etc based on carrier partyId --> + <#if shipGroup.trackingNumber?has_content> + ${shipGroup.trackingNumber} + </#if> + <#if orderShipmentInfoSummaryList?has_content> + <#list orderShipmentInfoSummaryList as orderShipmentInfoSummary> + <#if orderShipmentInfoSummary.shipGroupSeqId! == shipGroup.shipGroupSeqId!> + <div> + <#if (orderShipmentInfoSummaryList?size > 1)>${orderShipmentInfoSummary.shipmentPackageSeqId}: </#if> + ${uiLabelMap.CommonIdCode}: ${orderShipmentInfoSummary.trackingCode?default("[${uiLabelMap.OrderNotYetKnown}]")} + <#if orderShipmentInfoSummary.boxNumber?has_content> ${uiLabelMap.ProductBox} #${orderShipmentInfoSummary.boxNumber}</#if> + <#if orderShipmentInfoSummary.carrierPartyId?has_content>(${uiLabelMap.ProductCarrier}: ${orderShipmentInfoSummary.carrierPartyId})</#if> + </div> + </#if> + </#list> + </#if> </td> </tr> </#if> - </#if> - - <#-- tracking number --> - <#if shipGroup.trackingNumber?has_content || orderShipmentInfoSummaryList?has_content> - <tr><td colspan="3"><hr /></td></tr> + <#if shipGroup.maySplit?has_content && noShipment?default("false") != "true"> + <tr><td colspan="3"><hr /></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <span class="label"> ${uiLabelMap.OrderSplittingPreference}</span> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + <div> + <#if shipGroup.maySplit?upper_case == "N"> + ${uiLabelMap.FacilityWaitEntireOrderReady} + <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)> + <#if orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED"> + <form name="allowordersplit_${shipGroup.shipGroupSeqId}" method="post" action="<@ofbizUrl>allowordersplit</@ofbizUrl>"> + <input type="hidden" name="orderId" value="${orderId}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> + </form> + <a href="javascript:document.allowordersplit_${shipGroup.shipGroupSeqId}.submit()" class="buttontext">${uiLabelMap.OrderAllowSplit}</a> + </#if> + </#if> + <#else> + ${uiLabelMap.FacilityShipAvailable} + </#if> + </div> + </td> + </tr> + </#if> + + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> - <span class="label"> ${uiLabelMap.OrderTrackingNumber}</span> + <span class="label"> ${uiLabelMap.OrderInstructions}</span> </td> <td width="5"> </td> - <td valign="top" width="80%"> - <#-- TODO: add links to UPS/FEDEX/etc based on carrier partyId --> - <#if shipGroup.trackingNumber?has_content> - ${shipGroup.trackingNumber} - </#if> - <#if orderShipmentInfoSummaryList?has_content> - <#list orderShipmentInfoSummaryList as orderShipmentInfoSummary> - <#if orderShipmentInfoSummary.shipGroupSeqId! == shipGroup.shipGroupSeqId!> - <div> - <#if (orderShipmentInfoSummaryList?size > 1)>${orderShipmentInfoSummary.shipmentPackageSeqId}: </#if> - ${uiLabelMap.CommonIdCode}: ${orderShipmentInfoSummary.trackingCode?default("[${uiLabelMap.OrderNotYetKnown}]")} - <#if orderShipmentInfoSummary.boxNumber?has_content> ${uiLabelMap.ProductBox} #${orderShipmentInfoSummary.boxNumber}</#if> - <#if orderShipmentInfoSummary.carrierPartyId?has_content>(${uiLabelMap.ProductCarrier}: ${orderShipmentInfoSummary.carrierPartyId})</#if> - </div> + <td align="left" valign="top" width="80%"> + <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))> + <form id="updateShippingInstructionsForm_${shipGroup.shipGroupSeqId}" name="updateShippingInstructionsForm" method="post" action="<@ofbizUrl>setShippingInstructions</@ofbizUrl>"> + <input type="hidden" name="orderId" value="${orderHeader.orderId}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> + <#if shipGroup.shippingInstructions?has_content> + <table> + <tr> + <td id="instruction"> + <label>${shipGroup.shippingInstructions}</label> + </td> + <td> + <a href="javascript:editInstruction('${shipGroup.shipGroupSeqId}');" class="buttontext" id="editInstruction_${shipGroup.shipGroupSeqId}">${uiLabelMap.CommonEdit}</a> + </td> + </tr> + </table> + <#else> + <a href="javascript:addInstruction('${shipGroup.shipGroupSeqId}');" class="buttontext" id="addInstruction_${shipGroup.shipGroupSeqId}">${uiLabelMap.CommonAdd}</a> </#if> - </#list> + <a href="javascript:saveInstruction('${shipGroup.shipGroupSeqId}');" class="buttontext" id="saveInstruction_${shipGroup.shipGroupSeqId}" style="display:none">${uiLabelMap.CommonSave}</a> + <textarea name="shippingInstructions" id="shippingInstructions_${shipGroup.shipGroupSeqId}" style="display:none" rows="0" cols="0">${shipGroup.shippingInstructions!}</textarea> + </form> + <#else> + <#if shipGroup.shippingInstructions?has_content> + <span>${shipGroup.shippingInstructions}</span> + <#else> + <span>${uiLabelMap.OrderThisOrderDoesNotHaveShippingInstructions}</span> + </#if> </#if> </td> </tr> - </#if> - <#if shipGroup.maySplit?has_content && noShipment?default("false") != "true"> + + <#if shipGroup.isGift?has_content && noShipment?default("false") != "true"> <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%"> - <span class="label"> ${uiLabelMap.OrderSplittingPreference}</span> + <span class="label"> ${uiLabelMap.OrderGiftMessage}</span> </td> <td width="5"> </td> - <td valign="top" width="80%"> - <div> - <#if shipGroup.maySplit?upper_case == "N"> - ${uiLabelMap.FacilityWaitEntireOrderReady} - <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)> - <#if orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED"> - <form name="allowordersplit_${shipGroup.shipGroupSeqId}" method="post" action="<@ofbizUrl>allowordersplit</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> - </form> - <a href="javascript:document.allowordersplit_${shipGroup.shipGroupSeqId}.submit()" class="buttontext">${uiLabelMap.OrderAllowSplit}</a> - </#if> - </#if> - <#else> - ${uiLabelMap.FacilityShipAvailable} - </#if> - </div> - </td> - </tr> - </#if> - - <tr><td colspan="7"><hr class="sepbar"/></td></tr> - <tr> - <td align="right" valign="top" width="15%"> - <span class="label"> ${uiLabelMap.OrderInstructions}</span> - </td> - <td width="5"> </td> - <td align="left" valign="top" width="80%"> - <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))> - <form id="updateShippingInstructionsForm_${shipGroup.shipGroupSeqId}" name="updateShippingInstructionsForm" method="post" action="<@ofbizUrl>setShippingInstructions</@ofbizUrl>"> + <td> + <form id="setGiftMessageForm_${shipGroup.shipGroupSeqId}" name="setGiftMessageForm" method="post" action="<@ofbizUrl>setGiftMessage</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderHeader.orderId}"/> <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> - <#if shipGroup.shippingInstructions?has_content> - <table> - <tr> - <td id="instruction"> - <label>${shipGroup.shippingInstructions}</label> - </td> - <td> - <a href="javascript:editInstruction('${shipGroup.shipGroupSeqId}');" class="buttontext" id="editInstruction_${shipGroup.shipGroupSeqId}">${uiLabelMap.CommonEdit}</a> - </td> - </tr> - </table> + <#if shipGroup.giftMessage?has_content> + <label>${shipGroup.giftMessage}</label> + <a href="javascript:editGiftMessage('${shipGroup.shipGroupSeqId}');" class="buttontext" id="editGiftMessage_${shipGroup.shipGroupSeqId}">${uiLabelMap.CommonEdit}</a> <#else> - <a href="javascript:addInstruction('${shipGroup.shipGroupSeqId}');" class="buttontext" id="addInstruction_${shipGroup.shipGroupSeqId}">${uiLabelMap.CommonAdd}</a> + <a href="javascript:addGiftMessage('${shipGroup.shipGroupSeqId}');" class="buttontext" id="addGiftMessage_${shipGroup.shipGroupSeqId}">${uiLabelMap.CommonAdd}</a> </#if> - <a href="javascript:saveInstruction('${shipGroup.shipGroupSeqId}');" class="buttontext" id="saveInstruction_${shipGroup.shipGroupSeqId}" style="display:none">${uiLabelMap.CommonSave}</a> - <textarea name="shippingInstructions" id="shippingInstructions_${shipGroup.shipGroupSeqId}" style="display:none" rows="0" cols="0">${shipGroup.shippingInstructions!}</textarea> + <textarea name="giftMessage" id="giftMessage_${shipGroup.shipGroupSeqId}" style="display:none" rows="0" cols="0">${shipGroup.giftMessage!}</textarea> + <a href="javascript:saveGiftMessage('${shipGroup.shipGroupSeqId}');" class="buttontext" id="saveGiftMessage_${shipGroup.shipGroupSeqId}" style="display:none">${uiLabelMap.CommonSave}</a> </form> - <#else> - <#if shipGroup.shippingInstructions?has_content> - <span>${shipGroup.shippingInstructions}</span> - <#else> - <span>${uiLabelMap.OrderThisOrderDoesNotHaveShippingInstructions}</span> - </#if> - </#if> </td> </tr> - - <#if shipGroup.isGift?has_content && noShipment?default("false") != "true"> - <tr><td colspan="3"><hr /></td></tr> - <tr> - <td align="right" valign="top" width="15%"> - <span class="label"> ${uiLabelMap.OrderGiftMessage}</span> - </td> - <td width="5"> </td> - <td> - <form id="setGiftMessageForm_${shipGroup.shipGroupSeqId}" name="setGiftMessageForm" method="post" action="<@ofbizUrl>setGiftMessage</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderHeader.orderId}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> - <#if shipGroup.giftMessage?has_content> - <label>${shipGroup.giftMessage}</label> - <a href="javascript:editGiftMessage('${shipGroup.shipGroupSeqId}');" class="buttontext" id="editGiftMessage_${shipGroup.shipGroupSeqId}">${uiLabelMap.CommonEdit}</a> - <#else> - <a href="javascript:addGiftMessage('${shipGroup.shipGroupSeqId}');" class="buttontext" id="addGiftMessage_${shipGroup.shipGroupSeqId}">${uiLabelMap.CommonAdd}</a> </#if> - <textarea name="giftMessage" id="giftMessage_${shipGroup.shipGroupSeqId}" style="display:none" rows="0" cols="0">${shipGroup.giftMessage!}</textarea> - <a href="javascript:saveGiftMessage('${shipGroup.shipGroupSeqId}');" class="buttontext" id="saveGiftMessage_${shipGroup.shipGroupSeqId}" style="display:none">${uiLabelMap.CommonSave}</a> - </form> - </td> - </tr> - </#if> - <tr><td colspan="3"><hr /></td></tr> - <tr> - <td align="right" valign="top" width="15%"> - <span class="label"> ${uiLabelMap.OrderShipAfterDate}</span><br/> - <span class="label"> ${uiLabelMap.OrderShipBeforeDate}</span> - </td> - <td width="5"> </td> - <td valign="top" width="80%"> - <form name="setShipGroupDates_${shipGroup.shipGroupSeqId}" method="post" action="<@ofbizUrl>updateOrderItemShipGroup</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderHeader.orderId}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> + <tr><td colspan="3"><hr /></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <span class="label"> ${uiLabelMap.OrderShipAfterDate}</span><br/> + <span class="label"> ${uiLabelMap.OrderShipBeforeDate}</span> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + <form name="setShipGroupDates_${shipGroup.shipGroupSeqId}" method="post" action="<@ofbizUrl>updateOrderItemShipGroup</@ofbizUrl>"> + <input type="hidden" name="orderId" value="${orderHeader.orderId}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> <@htmlTemplate.renderDateTimeField name="shipAfterDate" event="" action="" value="${shipGroup.shipAfterDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipAfterDate_${shipGroup.shipGroupSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> - <br/> + <br/> <@htmlTemplate.renderDateTimeField name="shipByDate" event="" action="" value="${shipGroup.shipByDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="shipByDate_${shipGroup.shipGroupSeqId}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> - <input type="submit" value="${uiLabelMap.CommonUpdate}"/> - </form> - </td> - </tr> - <#assign shipGroupShipments = shipGroup.getRelated("PrimaryShipment", null, null, false)> - <#if shipGroupShipments?has_content> - <tr><td colspan="3"><hr /></td></tr> - <tr> - <td align="right" valign="top" width="15%"> - <span class="label"> ${uiLabelMap.FacilityShipments}</span> - </td> - <td width="5"> </td> - <td valign="top" width="80%"> - <#list shipGroupShipments as shipment> - <div> - ${uiLabelMap.CommonNbr}<a href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${shipment.shipmentId}</a> - <a target="_BLANK" href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.ProductPackingSlip}</a> - <#if "SALES_ORDER" == orderHeader.orderTypeId && "ORDER_COMPLETED" == orderHeader.statusId> - <#assign shipmentRouteSegments = delegator.findByAnd("ShipmentRouteSegment", {"shipmentId" : shipment.shipmentId}, null, false)> - <#if shipmentRouteSegments?has_content> - <#assign shipmentRouteSegment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentRouteSegments)> + <input type="submit" value="${uiLabelMap.CommonUpdate}"/> + </form> + </td> + </tr> + <#assign shipGroupShipments = shipGroup.getRelated("PrimaryShipment", null, null, false)> + <#if shipGroupShipments?has_content> + <tr><td colspan="3"><hr /></td></tr> + <tr> + <td align="right" valign="top" width="15%"> + <span class="label"> ${uiLabelMap.FacilityShipments}</span> + </td> + <td width="5"> </td> + <td valign="top" width="80%"> + <#list shipGroupShipments as shipment> + <div> + ${uiLabelMap.CommonNbr}<a href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${shipment.shipmentId}</a> + <a target="_BLANK" href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.ProductPackingSlip}</a> + <#if "SALES_ORDER" == orderHeader.orderTypeId && "ORDER_COMPLETED" == orderHeader.statusId> + <#assign shipmentRouteSegments = delegator.findByAnd("ShipmentRouteSegment", {"shipmentId" : shipment.shipmentId}, null, false)> + <#if shipmentRouteSegments?has_content> + <#assign shipmentRouteSegment = Static["org.ofbiz.entity.util.EntityUtil"].getFirst(shipmentRouteSegments)> <#if "UPS" == (shipmentRouteSegment.carrierPartyId)!> - <a href="javascript:document.upsEmailReturnLabel${shipment_index}.submit();" class="buttontext">${uiLabelMap.ProductEmailReturnShippingLabelUPS}</a> + <a href="javascript:document.upsEmailReturnLabel${shipment_index}.submit();" class="buttontext">${uiLabelMap.ProductEmailReturnShippingLabelUPS}</a> + </#if> + <form name="upsEmailReturnLabel${shipment_index}" method="post" action="<@ofbizUrl>upsEmailReturnLabelOrder</@ofbizUrl>"> + <input type="hidden" name="orderId" value="${orderId}"/> + <input type="hidden" name="shipmentId" value="${shipment.shipmentId}"/> + <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRouteSegment.shipmentRouteSegmentId}" /> + </form> </#if> - <form name="upsEmailReturnLabel${shipment_index}" method="post" action="<@ofbizUrl>upsEmailReturnLabelOrder</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId}"/> - <input type="hidden" name="shipmentId" value="${shipment.shipmentId}"/> - <input type="hidden" name="shipmentRouteSegmentId" value="${shipmentRouteSegment.shipmentRouteSegmentId}" /> - </form> </#if> - </#if> - </div> - </#list> - </td> - </tr> - </#if> - - <#-- shipment actions --> - <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && ((orderHeader.statusId == "ORDER_CREATED") || (orderHeader.statusId == "ORDER_APPROVED") || (orderHeader.statusId == "ORDER_SENT"))> - - - <#-- Manual shipment options --> - <tr><td colspan="3"><hr /></td></tr> - <tr> - <td colspan="3" valign="top" width="100%" align="center"> - <#if orderHeader.orderTypeId == "SALES_ORDER"> - <#if !shipGroup.supplierPartyId?has_content> - <#if orderHeader.statusId == "ORDER_APPROVED"> + </div> + </#list> + </td> + </tr> + </#if> + + <#-- shipment actions --> + <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && ((orderHeader.statusId == "ORDER_CREATED") || (orderHeader.statusId == "ORDER_APPROVED") || (orderHeader.statusId == "ORDER_SENT"))> + + + <#-- Manual shipment options --> + <tr><td colspan="3"><hr /></td></tr> + <tr> + <td colspan="3" valign="top" width="100%" align="center"> + <#if orderHeader.orderTypeId == "SALES_ORDER"> + <#if !shipGroup.supplierPartyId?has_content> + <#if orderHeader.statusId == "ORDER_APPROVED"> <a href="/facility/control/PackOrder?facilityId=${storeFacilityId!}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup}</a> - <br /> - </#if> - <a href="javascript:document.createShipment_${shipGroup.shipGroupSeqId}.submit()" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup}</a> - <form name="createShipment_${shipGroup.shipGroupSeqId}" method="post" action="/facility/control/createShipment"> - <input type="hidden" name="primaryOrderId" value="${orderId}"/> - <input type="hidden" name="primaryShipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> - <input type="hidden" name="statusId" value="SHIPMENT_INPUT" /> + <br /> + </#if> + <a href="javascript:document.createShipment_${shipGroup.shipGroupSeqId}.submit()" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup}</a> + <form name="createShipment_${shipGroup.shipGroupSeqId}" method="post" action="/facility/control/createShipment"> + <input type="hidden" name="primaryOrderId" value="${orderId}"/> + <input type="hidden" name="primaryShipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> + <input type="hidden" name="statusId" value="SHIPMENT_INPUT" /> <input type="hidden" name="facilityId" value="${storeFacilityId!}" /> <input type="hidden" name="estimatedShipDate" value="${shipGroup.shipByDate!}"/> - </form> - </#if> - <#else> - <#assign facilities = facilitiesForShipGroup.get(shipGroup.shipGroupSeqId)> - <#if facilities?has_content> - <div> - <form name="createShipment2_${shipGroup.shipGroupSeqId}" method="post" action="/facility/control/createShipment"> - <input type="hidden" name="primaryOrderId" value="${orderId}"/> - <input type="hidden" name="primaryShipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> - <input type="hidden" name="shipmentTypeId" value="PURCHASE_SHIPMENT"/> - <input type="hidden" name="statusId" value="PURCH_SHIP_CREATED"/> - <input type="hidden" name="externalLoginKey" value="${externalLoginKey}"/> + </form> + </#if> + <#else> + <#assign facilities = facilitiesForShipGroup.get(shipGroup.shipGroupSeqId)> + <#if facilities?has_content> + <div> + <form name="createShipment2_${shipGroup.shipGroupSeqId}" method="post" action="/facility/control/createShipment"> + <input type="hidden" name="primaryOrderId" value="${orderId}"/> + <input type="hidden" name="primaryShipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> + <input type="hidden" name="shipmentTypeId" value="PURCHASE_SHIPMENT"/> + <input type="hidden" name="statusId" value="PURCH_SHIP_CREATED"/> + <input type="hidden" name="externalLoginKey" value="${externalLoginKey}"/> <input type="hidden" name="estimatedShipDate" value="${shipGroup.estimatedShipDate!}"/> <input type="hidden" name="estimatedArrivalDate" value="${shipGroup.estimatedDeliveryDate!}"/> - <select name="destinationFacilityId"> - <#list facilities as facility> - <option value="${facility.facilityId}">${facility.facilityName}</option> - </#list> - </select> - <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderNewShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]"/> - </form> - </div> - <#else> - <a href="javascript:document.quickDropShipOrder_${shipGroup_index}.submit();" class="buttontext">${uiLabelMap.ProductShipmentQuickComplete}</a> - <a href="javascript:document.createShipment3_${shipGroup.shipGroupSeqId}.submit();" class="buttontext">${uiLabelMap.OrderNewDropShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a> - <form name="quickDropShipOrder_${shipGroup_index}" method="post" action="<@ofbizUrl>quickDropShipOrder</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId}"/> - <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> - <input type="hidden" name="externalLoginKey" value="${externalLoginKey}" /> - </form> - <form name="createShipment3_${shipGroup.shipGroupSeqId}" method="post" action="/facility/control/createShipment"> - <input type="hidden" name="primaryOrderId" value="${orderId}"/> - <input type="hidden" name="primaryShipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> - <input type="hidden" name="shipmentTypeId" value="DROP_SHIPMENT" /> - <input type="hidden" name="statusId" value="PURCH_SHIP_CREATED" /> - <input type="hidden" name="externalLoginKey" value="${externalLoginKey}" /> - </form> + <select name="destinationFacilityId"> + <#list facilities as facility> + <option value="${facility.facilityId}">${facility.facilityName}</option> + </#list> + </select> + <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderNewShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]"/> + </form> + </div> + <#else> + <a href="javascript:document.quickDropShipOrder_${shipGroup_index}.submit();" class="buttontext">${uiLabelMap.ProductShipmentQuickComplete}</a> + <a href="javascript:document.createShipment3_${shipGroup.shipGroupSeqId}.submit();" class="buttontext">${uiLabelMap.OrderNewDropShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a> + <form name="quickDropShipOrder_${shipGroup_index}" method="post" action="<@ofbizUrl>quickDropShipOrder</@ofbizUrl>"> + <input type="hidden" name="orderId" value="${orderId}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> + <input type="hidden" name="externalLoginKey" value="${externalLoginKey}" /> + </form> + <form name="createShipment3_${shipGroup.shipGroupSeqId}" method="post" action="/facility/control/createShipment"> + <input type="hidden" name="primaryOrderId" value="${orderId}"/> + <input type="hidden" name="primaryShipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> + <input type="hidden" name="shipmentTypeId" value="DROP_SHIPMENT" /> + <input type="hidden" name="statusId" value="PURCH_SHIP_CREATED" /> + <input type="hidden" name="externalLoginKey" value="${externalLoginKey}" /> + </form> + </#if> </#if> - </#if> - </td> - </tr> - - </#if> - - </table> + </td> + </tr> + </#if> + </table> + </div> </div> -</div> -</#list> + </#list> + </#if> </#if> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/src/org/ofbiz/party/party/PartyServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/src/org/ofbiz/party/party/PartyServices.java?rev=1643778&r1=1643777&r2=1643778&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/src/org/ofbiz/party/party/PartyServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/src/org/ofbiz/party/party/PartyServices.java Mon Dec 8 10:21:56 2014 @@ -1472,6 +1472,7 @@ public class PartyServices { // using list iterator EntityListIterator pli = EntityQuery.use(delegator).select(UtilMisc.toSet(fieldsToSelect)) .from(dynamicView) + .where(mainCond) .orderBy(orderBy) .cursorScrollInsensitive() .fetchSize(highIndex) Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/static/PartyProfileContent.js URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/static/PartyProfileContent.js?rev=1643778&r1=1643777&r2=1643778&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/static/PartyProfileContent.js (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/static/PartyProfileContent.js Mon Dec 8 10:21:56 2014 @@ -94,6 +94,7 @@ function getUploadProgressStatus(event){ var timerId = timerId; jQuery.ajax({ url: 'getFileUploadProgressStatus', + dataType: 'json', success: function(data) { if (data._ERROR_MESSAGE_LIST_ != undefined) { jQuery('#content-messages').html(data._ERROR_MESSAGE_LIST_); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml?rev=1643778&r1=1643777&r2=1643778&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml Mon Dec 8 10:21:56 2014 @@ -924,6 +924,7 @@ under the License. <target name="get-tenant-data"> <input addproperty="tenantId" message="Enter Id for the tenant: "/> <input addproperty="tenantName" message="Enter name for tenant: "/> + <input addproperty="domainName" message="Enter domain name for tenant (Optional): "/> <input addproperty="data-readers" message="Enter data to install. Choices are e.g. seed,seed-initial,ext,demo. Multipe datasets must be separated with a comma: "/> @@ -955,6 +956,7 @@ under the License. <filterset> <filter token="tenantId" value="${tenantId}"/> <filter token="tenantName" value="${tenantName}"/> + <filter token="domainName" value="${domainName}"/> </filterset> </copy> <antcall target="load-file"> @@ -975,6 +977,7 @@ under the License. <filterset> <filter token="tenantId" value="${tenantId}"/> <filter token="tenantName" value="${tenantName}"/> + <filter token="domainName" value="${domainName}"/> <filter token="db-IP" value="${db-IP}"/> <filter token="db-User" value="${db-User}"/> <filter token="db-Password" value="${db-Password}"/> @@ -998,6 +1001,7 @@ under the License. <filterset> <filter token="tenantId" value="${tenantId}"/> <filter token="tenantName" value="${tenantName}"/> + <filter token="domainName" value="${domainName}"/> <filter token="db-IP" value="${db-IP}"/> <filter token="db-User" value="${db-User}"/> <filter token="db-Password" value="${db-Password}"/> @@ -1021,6 +1025,7 @@ under the License. <filterset> <filter token="tenantId" value="${tenantId}"/> <filter token="tenantName" value="${tenantName}"/> + <filter token="domainName" value="${domainName}"/> <filter token="db-IP" value="${db-IP}"/> <filter token="db-User" value="${db-User}"/> <filter token="db-Password" value="${db-Password}"/> @@ -1041,6 +1046,7 @@ under the License. <echo>------------------------------------</echo> <echo message="tenantId = ${tenantId}"/> <echo>tenantName = ${tenantName}</echo> + <echo>domainName = ${domainName}</echo> <echo>db-Platform = ${db-Platform}</echo> <echo>db-IP = ${db-IP}</echo> <echo>db-User = ${db-User}</echo> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java?rev=1643778&r1=1643777&r2=1643778&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java Mon Dec 8 10:21:56 2014 @@ -180,7 +180,7 @@ public class FreeMarkerWorker { * @param useCache try to get template from cache */ public static void renderTemplate(String templateLocation, String templateString, Map<String, Object> context, Appendable outWriter, boolean useCache) throws TemplateException, IOException { - if (UtilValidate.isEmpty(templateString)) { + if (templateString == null) { renderTemplate(templateLocation, context, outWriter); } else { renderTemplateFromString(templateString, templateLocation, context, outWriter, useCache); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml?rev=1643778&r1=1643777&r2=1643778&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/catalina/ofbiz-component.xml Mon Dec 8 10:21:56 2014 @@ -68,6 +68,7 @@ under the License. </property> <property name="ajp-connector" value="connector"> <!-- see http://tomcat.apache.org/tomcat-7.0-doc/config/ajp.html for reference --> + <!--<property name="address" value=""/>--> <property name="port" value="8009"/> <property name="protocol" value="AJP/1.3"/> <property name="scheme" value="http"/> @@ -96,6 +97,7 @@ under the License. </property> <property name="http-connector" value="connector"> <!-- see http://tomcat.apache.org/tomcat-7.0-doc/config/http.html for reference --> + <!--<property name="address" value=""/>--> <property name="port" value="8080"/> <property name="protocol" value="HTTP/1.1"/> <property name="scheme" value="http"/> @@ -124,6 +126,7 @@ under the License. </property> <property name="https-connector" value="connector"> <!-- see http://tomcat.apache.org/tomcat-7.0-doc/config/http.html for reference --> + <!--<property name="address" value=""/>--> <property name="port" value="8443"/> <property name="protocol" value="HTTP/1.1"/> <property name="scheme" value="https"/> @@ -171,6 +174,7 @@ under the License. <property name="enable-request-dump" value="false"/> </property> <property name="ajp-connector" value="connector"> + <!--<property name="address" value=""/>--> <property name="port" value="8010"/> <property name="protocol" value="AJP/1.3"/> <property name="scheme" value="http"/> @@ -179,6 +183,7 @@ under the License. <property name="xpoweredBy" value="true"/> </property> <property name="http-connector" value="connector"> + <!--<property name="address" value=""/>--> <property name="port" value="8080"/> <property name="protocol" value="HTTP/1.1"/> <property name="scheme" value="http"/> @@ -189,6 +194,7 @@ under the License. <property name="compressableMimeType" value="text/html,text/xml,text/plain,text/javascript,text/css"/> </property> <property name="https-connector" value="connector"> + <!--<property name="address" value=""/>--> <property name="port" value="8443"/> <property name="protocol" value="HTTP/1.1"/> <property name="scheme" value="https"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |