svn commit: r561292 - in /ofbiz/trunk/applications/orde
Locked
 
|
Author: rayb
Date: Tue Jul 31 02:56:08 2007 New Revision: 561292 URL: http://svn.apache.org/viewvc?view=rev&rev=561292 Log: A few fixes/clean ups for the HTML in some of the order view/edit screens. Should be no functional changes. Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl?view=diff&rev=561292&r1=561291&r2=561292 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/appendorderitem.ftl Tue Jul 31 02:56:08 2007 @@ -26,12 +26,12 @@ <form method="post" action="<@ofbizUrl>appendItemToOrder?${paramString}</@ofbizUrl>" name="appendItemForm"> <#-- TODO: Presently, this is the ofbiz way of getting the prodCatalog, which is not generic. Replace with a selecatble list defaulting to this instead --> <input type="hidden" name="prodCatalogId" value="${Static["org.ofbiz.product.catalog.CatalogWorker"].getCurrentCatalogId(request)}"/> - <table class="basic-table" cellspacing='0'> + <table class="basic-table" cellspacing="0"> <tr> <td class="label">${uiLabelMap.ProductProductId} :</td> <td><input type="text" size="25" name="productId" value="${requestParameters.productId?if_exists}"/> <a href="javascript:call_fieldlookup2(document.appendItemForm.productId,'LookupProduct');"> - <img src="<@ofbizContentUrl>/images/fieldlookup.gif"</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/> + <img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="15" height="14" border="0" alt="Click here For Field Lookup"/> </a> </td> </tr> @@ -41,6 +41,7 @@ <input type="text" size="6" name="basePrice" value="${requestParameters.price?if_exists}"/> <input type="checkbox" name="overridePrice" value="Y"/> ${uiLabelMap.OrderOverridePrice} </td> + </tr> <tr> <td class="label">${uiLabelMap.OrderQuantity} :</td> <td><input type="text" size="6" name="quantity" value="${requestParameters.quantity?default("1")}"/></td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?view=diff&rev=561292&r1=561291&r2=561292 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Tue Jul 31 02:56:08 2007 @@ -128,20 +128,20 @@ </#list> </#if> </td> - <td class="align-text" valign="top" nowrap> + <td class="align-text" valign="top" nowrap="nowrap"> <#assign remainingQuantity = (orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0))> ${uiLabelMap.OrderOrdered}: ${orderItem.quantity?default(0)?string.number} <br/> ${uiLabelMap.OrderCancelled}: ${orderItem.cancelQuantity?default(0)?string.number} <br/> ${uiLabelMap.OrderRemaining}: ${remainingQuantity} <br/> </td> - <td class="align-text" valign="top" nowrap> + <td class="align-text" valign="top" nowrap="nowrap"> <input type="text" size="8" name="ipm_${orderItem.orderItemSeqId}" value="<@ofbizAmount amount=orderItem.unitPrice/>"/> <input type="checkbox" name="opm_${orderItem.orderItemSeqId}" value="Y"/> </td> - <td class="align-text" valign="top" nowrap> + <td class="align-text" valign="top" nowrap="nowrap"> <@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentsTotal(orderItem, orderAdjustments, true, false, false) isoCode=currencyUomId/> </td> - <td class="align-text" valign="top" nowrap> + <td class="align-text" valign="top" nowrap="nowrap"> <#if orderItem.statusId != "ITEM_CANCELLED"> <@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemSubTotal(orderItem, orderAdjustments) isoCode=currencyUomId/> <#else> @@ -244,10 +244,10 @@ <td class="align-text" width="50%"> <b>${adjustmentType.get("description",locale)}</b> ${orderHeaderAdjustment.comments?if_exists} : </td> - <td nowrap width="25%"> + <td nowrap="nowrap" width="25%"> <input type="text" name="description" value="${orderHeaderAdjustment.get("description")?if_exists}" size="30" maxlength="60"/> </td> - <td nowrap width="25%"> + <td nowrap="nowrap" width="25%"> <input type="text" name="amount" size="6" value="<@ofbizAmount amount=adjustmentAmount/>"/> <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> </td> @@ -266,7 +266,7 @@ <form name="addAdjustmentForm" method="post" action="<@ofbizUrl>createOrderAdjustment?${paramString}</@ofbizUrl>"> <input type="hidden" name="comments" value="Added manually by [${userLogin.userLoginId}]"/> <table class="basic-table" cellspacing="0"> - <tr><td><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr/></td></tr> <tr> <td class="align-text" width="50%"> <b>${uiLabelMap.OrderAdjustment} :</b> @@ -297,31 +297,31 @@ <tr><td colspan="2"><hr/></td></tr> <tr class="align-text"> <td><b>${uiLabelMap.OrderItemsSubTotal} :</b></td> - <td nowrap><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></td> + <td nowrap="nowrap"><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></td> </tr> <#-- other adjustments --> <tr class="align-text"> <td><b>${uiLabelMap.OrderTotalOtherOrderAdjustments} :</b></td> - <td nowrap><@ofbizCurrency amount=otherAdjAmount isoCode=currencyUomId/></td> + <td nowrap="nowrap"><@ofbizCurrency amount=otherAdjAmount isoCode=currencyUomId/></td> </tr> <#-- shipping adjustments --> <tr class="align-text"> <td><b>${uiLabelMap.OrderTotalShippingAndHandling} :</b></td> - <td nowrap><@ofbizCurrency amount=shippingAmount isoCode=currencyUomId/></td> + <td nowrap="nowrap"><@ofbizCurrency amount=shippingAmount isoCode=currencyUomId/></td> </tr> <#-- tax adjustments --> <tr class="align-text"> <td><b>${uiLabelMap.OrderTotalSalesTax} :</b></td> - <td nowrap><@ofbizCurrency amount=taxAmount isoCode=currencyUomId/></td> + <td nowrap="nowrap"><@ofbizCurrency amount=taxAmount isoCode=currencyUomId/></td> </tr> <#-- grand total --> <tr class="align-text"> <td><b>${uiLabelMap.OrderTotalDue} :</b></td> - <td nowrap><@ofbizCurrency amount=grandTotal isoCode=currencyUomId/></td> + <td nowrap="nowrap"><@ofbizCurrency amount=grandTotal isoCode=currencyUomId/></td> </tr> </table> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl?view=diff&rev=561292&r1=561291&r2=561292 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Tue Jul 31 02:56:08 2007 @@ -51,7 +51,7 @@ <div class="tabletext">${orderHeader.orderName}</div> </td> </tr> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> </#if> <#-- order status history --> <tr> @@ -72,7 +72,7 @@ </#if> </td> </tr> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderDateOrdered}</b></div> @@ -84,7 +84,7 @@ </div> </td> </tr> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.CommonCurrency}</b></div> @@ -97,7 +97,7 @@ </td> </tr> <#if orderHeader.internalCode?has_content> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderInternalCode}</b></div> @@ -110,7 +110,7 @@ </td> </tr> </#if> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderSalesChannel}</b></div> @@ -127,7 +127,7 @@ </div> </td> </tr> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderProductStore}</b></div> @@ -143,7 +143,7 @@ </div> </td> </tr> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderOriginFacility}</b></div> @@ -159,7 +159,7 @@ </div> </td> </tr> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderCreatedBy}</b></div> @@ -177,7 +177,7 @@ </tr> <#if distributorId?exists> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderDistributor}</b></div> @@ -192,7 +192,7 @@ </tr> </#if> <#if affiliateId?exists> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderAffiliate}</b></div> @@ -208,7 +208,7 @@ </#if> <#if orderContentWrapper.get("IMAGE_URL")?has_content> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="3"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderImage}</b></div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?view=diff&rev=561292&r1=561291&r2=561292 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Tue Jul 31 02:56:08 2007 @@ -65,10 +65,10 @@ <#-- Authorize and Capture transactions --> <div class="tabletext"> <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> - <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a> + <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a> </#if> <#if orderPaymentPreference.statusId == "PAYMENT_AUTHORIZED"> - <a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingCapture}</a> + <a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingCapture}</a> </#if> </div> </div> @@ -83,7 +83,7 @@ (<b>${uiLabelMap.OrderReference}:</b> ${gatewayResponse.referenceNum?if_exists} <b>${uiLabelMap.OrderAvs}:</b> ${gatewayResponse.gatewayAvsResult?default("N/A")} <b>${uiLabelMap.OrderScore}:</b> ${gatewayResponse.gatewayScoreResult?default("N/A")}) - <a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.CommonDetails}</a> + <a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.CommonDetails}</a> <#if gatewayResponse_has_next><hr class="sepbar"/></#if> </#list> </div> @@ -176,10 +176,10 @@ <#-- Authorize and Capture transactions --> <div class="tabletext"> <#if orderPaymentPreference.statusId != "PAYMENT_SETTLED"> - <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a> + <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a> </#if> <#if orderPaymentPreference.statusId == "PAYMENT_AUTHORIZED"> - <a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingCapture}</a> + <a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingCapture}</a> </#if> </div> @@ -198,7 +198,7 @@ (<b>${uiLabelMap.OrderReference}:</b> ${gatewayResponse.referenceNum?if_exists} <b>${uiLabelMap.OrderAvs}:</b> ${gatewayResponse.gatewayAvsResult?default("N/A")} <b>${uiLabelMap.OrderScore}:</b> ${gatewayResponse.gatewayScoreResult?default("N/A")}) - <a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.CommonDetails}</a> + <a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.CommonDetails}</a> <#if gatewayResponse_has_next><hr class="sepbar"/></#if> </#list> </div> @@ -207,7 +207,7 @@ <td align="right" valign="top" width="20%"> <#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> @@ -365,7 +365,7 @@ <td width="5"> </td> <td align="left" valign="top" width="80%"> <#list invoices as invoice> - <div class="tabletext">${uiLabelMap.OrderNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}&externalLoginKey=${externalLoginKey}" class="buttontext">${invoice}</a> + <div class="tabletext">${uiLabelMap.OrderNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}&externalLoginKey=${externalLoginKey}" class="buttontext">${invoice}</a> (<a href="/accounting/control/invoice.pdf?invoiceId=${invoice}" class="buttontext">PDF</a>)</div> </#list> </td> @@ -377,13 +377,15 @@ </tr> </#if> <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED")) && (paymentMethodValueMaps?has_content)> - <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> + <tr><td colspan="7"> <form name="addPaymentMethodToOrder" method="post" action="<@ofbizUrl>addPaymentMethodToOrder</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderId?if_exists}"/> + <table width="100%" border="0" cellpadding="1" cellspacing="0"> <tr> - <td width="15%" align="right" nowrap><div class="tableheadtext">${uiLabelMap.AccountingPaymentMethod} </div></td> + <td width="15%" align="right" nowrap="nowrap"><div class="tableheadtext">${uiLabelMap.AccountingPaymentMethod} </div></td> <td width="5"> </td> - <td nowrap> + <td nowrap="nowrap"> <select name="paymentMethodId" class="selectBox"> <#list paymentMethodValueMaps as paymentMethodValueMap> <#assign paymentMethod = paymentMethodValueMap.paymentMethod/> @@ -405,7 +407,7 @@ <tr> <td width="20%" align="right"><div class="tableheadtext">${uiLabelMap.AccountingAmount} </div></td> <td width="2%"> </td> - <td nowrap> + <td nowrap="nowrap"> <input type="text" class="inputBox" name="maxAmount" value="${openAmount}"/> </td> </tr> @@ -420,7 +422,10 @@ </div> </td> </tr> -</form> + </table> + </form> + </td></tr> + </#if> </table> </div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?view=diff&rev=561292&r1=561291&r2=561292 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Tue Jul 31 02:56:08 2007 @@ -25,7 +25,7 @@ <div class="screenlet-title-bar"> <ul> <li class="head3"> ${uiLabelMap.OrderShipmentInformation} - ${shipGroup.shipGroupSeqId}</li> - <li><a href="<@ofbizUrl>shipGroups.pdf?orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}</@ofbizUrl>">${uiLabelMap.OrderShipGroup} PDF</a></li> + <li><a href="<@ofbizUrl>shipGroups.pdf?orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}</@ofbizUrl>">${uiLabelMap.OrderShipGroup} PDF</a></li> </ul> <br class="clear" /> </div> @@ -46,9 +46,9 @@ <div class="tabletext"> <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> <select name="contactMechId" class="selectBox"> - <option SELECTED value="${shipGroup.contactMechId?if_exists}">${(shipGroupAddress.address1)?default("")} - ${shipGroupAddress.city?default("")}</option> + <option selected="selected" value="${shipGroup.contactMechId?if_exists}">${(shipGroupAddress.address1)?default("")} - ${shipGroupAddress.city?default("")}</option> <#if shippingContactMechList?has_content> - <option DISABLED value=""></option> + <option disabled="disabled" value=""></option> <#list shippingContactMechList as shippingContactMech> <#assign shippingPostalAddress = shippingContactMech.getRelatedOne("PostalAddress")?if_exists> <#if shippingContactMech.contactMechId?has_content> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |