svn commit: r490004 - in /incubator/ofbiz/trunk/applica
Locked
 
|
Author: jacopoc
Date: Sun Dec 24 00:39:27 2006 New Revision: 490004 URL: http://svn.apache.org/viewvc?view=rev&rev=490004 Log: A bunch of fixes for html validation for the order edit screen; no functional changes. Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl?view=diff&rev=490004&r1=490003&r2=490004 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl Sun Dec 24 00:39:27 2006 @@ -54,7 +54,6 @@ <span class="tabletext"> ${uiLabelMap.OrderOverridePrice}</span> </td> <tr> - <tr> <td align="right"><div class="tableheadtext">${uiLabelMap.OrderQuantity} :</div></td> <td><input type="text" class="inputBox" size="6" name="quantity" value="${requestParameters.quantity?default("1")}"/></td> </tr> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?view=diff&rev=490004&r1=490003&r2=490004 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Sun Dec 24 00:39:27 2006 @@ -28,248 +28,260 @@ <div class="boxhead"> ${uiLabelMap.OrderOrderItems}</div> </div> <div class="screenlet-body"> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr align="left" valign=bottom> - <td width="30%" align="left"><div class="tableheadtext">${uiLabelMap.ProductProduct}</div></td> - <td width="30%" align="left"><div class="tableheadtext">${uiLabelMap.CommonStatus}</div></td> - <td width="5%" align="right"><div class="tableheadtext">${uiLabelMap.OrderQuantity}</div></td> - <td width="10%" align="right"><div class="tableheadtext">${uiLabelMap.OrderUnitPrice}</div></td> - <td width="10%" align="right"><div class="tableheadtext">${uiLabelMap.OrderAdjustments}</div></td> - <td width="10%" align="right"><div class="tableheadtext">${uiLabelMap.OrderSubTotal}</div></td> - <td width="5%"> </td> - </tr> - <#if !orderItemList?has_content> - <tr><td><font color="red">${uiLabelMap.checkhelper_sales_order_lines_lookup_failed}</font></td></tr> - <#else> - <form name="updateItemInfo" method="post" action="<@ofbizUrl>updateOrderItems?${paramString}</@ofbizUrl>"/> - <#list orderItemList as orderItem> - <#assign orderItemContentWrapper = Static["org.ofbiz.order.order.OrderContentWrapper"].makeOrderContentWrapper(orderItem, request)> - <tr><td colspan="8"><hr class="sepbar"></td></tr> - <tr> - <#assign orderItemType = orderItem.getRelatedOne("OrderItemType")?if_exists> - <#assign productId = orderItem.productId?if_exists> - <#if productId?exists && productId == "shoppingcart.CommentLine"> - <td colspan="1" valign="top"> - <b><div class="tabletext"> >> ${orderItem.itemDescription}</div></b> - </td> - <#else> - <td valign="top"> - <div class="tabletext"> - <#if orderHeader.statusId = "ORDER_CANCELLED" || orderHeader.statusId = "ORDER_COMPLETED"> - <#if productId?exists> - ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?if_exists} - <#elseif orderItemType?exists> - ${orderItemType.description} - ${orderItem.itemDescription?if_exists} - <#else> - ${orderItem.itemDescription?if_exists} - </#if> - <#else> + <#if !orderItemList?has_content> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr><td><font color="red">${uiLabelMap.checkhelper_sales_order_lines_lookup_failed}</font></td></tr> + </table> + <#else> + <form name="updateItemInfo" method="post" action="<@ofbizUrl>updateOrderItems?${paramString}</@ofbizUrl>"> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr align="left" valign=bottom> + <td width="30%" align="left"><div class="tableheadtext">${uiLabelMap.ProductProduct}</div></td> + <td width="30%" align="left"><div class="tableheadtext">${uiLabelMap.CommonStatus}</div></td> + <td width="5%" align="right"><div class="tableheadtext">${uiLabelMap.OrderQuantity}</div></td> + <td width="10%" align="right"><div class="tableheadtext">${uiLabelMap.OrderUnitPrice}</div></td> + <td width="10%" align="right"><div class="tableheadtext">${uiLabelMap.OrderAdjustments}</div></td> + <td width="10%" align="right"><div class="tableheadtext">${uiLabelMap.OrderSubTotal}</div></td> + <td width="5%"> </td> + </tr> + <#list orderItemList as orderItem> + <#assign orderItemContentWrapper = Static["org.ofbiz.order.order.OrderContentWrapper"].makeOrderContentWrapper(orderItem, request)> + <tr><td colspan="8"><hr class="sepbar"/></td></tr> + <tr> + <#assign orderItemType = orderItem.getRelatedOne("OrderItemType")?if_exists> + <#assign productId = orderItem.productId?if_exists> + <#if productId?exists && productId == "shoppingcart.CommentLine"> + <td colspan="1" valign="top"> + <b><div class="tabletext"> >> ${orderItem.itemDescription}</div></b> + </td> + <#else> + <td valign="top"> + <div class="tabletext"> + <#if orderHeader.statusId = "ORDER_CANCELLED" || orderHeader.statusId = "ORDER_COMPLETED"> + <#if productId?exists> + ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?if_exists} + <#elseif orderItemType?exists> + ${orderItemType.description} - ${orderItem.itemDescription?if_exists} + <#else> + ${orderItem.itemDescription?if_exists} + </#if> + <#else> + <#if productId?exists> + <#assign orderItemName = orderItem.productId?default("N/A")/> + <#elseif orderItemType?exists> + <#assign orderItemName = orderItemType.description/> + </#if> + <p>${uiLabelMap.ProductProduct}: ${orderItemName}</p> + ${uiLabelMap.CommonDescription}:<br /> + <input style="textBox" type="text" size="20" name="idm_${orderItem.orderItemSeqId}" value="${orderItem.itemDescription?if_exists}"/> + </#if> + </div> <#if productId?exists> - <#assign orderItemName = orderItem.productId?default("N/A")/> - <#elseif orderItemType?exists> - <#assign orderItemName = orderItemType.description/> - </#if> - <p>${uiLabelMap.ProductProduct}: ${orderItemName}</p> - ${uiLabelMap.CommonDescription}:<br /> - <input style="textBox" type="text" size="20" name="idm_${orderItem.orderItemSeqId}" value="${orderItem.itemDescription?if_exists}"/> - </#if> - </div> - <#if productId?exists> - <div class="tabletext"> - <a href="/catalog/control/EditProduct?productId=${productId}" class="buttontext" target="_blank">${uiLabelMap.ProductCatalog}</a> - <a href="/ecommerce/control/product?product_id=${productId}" class="buttontext" target="_blank">${uiLabelMap.EcommerceEcommerce}</a> - <#if orderItemContentWrapper.get("IMAGE_URL")?has_content> - <a href="<@ofbizUrl>viewimage?orderId=${orderId}&orderItemSeqId=${orderItem.orderItemSeqId}&orderContentTypeId=IMAGE_URL</@ofbizUrl>" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a> + <div class="tabletext"> + <a href="/catalog/control/EditProduct?productId=${productId}" class="buttontext" target="_blank">${uiLabelMap.ProductCatalog}</a> + <a href="/ecommerce/control/product?product_id=${productId}" class="buttontext" target="_blank">${uiLabelMap.EcommerceEcommerce}</a> + <#if orderItemContentWrapper.get("IMAGE_URL")?has_content> + <a href="<@ofbizUrl>viewimage?orderId=${orderId}&orderItemSeqId=${orderItem.orderItemSeqId}&orderContentTypeId=IMAGE_URL</@ofbizUrl>" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a> + </#if> + </div> </#if> - </div> - </#if> - </td> - - <#-- now show status details per line item --> - <#assign currentItemStatus = orderItem.getRelatedOne("StatusItem")> - <td align="left" colspan="1"> - <div class="tabletext">${uiLabelMap.CommonCurrent}: ${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}</div> - <#assign orderItemStatuses = orderReadHelper.getOrderItemStatuses(orderItem)> - <#list orderItemStatuses as orderItemStatus> - <#assign loopStatusItem = orderItemStatus.getRelatedOne("StatusItem")> - <div class="tabletext"> - ${orderItemStatus.statusDatetime.toString()} : ${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)} - </div> - </#list> - <#assign returns = orderItem.getRelated("ReturnItem")?if_exists> - <#if returns?has_content> - <#list returns as returnItem> + </td> + + <#-- now show status details per line item --> + <#assign currentItemStatus = orderItem.getRelatedOne("StatusItem")> + <td align="left" colspan="1"> + <div class="tabletext">${uiLabelMap.CommonCurrent}: ${currentItemStatus.get("description",locale)?default(currentItemStatus.statusId)}</div> + <#assign orderItemStatuses = orderReadHelper.getOrderItemStatuses(orderItem)> + <#list orderItemStatuses as orderItemStatus> + <#assign loopStatusItem = orderItemStatus.getRelatedOne("StatusItem")> + <div class="tabletext"> + ${orderItemStatus.statusDatetime.toString()} : ${loopStatusItem.get("description",locale)?default(orderItemStatus.statusId)} + </div> + </#list> + <#assign returns = orderItem.getRelated("ReturnItem")?if_exists> + <#if returns?has_content> + <#list returns as returnItem> <#assign returnHeader = returnItem.getRelatedOne("ReturnHeader")> <#if returnHeader.statusId != "RETURN_CANCELLED"> - <div class="tabletext"> + <div class="tabletext"> <font color="red"><b>${uiLabelMap.OrderReturned}</b></font> #<a href="<@ofbizUrl>returnMain?returnId=${returnItem.returnId}</@ofbizUrl>" class="buttontext">${returnItem.returnId}</a> - </div> + </div> </#if> - </#list> - </#if> - </td> - <td align="right" valign="top" nowrap> - <#assign remainingQuantity = (orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0))> - <div class="tabletext">${uiLabelMap.OrderOrdered}: ${orderItem.quantity?default(0)?string.number} </div> - <div class="tabletext">${uiLabelMap.OrderCancelled}: ${orderItem.cancelQuantity?default(0)?string.number} </div> - <div class="tabletext">${uiLabelMap.OrderRemaining}: ${remainingQuantity} </div> - </td> - <td align="right" valign="top" nowrap> - <div class="tabletext" nowrap> - <input style="textBox" type="text" size="8" name="ipm_${orderItem.orderItemSeqId}" value="<@ofbizAmount amount=orderItem.unitPrice/>"/> - <input type="checkbox" name="opm_${orderItem.orderItemSeqId}" value="Y"/> - </div> - </td> - <td align="right" valign="top" nowrap> - <div class="tabletext" nowrap><@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentsTotal(orderItem, orderAdjustments, true, false, false) isoCode=currencyUomId/></div> - </td> - <td align="right" valign="top" nowrap> - <#if orderItem.statusId != "ITEM_CANCELLED"> - <div class="tabletext" nowrap><@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemSubTotal(orderItem, orderAdjustments) isoCode=currencyUomId/></div> - <#else> - <div class="tabletext" nowrap><@ofbizCurrency amount=0.00 isoCode=currencyUomId/></div> - </#if> - </td> - <td> </td> - <td align="right" valign="top" nowrap> - <#if (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED") || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && orderHeader.statusId != "ORDER_SENT")> - <div class="tabletext"><a href="<@ofbizUrl>cancelOrderItem?orderItemSeqId=${orderItem.orderItemSeqId}&${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancelAll}</a></div> - <#else> - + </#list> + </#if> + </td> + <td align="right" valign="top" nowrap> + <#assign remainingQuantity = (orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0))> + <div class="tabletext">${uiLabelMap.OrderOrdered}: ${orderItem.quantity?default(0)?string.number} </div> + <div class="tabletext">${uiLabelMap.OrderCancelled}: ${orderItem.cancelQuantity?default(0)?string.number} </div> + <div class="tabletext">${uiLabelMap.OrderRemaining}: ${remainingQuantity} </div> + </td> + <td align="right" valign="top" nowrap> + <div class="tabletext"> + <input style="textBox" type="text" size="8" name="ipm_${orderItem.orderItemSeqId}" value="<@ofbizAmount amount=orderItem.unitPrice/>"/> + <input type="checkbox" name="opm_${orderItem.orderItemSeqId}" value="Y"/> + </div> + </td> + <td align="right" valign="top" nowrap> + <div class="tabletext"><@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentsTotal(orderItem, orderAdjustments, true, false, false) isoCode=currencyUomId/></div> + </td> + <td align="right" valign="top" nowrap> + <#if orderItem.statusId != "ITEM_CANCELLED"> + <div class="tabletext"><@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemSubTotal(orderItem, orderAdjustments) isoCode=currencyUomId/></div> + <#else> + <div class="tabletext"><@ofbizCurrency amount=0.00 isoCode=currencyUomId/></div> + </#if> + </td> + <td> </td> + <td align="right" valign="top" nowrap> + <#if (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED") || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && orderHeader.statusId != "ORDER_SENT")> + <div class="tabletext"><a href="<@ofbizUrl>cancelOrderItem?orderItemSeqId=${orderItem.orderItemSeqId}&${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancelAll}</a></div> + <#else> + + </#if> + </td> </#if> - </td> - </#if> - </tr> - - <#-- now show adjustment details per line item --> - <#assign orderItemAdjustments = Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentList(orderItem, orderAdjustments)> - <#if orderItemAdjustments?exists && orderItemAdjustments?has_content> + </tr> + + <#-- now show adjustment details per line item --> + <#assign orderItemAdjustments = Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentList(orderItem, orderAdjustments)> + <#if orderItemAdjustments?exists && orderItemAdjustments?has_content> <#list orderItemAdjustments as orderItemAdjustment> - <#assign adjustmentType = orderItemAdjustment.getRelatedOneCache("OrderAdjustmentType")> - <tr> + <#assign adjustmentType = orderItemAdjustment.getRelatedOneCache("OrderAdjustmentType")> + <tr> <td align="right" colspan="2"> - <div class="tabletext" style="font-size: xx-small;"> - <b><i>${uiLabelMap.OrderAdjustment}</i>:</b> <b>${adjustmentType.get("description",locale)}</b>: - ${orderItemAdjustment.get("description",locale)?if_exists} (${orderItemAdjustment.comments?default("")}) - - <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX"> - <#if orderItemAdjustment.primaryGeoId?has_content> + <div class="tabletext" style="font-size: xx-small;"> + <b><i>${uiLabelMap.OrderAdjustment}</i>:</b> <b>${adjustmentType.get("description",locale)}</b>: + ${orderItemAdjustment.get("description",locale)?if_exists} (${orderItemAdjustment.comments?default("")}) + + <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX"> + <#if orderItemAdjustment.primaryGeoId?has_content> <#assign primaryGeo = orderItemAdjustment.getRelatedOneCache("PrimaryGeo")/> <b>${uiLabelMap.OrderJurisdiction}:</b> ${primaryGeo.geoName} [${primaryGeo.abbreviation?if_exists}] <#if orderItemAdjustment.secondaryGeoId?has_content> - <#assign secondaryGeo = orderItemAdjustment.getRelatedOneCache("SecondaryGeo")/> - (<b>in:</b> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}]) + <#assign secondaryGeo = orderItemAdjustment.getRelatedOneCache("SecondaryGeo")/> + (<b>in:</b> ${secondaryGeo.geoName} [${secondaryGeo.abbreviation?if_exists}]) </#if> - </#if> - <#if orderItemAdjustment.sourcePercentage?exists><b>Rate:</b> ${orderItemAdjustment.sourcePercentage}</#if> - <#if orderItemAdjustment.customerReferenceId?has_content><b>Customer Tax ID:</b> ${orderItemAdjustment.customerReferenceId}</#if> - <#if orderItemAdjustment.exemptAmount?exists><b>Exempt Amount:</b> ${orderItemAdjustment.exemptAmount}</#if> - </#if> - </div> + </#if> + <#if orderItemAdjustment.sourcePercentage?exists><b>Rate:</b> ${orderItemAdjustment.sourcePercentage}</#if> + <#if orderItemAdjustment.customerReferenceId?has_content><b>Customer Tax ID:</b> ${orderItemAdjustment.customerReferenceId}</#if> + <#if orderItemAdjustment.exemptAmount?exists><b>Exempt Amount:</b> ${orderItemAdjustment.exemptAmount}</#if> + </#if> + </div> </td> <td> </td> <td> </td> <td align="right"> - <div class="tabletext" style="font-size: xx-small;"> - <@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].calcItemAdjustment(orderItemAdjustment, orderItem) isoCode=currencyUomId/> - </div> - </td> + <div class="tabletext" style="font-size: xx-small;"> + <@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].calcItemAdjustment(orderItemAdjustment, orderItem) isoCode=currencyUomId/> + </div> + </td> <td colspan="3"> </td> - </tr> + </tr> </#list> - </#if> - - <#-- now show ship group info per line item --> - <#assign orderItemShipGroupAssocs = orderItem.getRelated("OrderItemShipGroupAssoc")?if_exists> - <#if orderItemShipGroupAssocs?has_content> + </#if> + + <#-- now show ship group info per line item --> + <#assign orderItemShipGroupAssocs = orderItem.getRelated("OrderItemShipGroupAssoc")?if_exists> + <#if orderItemShipGroupAssocs?has_content> <tr><td> </td></tr> <#list orderItemShipGroupAssocs as shipGroupAssoc> - <#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup")> - <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress")?if_exists> - <tr> + <#assign shipGroup = shipGroupAssoc.getRelatedOne("OrderItemShipGroup")> + <#assign shipGroupAddress = shipGroup.getRelatedOne("PostalAddress")?if_exists> + <tr> <td align="right" colspan="2"> - <div class="tabletext" style="font-size: xx-small;"><b><i>${uiLabelMap.OrderShipGroup}</i>:</b> [${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("${uiLabelMap.OrderNotShipped}")}</div> + <div class="tabletext" style="font-size: xx-small;"><b><i>${uiLabelMap.OrderShipGroup}</i>:</b> [${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("${uiLabelMap.OrderNotShipped}")}</div> </td> <td align="center"> - <div class="tabletext" style="font-size: xx-small;"><input type="text" style="textBox" name="iqm_${shipGroupAssoc.orderItemSeqId}:${shipGroupAssoc.shipGroupSeqId}" size="6" value="${shipGroupAssoc.quantity?string.number}"/></div> + <div class="tabletext" style="font-size: xx-small;"><input type="text" style="textBox" name="iqm_${shipGroupAssoc.orderItemSeqId}:${shipGroupAssoc.shipGroupSeqId}" size="6" value="${shipGroupAssoc.quantity?string.number}"/></div> </td> <td> </td> <td> </td> <td> </td> <td> </td> <td align="right" valign="top" nowrap> - <#assign itemStatusOkay = (orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && (shipGroupAssoc.cancelQuantity?default(0) < shipGroupAssoc.quantity?default(0)))> - <#if (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && itemStatusOkay) || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && itemStatusOkay && orderHeader.statusId != "ORDER_SENT")> + <#assign itemStatusOkay = (orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && (shipGroupAssoc.cancelQuantity?default(0) < shipGroupAssoc.quantity?default(0)))> + <#if (security.hasEntityPermission("ORDERMGR", "_ADMIN", session) && itemStatusOkay) || (security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && itemStatusOkay && orderHeader.statusId != "ORDER_SENT")> <div class="tabletext"><a href="<@ofbizUrl>cancelOrderItem?orderItemSeqId=${orderItem.orderItemSeqId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}&${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancel}</a></div> - <#else> + <#else> - </#if> + </#if> </td> - </tr> + </tr> </#list> - </#if> - </#list> - <tr> - <td align="right" colspan="8"> - <input type="submit" value="${uiLabelMap.OrderUpdateItems}"/> - </td> - </tr> - </form> - </#if> - <tr><td colspan="8"><hr class="sepbar"></td></tr> + </#if> + </#list> + <tr> + <td align="right" colspan="8"> + <input type="submit" value="${uiLabelMap.OrderUpdateItems}"/> + </td> + </tr> + <tr><td colspan="8"><hr class="sepbar"/></td></tr> + </table> + </form> + </#if> <#list orderHeaderAdjustments as orderHeaderAdjustment> <#assign adjustmentType = orderHeaderAdjustment.getRelatedOne("OrderAdjustmentType")> <#assign adjustmentAmount = Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(orderHeaderAdjustment, orderSubTotal)> <#assign orderAdjustmentId = orderHeaderAdjustment.get("orderAdjustmentId")> <#if adjustmentAmount != 0> - <form name="updateOrderAdjustmentForm${orderAdjustmentId}" method="post" action="<@ofbizUrl>updateOrderAdjustment?orderAdjustmentId=${orderAdjustmentId?if_exists}&orderId=${orderId?if_exists}</@ofbizUrl>"> - <tr> - <td align="right" colspan="4"> - <div class="tabletext"><b>${adjustmentType.get("description",locale)}</b> ${orderHeaderAdjustment.comments?if_exists} :</div> - </td> - <td align="left" nowrap> - <div class="tabletext"><input type="text" name="description" value="${orderHeaderAdjustment.get("description")?if_exists}" size="30" maxlength="60" class="inputBox"></div> - </td> - <td align="left" nowrap> - <div class="tabletext"><input type="text" name="amount" size="6" value="<@ofbizAmount amount=adjustmentAmount/>" class="inputBox"> - <a href="javascript:document.updateOrderAdjustmentForm${orderAdjustmentId}.submit();" class="buttontext">${uiLabelMap.CommonUpdate}</a><a href="<@ofbizUrl>deleteOrderAdjustment?orderAdjustmentId=${orderAdjustmentId?if_exists}&orderId=${orderId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></div> - </td> - </tr> - <input type="image" src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" onClick="javascript:document.updateOrderAdjustmentForm${orderAdjustmentId}.submit();"/> + <form name="updateOrderAdjustmentForm${orderAdjustmentId}" method="post" action="<@ofbizUrl>updateOrderAdjustment?orderAdjustmentId=${orderAdjustmentId?if_exists}&orderId=${orderId?if_exists}</@ofbizUrl>"> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td align="right" width="50%"> + <div class="tabletext"><b>${adjustmentType.get("description",locale)}</b> ${orderHeaderAdjustment.comments?if_exists} :</div> + </td> + <td align="left" nowrap width="25%"> + <div class="tabletext"><input type="text" name="description" value="${orderHeaderAdjustment.get("description")?if_exists}" size="30" maxlength="60" class="inputBox"/></div> + </td> + <td align="left" nowrap width="25%"> + <div class="tabletext"><input type="text" name="amount" size="6" value="<@ofbizAmount amount=adjustmentAmount/>" class="inputBox"/> + <a href="javascript:document.updateOrderAdjustmentForm${orderAdjustmentId}.submit();" class="buttontext">${uiLabelMap.CommonUpdate}</a><a href="<@ofbizUrl>deleteOrderAdjustment?orderAdjustmentId=${orderAdjustmentId?if_exists}&orderId=${orderId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonDelete}</a></div> + </td> + </tr> + <tr> + <td align="right" colspan="3"> + <input type="image" src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" onClick="javascript:document.updateOrderAdjustmentForm${orderAdjustmentId}.submit();"/> + </td> + </tr> + </table> </form> </#if> </#list> - <tr><td colspan=1><td colspan="8"><hr class="sepbar"></td></tr> <#-- add new adjustment --> <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_REJECTED"> <form name="addAdjustmentForm" method="post" action="<@ofbizUrl>createOrderAdjustment?${paramString}</@ofbizUrl>"> <input type="hidden" name="comments" value="Added manually by [${userLogin.userLoginId}]"/> - <tr> - <td align="right" colspan="4"> - <span class="tableheadtext">${uiLabelMap.OrderAdjustment} :</span> - <select name="orderAdjustmentTypeId" class="selectBox"> - <#list orderAdjustmentTypes as type> - <option value="${type.orderAdjustmentTypeId}">${type.get("description",locale)?default(type.orderAdjustmentTypeId)}</option> - </#list> - </select> - <select name="shipGroupSeqId" class="selectBox"> - <option value="_NA_"></option> - <#list shipGroups as shipGroup> - <option value="${shipGroup.shipGroupSeqId}">${uiLabelMap.OrderShipGroup} ${shipGroup.shipGroupSeqId}</option> - </#list> - </select> - </td> - <td align="left"><div class="tabletext"><input type="text" name="description" value="" size="30" maxlength="60" class="inputBox"></div></td> - <td align="left"> - <input type="text" name="amount" size="6" value="<@ofbizAmount amount=0.00/>" class="inputBox"/> - <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd}"/> - </td> - </tr> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr><td colspan=1><td colspan="3"><hr class="sepbar"/></td></tr> + <tr> + <td align="right" width="50%"> + <span class="tableheadtext">${uiLabelMap.OrderAdjustment} :</span> + <select name="orderAdjustmentTypeId" class="selectBox"> + <#list orderAdjustmentTypes as type> + <option value="${type.orderAdjustmentTypeId}">${type.get("description",locale)?default(type.orderAdjustmentTypeId)}</option> + </#list> + </select> + <select name="shipGroupSeqId" class="selectBox"> + <option value="_NA_"></option> + <#list shipGroups as shipGroup> + <option value="${shipGroup.shipGroupSeqId}">${uiLabelMap.OrderShipGroup} ${shipGroup.shipGroupSeqId}</option> + </#list> + </select> + </td> + <td align="left" width="25%"><div class="tabletext"><input type="text" name="description" value="" size="30" maxlength="60" class="inputBox"/></div></td> + <td align="left" width="25%"> + <input type="text" name="amount" size="6" value="<@ofbizAmount amount=0.00/>" class="inputBox"/> + <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonAdd}"/> + </td> + </tr> + </table> </form> </#if> <#-- subtotal --> - <tr><td colspan=1></td><td colspan="8"><hr class="sepbar"></td></tr> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr><td colspan=1></td><td colspan="8"><hr class="sepbar"/></td></tr> <tr> <td align="right" colspan="5"><div class="tabletext"><b>${uiLabelMap.OrderItemsSubTotal} :</b></div></td> <td align="left" nowrap><div class="tabletext"><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></div></td> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl?view=diff&rev=490004&r1=490003&r2=490004 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Sun Dec 24 00:39:27 2006 @@ -19,7 +19,7 @@ <div class="screenlet-header"> <div class="boxlink"> <#if currentStatus.statusId == "ORDER_CREATED" || currentStatus.statusId == "ORDER_PROCESSING"> - <div class="tabletext"><a href="<@ofbizUrl>changeOrderItemStatus?statusId=ITEM_APPROVED&${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderApproveOrder}</a></div> + <div class="tabletext"><a href="<@ofbizUrl>changeOrderItemStatus?statusId=ITEM_APPROVED&${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderApproveOrder}</a></div> </#if> <#if setOrderCompleteOption> <div class="tabletext"><a href="<@ofbizUrl>changeOrderStatus?orderId=${orderId}&statusId=ORDER_COMPLETED</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCompleteOrder}</a></div> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?view=diff&rev=490004&r1=490003&r2=490004 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Sun Dec 24 00:39:27 2006 @@ -60,13 +60,13 @@ </td> <#else> <td align="right"> - <a valign="top" href="<@ofbizUrl>receivepayment?${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.AccountingReceivePayment}</a> + <a href="<@ofbizUrl>receivepayment?${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.AccountingReceivePayment}</a> </td> </#if> <td> <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))> <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> - <a href="<@ofbizUrl>updateOrderPaymentPreference?orderId=${orderId}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&statusId=PAYMENT_CANCELLED&checkOutPaymentId=${paymentMethod.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancel}</a> + <a href="<@ofbizUrl>updateOrderPaymentPreference?orderId=${orderId}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&statusId=PAYMENT_CANCELLED&checkOutPaymentId=${paymentMethod.paymentMethodTypeId?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCancel}</a> </#if> </#if> </td> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |