svn commit: r610209 [2/2] - in /ofbiz/trunk/applications/orde
Locked
 
|
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl?rev=610209&r1=610208&r2=610209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl Tue Jan 8 14:47:08 2008 @@ -24,24 +24,24 @@ <input type="hidden" name="_rowSubmit_o_${rowCount}" value="Y" /> <input type="hidden" name="returnAdjustmentId_o_${rowCount}" value="${returnAdjustment.returnAdjustmentId}" /> </#if> - <tr class="tabletext"> + <tr> <td colspan="2"> </td> - <td colspan="3" class="tabletext">${returnAdjustment.get("description",locale)?default("N/A")} + <td colspan="3" align="right"><span class="label">${returnAdjustment.get("description",locale)?default("N/A")}</span> <#if returnAdjustment.comments?has_content>: ${returnAdjustment.comments}</#if> </div></td> <#if (adjEditable)> - <td> - <input type="text" class="inputBox" size="8" name="amount_o_${rowCount}" value="${returnAdjustment.amount?default(0)?string("##0.00")}"/> + <td align="right"> + <input type="text" size="8" name="amount_o_${rowCount}" value="${returnAdjustment.amount?default(0)?string("##0.00")}"/> </td> <#else> - <td class="tabletextright"><@ofbizCurrency amount=returnAdjustment.amount?default(0) isoCode=returnHeader.currencyUomId/></td> + <td align="right"><@ofbizCurrency amount=returnAdjustment.amount?default(0) isoCode=returnHeader.currencyUomId/></td> </#if> <td colspan="2"> </td> - <td><div class="tabletext"> + <td><div> <#if (!adjEditable)> ${adjReturnType.description?default("${uiLabelMap.CommonNA}")} <#else> - <select name="returnTypeId_o_${rowCount}" class="selectBox"> + <select name="returnTypeId_o_${rowCount}"> <#if (adjReturnType?has_content)> <option value="${adjReturnType.returnTypeId}">${adjReturnType.get("description",locale)?if_exists}</option> <option value="${adjReturnType.returnTypeId}">--</option> @@ -65,9 +65,14 @@ </tr> </#macro> -<div class='tabContainer'> - <a href="<@ofbizUrl>returnMain?returnId=${returnId?if_exists}</@ofbizUrl>" class="tabButton">${uiLabelMap.OrderReturnHeader}</a> - <a href="<@ofbizUrl>returnItems?returnId=${returnId?if_exists}</@ofbizUrl>" class="tabButtonSelected">${uiLabelMap.OrderReturnItems}</a> +<#assign selected = tabButtonItem?default("void")> + +<div class="button-bar tab-bar"> + <ul> + <li<#if selected="OrderReturnHeader"> class="selected"</#if>><a href="<@ofbizUrl>returnMain?returnId=${returnId?if_exists}</@ofbizUrl>">${uiLabelMap.OrderReturnHeader}</a></li> + <li<#if selected="OrderReturnItems"> class="selected"</#if>><a href="<@ofbizUrl>returnItems?returnId=${returnId?if_exists}</@ofbizUrl>">${uiLabelMap.OrderReturnItems}</a></li> + </ul> + <br/> </div> <div> <a href="<@ofbizUrl>return.pdf?returnId=${returnId?if_exists}</@ofbizUrl>" class="buttontext">PDF</a> @@ -76,274 +81,285 @@ </#if> </div> +<div class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="head3">${uiLabelMap.PageTitleReturnItems}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> <!-- if we're called with loadOrderItems or createReturn, then orderId would exist --> <#if !requestParameters.orderId?exists> -<table width="100%" border='0' cellpadding='2' cellspacing='0'> - <#assign readOnly = (returnHeader.statusId != "RETURN_REQUESTED")> - - <tr><td colspan="10"><h3>${uiLabelMap.OrderItemsReturned} ${uiLabelMap.CommonIn} ${uiLabelMap.OrderOrderReturn} #${returnId}</h3></td></tr> - - <#-- information about orders and amount refunded/credited on past returns --> - <#if orh?exists> - <tr><td colspan="10"> - <table border='0' width='100%' cellpadding='2' cellspacing='0'> - <tr> - <td class="tabletext" width="25%">${uiLabelMap.OrderOrderTotal}</td> - <td class="tabletext"><@ofbizCurrency amount=orh.getOrderGrandTotal() isoCode=orh.getCurrency()/></td> - </tr> - <tr> - <td class="tabletext" width="25%">${uiLabelMap.OrderAmountAlreadyCredited}</td> - <td class="tabletext"><@ofbizCurrency amount=orh.getReturnedCreditTotalWithBillingAccountBd() isoCode=orh.getCurrency()/></td> - </tr> - <tr> - <td class="tabletext" width="25%">${uiLabelMap.OrderAmountAlreadyRefunded}</td> - <td class="tabletext"><@ofbizCurrency amount=orh.getReturnedRefundTotalWithBillingAccountBd() isoCode=orh.getCurrency()/></td> - </tr> - </table> - </td></tr> - </#if> - <tr><td colspan="10"><hr class="sepbar"></td></tr> - <tr> - <td><div class="tableheadtext">${uiLabelMap.OrderOrderItems}</div></td> - <td><div class="tableheadtext">${uiLabelMap.ProductProduct}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonDescription}</div></td> - <td><div class="tableheadtext">${uiLabelMap.OrderQuantity}</div></td> - <td><div class="tableheadtext">${uiLabelMap.OrderPrice}</div></td> - <td><div class="tableheadtext">${uiLabelMap.OrderSubTotal}</div></td> - <td><div class="tableheadtext">${uiLabelMap.OrderReturnReason}</div></td> - <td><div class="tableheadtext">${uiLabelMap.OrderItemStatus}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonType}</div></td> - <#if (readOnly)> - <td><div class="tableheadtext">${uiLabelMap.OrderReturnResponse}</div></td> - </#if> - <td> </td> - </tr> - <tr><td colspan="10"><hr class="sepbar"></td></tr> - <#assign returnTotal = 0.0> - <#assign rowCount = 0> - <form method="post" action="<@ofbizUrl>updateReturnItems</@ofbizUrl>"> - <input type="hidden" name="_useRowSubmit" value="Y"> - <#if returnItems?has_content> - <#list returnItems as item> - <#assign orderItem = item.getRelatedOne("OrderItem")?if_exists> - <#assign orderHeader = item.getRelatedOne("OrderHeader")?if_exists> - <#assign returnReason = item.getRelatedOne("ReturnReason")?if_exists> - <#assign returnType = item.getRelatedOne("ReturnType")?if_exists> - <#assign status = item.getRelatedOne("InventoryStatusItem")?if_exists> - <#if (item.get("returnQuantity")?exists && item.get("returnPrice")?exists)> - <#assign returnTotal = returnTotal + item.get("returnQuantity") * item.get("returnPrice") > - <#assign returnItemSubTotal = item.get("returnQuantity") * item.get("returnPrice") > - <#else> - <#assign returnItemSubTotal = null > <#-- otherwise the last item's might carry over --> - </#if> - - <tr> - <td class="tabletext"><a href="<@ofbizUrl>orderview?orderId=${item.orderId}</@ofbizUrl>" class="buttontext">${item.orderId}</a> - ${item.orderItemSeqId?default("N/A")}</td> - <input name="orderId_o_${rowCount}" value="${item.orderId}" type="hidden"> - <input name="returnId_o_${rowCount}" value="${item.returnId}" type="hidden"> - <input name="returnItemTypeId_o_${rowCount}" value="${item.returnItemTypeId}" type="hidden"> - <input name="returnItemSeqId_o_${rowCount}" value="${item.returnItemSeqId}" type="hidden"> - <input type="hidden" name="_rowSubmit_o_${rowCount}" value="Y" /> - <td><div class="tabletext"> - <#if item.get("productId")?exists> - <a href="/catalog/control/EditProductInventoryItems?productId=${item.productId}" class="buttontext">${item.productId}</a> - <#else> - N/A - </#if></div></td> - <td><div class="tabletext"> - <#if readOnly> - ${item.description?default("N/A")} - <#else> - <input name="description_o_${rowCount}" value="${item.description}" type="text" class='inputBox' size="15"> - </#if> - </div></td> - <td><div class="tabletext"> - <#if readOnly> - ${item.returnQuantity?string.number} - <#else> - <input name="returnQuantity_o_${rowCount}" value="${item.returnQuantity}" type="text" class='inputBox' size="8" align="right"> - </#if> - <#if item.receivedQuantity?exists> (${item.receivedQuantity} received)</#if> - </div></td> - <td><div class="tabletext"> - <#if readOnly> - <@ofbizCurrency amount=item.returnPrice isoCode=orderHeader.currencyUom/> - <#else> - <input name="returnPrice_o_${rowCount}" value="${item.returnPrice}" type="text" class='inputBox' size="8" align="right"> - </#if> - </div></td> - <td class="tabletext"> - <#if returnItemSubTotal?exists><@ofbizCurrency amount=returnItemSubTotal isoCode=orderHeader.currencyUom/></#if> - </td> - <td><div class="tabletext"> - <#if readOnly> - ${returnReason.get("description",locale)?default("N/A")} - <#else> - <select name="returnReasonId_o_${rowCount}" class='selectBox'> - <#if (returnReason?has_content)> - <option value="${returnReason.returnReasonId}">${returnReason.get("description",locale)?if_exists}</option> - <option value="${returnReason.returnReasonId}">--</option> - </#if> - <#list returnReasons as returnReasonItem> - <option value="${returnReasonItem.returnReasonId}">${returnReasonItem.get("description",locale)?if_exists}</option> - </#list> - </select> - </#if> - </div></td> - <td><div class="tabletext"> - <#if readOnly> - <#if status?has_content> - ${status.get("description",locale)} + <table cellspacing="0" class="basic-table"> + <#assign readOnly = (returnHeader.statusId != "RETURN_REQUESTED")> + + <tr><td colspan="10"><h3>${uiLabelMap.OrderOrderReturn} #${returnId}</h3></td></tr> + + <#-- information about orders and amount refunded/credited on past returns --> + <#if orh?exists> + <tr><td colspan="10"> + <table cellspacing="0" class="basic-table"> + <tr> + <td class="label" width="25%">${uiLabelMap.OrderOrderTotal}</td> + <td><@ofbizCurrency amount=orh.getOrderGrandTotal() isoCode=orh.getCurrency()/></td> + </tr> + <tr> + <td class="label" width="25%">${uiLabelMap.OrderAmountAlreadyCredited}</td> + <td><@ofbizCurrency amount=orh.getReturnedCreditTotalWithBillingAccountBd() isoCode=orh.getCurrency()/></td> + </tr> + <tr> + <td class="label" width="25%">${uiLabelMap.OrderAmountAlreadyRefunded}</td> + <td><@ofbizCurrency amount=orh.getReturnedRefundTotalWithBillingAccountBd() isoCode=orh.getCurrency()/></td> + </tr> + </table> + </td></tr> + </#if> + <tr><td colspan="10"><br/></td></tr> + <tr class="header-row"> + <td>${uiLabelMap.OrderOrderItems}</td> + <td>${uiLabelMap.ProductProduct}</td> + <td>${uiLabelMap.CommonDescription}</td> + <td>${uiLabelMap.OrderQuantity}</td> + <td>${uiLabelMap.OrderPrice}</td> + <td>${uiLabelMap.OrderSubTotal}</td> + <td>${uiLabelMap.OrderReturnReason}</td> + <td>${uiLabelMap.OrderItemStatus}</td> + <td>${uiLabelMap.CommonType}</td> + <#if (readOnly)> + <td>${uiLabelMap.OrderReturnResponse}</td> + </#if> + <td> </td> + </tr> + <#assign returnTotal = 0.0> + <#assign rowCount = 0> + <form method="post" action="<@ofbizUrl>updateReturnItems</@ofbizUrl>"> + <input type="hidden" name="_useRowSubmit" value="Y"> + <#if returnItems?has_content> + <#assign alt_row = false> + <#list returnItems as item> + <#assign orderItem = item.getRelatedOne("OrderItem")?if_exists> + <#assign orderHeader = item.getRelatedOne("OrderHeader")?if_exists> + <#assign returnReason = item.getRelatedOne("ReturnReason")?if_exists> + <#assign returnType = item.getRelatedOne("ReturnType")?if_exists> + <#assign status = item.getRelatedOne("InventoryStatusItem")?if_exists> + <#if (item.get("returnQuantity")?exists && item.get("returnPrice")?exists)> + <#assign returnTotal = returnTotal + item.get("returnQuantity") * item.get("returnPrice") > + <#assign returnItemSubTotal = item.get("returnQuantity") * item.get("returnPrice") > <#else> - N/A + <#assign returnItemSubTotal = null > <#-- otherwise the last item's might carry over --> </#if> - <#else> - <select name="expectedItemStatus_o_${rowCount}" class='selectBox'> - <#if (status?has_content)> - <option value="${status.statusId}">${status.get("description",locale)?if_exists}</option> - <option value="${status.statusId}">--</option> + <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> + <td><a href="<@ofbizUrl>orderview?orderId=${item.orderId}</@ofbizUrl>" class="buttontext">${item.orderId}</a> - ${item.orderItemSeqId?default("N/A")}</td> + <input name="orderId_o_${rowCount}" value="${item.orderId}" type="hidden"> + <input name="returnId_o_${rowCount}" value="${item.returnId}" type="hidden"> + <input name="returnItemTypeId_o_${rowCount}" value="${item.returnItemTypeId}" type="hidden"> + <input name="returnItemSeqId_o_${rowCount}" value="${item.returnItemSeqId}" type="hidden"> + <input type="hidden" name="_rowSubmit_o_${rowCount}" value="Y" /> + <td><div> + <#if item.get("productId")?exists> + <a href="/catalog/control/EditProductInventoryItems?productId=${item.productId}" class="buttontext">${item.productId}</a> + <#else> + N/A + </#if></div></td> + <td><div> + <#if readOnly> + ${item.description?default("N/A")} + <#else> + <input name="description_o_${rowCount}" value="${item.description}" type="text" size="15"> + </#if> + </div></td> + <td><div> + <#if readOnly> + ${item.returnQuantity?string.number} + <#else> + <input name="returnQuantity_o_${rowCount}" value="${item.returnQuantity}" type="text" size="8" align="right"> + </#if> + <#if item.receivedQuantity?exists> (${item.receivedQuantity} received)</#if> + </div></td> + <td><div> + <#if readOnly> + <@ofbizCurrency amount=item.returnPrice isoCode=orderHeader.currencyUom/> + <#else> + <input name="returnPrice_o_${rowCount}" value="${item.returnPrice}" type="text" size="8" align="right"> + </#if> + </div></td> + <td> + <#if returnItemSubTotal?exists><@ofbizCurrency amount=returnItemSubTotal isoCode=orderHeader.currencyUom/></#if> + </td> + <td><div> + <#if readOnly> + ${returnReason.get("description",locale)?default("N/A")} + <#else> + <select name="returnReasonId_o_${rowCount}"> + <#if (returnReason?has_content)> + <option value="${returnReason.returnReasonId}">${returnReason.get("description",locale)?if_exists}</option> + <option value="${returnReason.returnReasonId}">--</option> + </#if> + <#list returnReasons as returnReasonItem> + <option value="${returnReasonItem.returnReasonId}">${returnReasonItem.get("description",locale)?if_exists}</option> + </#list> + </select> + </#if> + </div></td> + <td><div> + <#if readOnly> + <#if status?has_content> + ${status.get("description",locale)} + <#else> + N/A + </#if> + <#else> + <select name="expectedItemStatus_o_${rowCount}"> + <#if (status?has_content)> + <option value="${status.statusId}">${status.get("description",locale)?if_exists}</option> + <option value="${status.statusId}">--</option> + </#if> + <#list itemStatus as returnItemStatus> + <option value="${returnItemStatus.statusId}">${returnItemStatus.get("description",locale)?if_exists}</option> + </#list> + </select> </#if> - <#list itemStatus as returnItemStatus> - <option value="${returnItemStatus.statusId}">${returnItemStatus.get("description",locale)?if_exists}</option> - </#list> - </select> - </#if> - </div></td> - <td><div class="tabletext"> - <#if (readOnly)> - ${returnType.get("description",locale)?default("N/A")} - <#else> - <select name="returnTypeId_o_${rowCount}" class="selectBox"> - <#if (returnType?has_content)> - <option value="${returnType.returnTypeId}">${returnType.get("description",locale)?if_exists}</option> - <option value="${returnType.returnTypeId}">--</option> + </div></td> + <td><div> + <#if (readOnly)> + ${returnType.get("description",locale)?default("N/A")} + <#else> + <select name="returnTypeId_o_${rowCount}"> + <#if (returnType?has_content)> + <option value="${returnType.returnTypeId}">${returnType.get("description",locale)?if_exists}</option> + <option value="${returnType.returnTypeId}">--</option> + </#if> + <#list returnTypes as returnTypeItem> + <option value="${returnTypeItem.returnTypeId}">${returnTypeItem.get("description",locale)?if_exists}</option> + </#list> + </select> + </#if></div></td> + <#if (readOnly)> + <td> + <#if returnHeader.statusId == "RETURN_COMPLETED"> + <#assign itemResp = item.getRelatedOne("ReturnItemResponse")?if_exists> + <#if itemResp?has_content> + <#if itemResp.paymentId?has_content> + <div>${uiLabelMap.AccountingPayment} #<a href="/accounting/control/editPayment?paymentId=${itemResp.paymentId}${externalKeyParam}" class="buttontext">${itemResp.paymentId}</a></div> + <#elseif itemResp.replacementOrderId?has_content> + <div>${uiLabelMap.OrderOrder} #<a href="<@ofbizUrl>orderview?orderId=${itemResp.replacementOrderId}</@ofbizUrl>" class="buttontext">${itemResp.replacementOrderId}</a></div> + <#elseif itemResp.billingAccountId?has_content> + <div>${uiLabelMap.AccountingAccountId} #<a href="/accounting/control/EditBillingAccount?billingAccountId=${itemResp.billingAccountId}${externalKeyParam}" class="buttontext">${itemResp.billingAccountId}</a></div> + </#if> + <#else> + <div>${uiLabelMap.CommonNone}</div> </#if> - <#list returnTypes as returnTypeItem> - <option value="${returnTypeItem.returnTypeId}">${returnTypeItem.get("description",locale)?if_exists}</option> - </#list> - </select> - </#if></div></td> - <#if (readOnly)> - <td> - <#if returnHeader.statusId == "RETURN_COMPLETED"> - <#assign itemResp = item.getRelatedOne("ReturnItemResponse")?if_exists> - <#if itemResp?has_content> - <#if itemResp.paymentId?has_content> - <div class="tabletext">${uiLabelMap.AccountingPayment} #<a href="/accounting/control/editPayment?paymentId=${itemResp.paymentId}${externalKeyParam}" class="buttontext">${itemResp.paymentId}</a></div> - <#elseif itemResp.replacementOrderId?has_content> - <div class="tabletext">${uiLabelMap.OrderOrder} #<a href="<@ofbizUrl>orderview?orderId=${itemResp.replacementOrderId}</@ofbizUrl>" class="buttontext">${itemResp.replacementOrderId}</a></div> - <#elseif itemResp.billingAccountId?has_content> - <div class="tabletext">${uiLabelMap.AccountingAccountId} #<a href="/accounting/control/EditBillingAccount?billingAccountId=${itemResp.billingAccountId}${externalKeyParam}" class="buttontext">${itemResp.billingAccountId}</a></div> + <#else> + <div>${uiLabelMap.CommonNA}</div> + </#if> + </td> + </#if> + <#if returnHeader.statusId == "RETURN_REQUESTED"> + <td align='right'><a href="<@ofbizUrl>removeReturnItem?returnId=${item.returnId}&returnItemSeqId=${item.returnItemSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a> + <#else> + <td> </td> + </#if> + </tr> + <#assign rowCount = rowCount + 1> + <#assign returnItemAdjustments = item.getRelated("ReturnAdjustment")> + <#if (returnItemAdjustments?has_content)> + <#list returnItemAdjustments as returnItemAdjustment> + <@displayReturnAdjustment returnAdjustment=returnItemAdjustment adjEditable=false/> <#-- adjustments of return items should never be editable --> + </#list> </#if> - <#else> - <div class="tabletext">${uiLabelMap.CommonNone}</div> + <#-- toggle the row color --> + <#assign alt_row = !alt_row> + </#list> + <#else> + <tr> + <td colspan="9"><div>${uiLabelMap.OrderNoReturnItemsFound}</div></td> + </tr> + </#if> + <tr><td colspan="10"><hr></td></tr> + <#-- these are general return adjustments not associated with a particular item (itemSeqId = "_NA_" --> + <#if (returnAdjustments?has_content)> + <#list returnAdjustments as returnAdjustment> + <#assign adjEditable = !readOnly> <#-- they are editable if the rest of the return items are --> + <@displayReturnAdjustment returnAdjustment=returnAdjustment adjEditable=adjEditable/> + </#list> </#if> - <#else> - <div class="tabletext">${uiLabelMap.CommonNA}</div> - </#if> - </td> + <#-- show the return total --> + <tr><td colspan="5"></td><td><hr/></td></tr> + <tr> + <td colspan="2"> </td> + <td colspan="3" class="label">${uiLabelMap.OrderReturnTotal}</td> + <td align="right"><@ofbizCurrency amount=returnTotal isoCode=returnHeader.currencyUomId/></td> + </tr> + <#if (!readOnly) && (rowCount > 0)> + <tr> + <input name="returnId" value="${returnHeader.returnId}" type="hidden"> + <input name="_rowCount" value="${rowCount}" type="hidden"> + <td colspan="6" align="right"><input type="submit" class="bottontext" value="${uiLabelMap.CommonUpdate}"></td> + </tr> + </#if> + <tr><td colspan="10"><hr></td></tr> + </form> + + </table> + <#if (returnHeader.statusId == "RETURN_REQUESTED") && (rowCount > 0)> + <br/> + <form name="acceptReturn" method="post" action="<@ofbizUrl>/updateReturn</@ofbizUrl>"> + <input type="hidden" name="returnId" value="${returnId}"> + <input type="hidden" name="statusId" value="RETURN_ACCEPTED"> + <div align="right"><input type="submit" value="${uiLabelMap.OrderReturnAccept}"></div> + </form> </#if> + <#if returnHeader.statusId == "RETURN_REQUESTED"> - <td align='right'><a href="<@ofbizUrl>removeReturnItem?returnId=${item.returnId}&returnItemSeqId=${item.returnItemSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a> - <#else> - <td> </td> + <br/> + <form name="returnItems" method="post" action="<@ofbizUrl>returnItems</@ofbizUrl>"> + <input type="hidden" name="returnId" value="${returnId}"> + <table border='0' cellpadding='2' cellspacing='0'> + <tr><td colspan="4"><h3>${uiLabelMap.OrderReturnItems}</h3></td></tr> + <#if partyOrders?has_content> + <tr> + <td width='25%' align='right' nowrap class="label">${uiLabelMap.OrderOrderId}</td> + <td> </td> + <td width='25%'> + <select name="orderId"> + <#list partyOrders as order> + <option>${order.orderId}</option> + </#list> + </select> + </td> + <td><div class="tooltip">${uiLabelMap.OrderReturnLoadItems}</div></td> + </tr> + <#else> + <tr> + <td colspan="4" nowrap><div>${uiLabelMap.OrderNoOrderFoundForParty}: <a href="${customerDetailLink}${returnHeader.fromPartyId?default('_NA_')}" class="buttontext">${returnHeader.fromPartyId?default('[null]')}</a></div></td> + </tr> + <tr> + <td width='25%' align='right' nowrap><div>${uiLabelMap.OrderOrderId}</div></td> + <td> </td> + <td width='25%'> + <input type='text' name='orderId' size='20' maxlength='20'> + </td> + <td><div class="tooltip">${uiLabelMap.OrderReturnLoadItems}</div></td> + </tr> + </#if> + <tr> + <td colspan="2"> </td> + <td colspan="2"> + <a href="javascript:document.returnItems.submit();" class="buttontext">${uiLabelMap.OrderReturnLoadItems}</a> + </td> + </tr> + </table> + </form> </#if> - </tr> - <#assign rowCount = rowCount + 1> - <#assign returnItemAdjustments = item.getRelated("ReturnAdjustment")> - <#if (returnItemAdjustments?has_content)> - <#list returnItemAdjustments as returnItemAdjustment> - <@displayReturnAdjustment returnAdjustment=returnItemAdjustment adjEditable=false/> <#-- adjustments of return items should never be editable --> - </#list> - </#if> - </#list> -<#else> - <tr> - <td colspan="9"><div class="tabletext">${uiLabelMap.OrderNoReturnItemsFound}</div></td> - </tr> - </#if> - <tr><td colspan="10"><hr class="sepbar"></td></tr> -<#-- these are general return adjustments not associated with a particular item (itemSeqId = "_NA_" --> -<#if (returnAdjustments?has_content)> - <#list returnAdjustments as returnAdjustment> - <#assign adjEditable = !readOnly> <#-- they are editable if the rest of the return items are --> - <@displayReturnAdjustment returnAdjustment=returnAdjustment adjEditable=adjEditable/> - </#list> - </#if> - <#-- show the return total --> - <tr><td colspan="5"></td><td><hr class="sepbar"/></td></tr> - <tr> - <td colspan="2"> </td> - <td colspan="3" class="tableheadtext">${uiLabelMap.OrderReturnTotal}</td> - <td class="tabletextright"><b><@ofbizCurrency amount=returnTotal isoCode=returnHeader.currencyUomId/></b></td> - </tr> - <#if (!readOnly) && (rowCount > 0)> - <tr> - <input name="returnId" value="${returnHeader.returnId}" type="hidden"> - <input name="_rowCount" value="${rowCount}" type="hidden"> - <td colspan="7" class="tabletext" align="center"><input type="submit" class="bottontext" value="${uiLabelMap.CommonUpdate}"></td> - </tr> - </#if> -</form> - -</table> -<#if (returnHeader.statusId == "RETURN_REQUESTED") && (rowCount > 0)> -<br/> -<form name="acceptReturn" method="post" action="<@ofbizUrl>/updateReturn</@ofbizUrl>"> - <input type="hidden" name="returnId" value="${returnId}"> - <input type="hidden" name="statusId" value="RETURN_ACCEPTED"> - <div class="tabletext" align="right"><input type="submit" value="${uiLabelMap.OrderReturnAccept}"></div> -</form> -</#if> - -<#if returnHeader.statusId == "RETURN_REQUESTED"> -<br/> -<form name="returnItems" method="post" action="<@ofbizUrl>returnItems</@ofbizUrl>"> - <input type="hidden" name="returnId" value="${returnId}"> - <table border='0' cellpadding='2' cellspacing='0'> - <tr><td colspan="4"><h3>${uiLabelMap.OrderReturnItems}</h3></td></tr> - <#if partyOrders?has_content> - <tr> - <td width='25%' align='right' nowrap><div class='tableheadtext'>${uiLabelMap.OrderOrderId}:</div></td> - <td> </td> - <td width='25%'> - <select name="orderId" class="selectBox"> - <#list partyOrders as order> - <option>${order.orderId}</option> - </#list> - </select> - </td> - <td><div class='tabletext'> (${uiLabelMap.OrderReturnLoadItems})</div></td> - </tr> - <#else> - <tr> - <td colspan="4" nowrap><div class='tableheadtext'>${uiLabelMap.OrderNoOrderFoundForParty}: <a href="${customerDetailLink}${returnHeader.fromPartyId?default('_NA_')}" class="buttontext">${returnHeader.fromPartyId?default('[null]')}</a></div></td> - </tr> - <tr> - <td width='25%' align='right' nowrap><div class='tableheadtext'>${uiLabelMap.OrderOrderId}:</div></td> - <td> </td> - <td width='25%'> - <input type='text' name='orderId' size='20' maxlength='20' class="inputBox"> - </td> - <td><div class='tabletext'> (${uiLabelMap.OrderReturnLoadItems})</div></td> - </tr> - </#if> - <tr> - <td colspan="2"> </td> - <td colspan="2"> - <a href="javascript:document.returnItems.submit();" class="buttontext">${uiLabelMap.OrderReturnLoadItems}</a> - </td> - </tr> - </table> -</form> -</#if> <!-- if no requestParameters.orderId exists, then show list of items --> <#else> -<#assign selectAllFormName = "returnItems"/> -<form name="returnItems" method="post" action="<@ofbizUrl>createReturnItems</@ofbizUrl>"> - <input type="hidden" name="returnId" value="${returnId}"> - <input type="hidden" name="_useRowSubmit" value="Y"> - <#include "returnItemInc.ftl"/> -</form> - + <#assign selectAllFormName = "returnItems"/> + <form name="returnItems" method="post" action="<@ofbizUrl>createReturnItems</@ofbizUrl>"> + <input type="hidden" name="returnId" value="${returnId}"> + <input type="hidden" name="_useRowSubmit" value="Y"> + <#include "returnItemInc.ftl"/> + </form> </#if> + </div> +</div> \ No newline at end of file Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl?rev=610209&r1=610208&r2=610209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl Tue Jan 8 14:47:08 2008 @@ -21,15 +21,15 @@ <div><a href="<@ofbizUrl>returnMain</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderReturnCreate}</a></div> <br/> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td><div class="tableheadtext">${uiLabelMap.OrderReturnId} #</div></td> - <td><div class="tableheadtext">${uiLabelMap.FormFieldTitle_entryDate}</div></td> - <td><div class="tableheadtext">${uiLabelMap.PartyParty}</div></td> - <td><div class="tableheadtext">${uiLabelMap.FacilityFacility}</div></td> - <td><div class="tableheadtext">${uiLabelMap.CommonStatus}</div></td> +<table cellspacing="0" class="basic-table"> + <tr class="header-row"> + <td>${uiLabelMap.OrderReturnId} #</td> + <td>${uiLabelMap.FormFieldTitle_entryDate}</td> + <td>${uiLabelMap.PartyParty}</td> + <td>${uiLabelMap.FacilityFacility}</td> + <td>${uiLabelMap.CommonStatus}</td> </tr> - <tr><td colspan="5"><hr class="sepbar"></td></tr> + <tr><td colspan="5"><hr></td></tr> <#list returnList as returnHeader> <#assign statusItem = returnHeader.getRelatedOne("StatusItem")> <#if returnHeader.destinationFacilityId?exists> @@ -42,11 +42,11 @@ <#if returnHeader.fromPartyId?exists> <a href="${customerDetailLink}${returnHeader.fromPartyId}${externalKeyParam}" class='buttontext'>${returnHeader.fromPartyId}</a> <#else> - <span class="tabletext">${uiLabelMap.CommonNA}</span> + <span class="label">${uiLabelMap.CommonNA}</span> </#if> </td> - <td><div class="tabletext"><#if facility?exists>${facility.facilityName?default(facility.facilityId)}<#else>${uiLabelMap.CommonNone}</#if></div></td> - <td><div class="tabletext">${statusItem.get("description",locale)}</div></td> + <td><#if facility?exists>${facility.facilityName?default(facility.facilityId)}<#else>${uiLabelMap.CommonNone}</#if></td> + <td>${statusItem.get("description",locale)}</td> </tr> </#list> -</table> +</table> \ No newline at end of file Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml?rev=610209&r1=610208&r2=610209&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml Tue Jan 8 14:47:08 2008 @@ -44,14 +44,24 @@ <widgets> <decorator-screen name="CommonOrderReturnDecorator"> <decorator-section name="body"> - <container> - <label style="head1">${uiLabelMap.OrderOrderReturns}</label> - </container> - <container> - <link style="buttontext" target="returnMain" text="${uiLabelMap.OrderCreateNewReturn}"></link> - </container> - <include-form name="FindReturns" location="component://order/webapp/ordermgr/return/ReturnForms.xml"/> - <include-form name="ListReturns" location="component://order/webapp/ordermgr/return/ReturnForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleFindReturn}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container> + <link style="buttontext" target="returnMain" text="${uiLabelMap.OrderCreateNewReturn}"></link> + </container> + <include-form name="FindReturns" location="component://order/webapp/ordermgr/return/ReturnForms.xml"/> + <include-form name="ListReturns" location="component://order/webapp/ordermgr/return/ReturnForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -67,11 +77,24 @@ <widgets> <decorator-screen name="CommonOrderReturnDecorator"> <decorator-section name="body"> - <platform-specific> - <html> - <html-template location="component://order/webapp/ordermgr/return/quickReturn.ftl"/> - </html> - </platform-specific> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleFindQuickReturn}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <platform-specific> + <html> + <html-template location="component://order/webapp/ordermgr/return/quickReturn.ftl"/> + </html> + </platform-specific> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -82,16 +105,21 @@ <actions> <set field="titleProperty" value="PageTitleReturnHeader"/> <set field="headerItem" value="return"/> + <set field="tabButtonItem" value="OrderReturnHeader"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/returnHeader.bsh"/> </actions> <widgets> <decorator-screen name="CommonOrderReturnDecorator"> <decorator-section name="body"> - <platform-specific> - <html> - <html-template location="component://order/webapp/ordermgr/return/returnHeader.ftl"/> - </html> - </platform-specific> + <section> + <widgets> + <platform-specific> + <html> + <html-template location="component://order/webapp/ordermgr/return/returnHeader.ftl"/> + </html> + </platform-specific> + </widgets> + </section> </decorator-section> </decorator-screen> </widgets> @@ -107,11 +135,24 @@ <widgets> <decorator-screen name="CommonOrderReturnDecorator"> <decorator-section name="body"> - <platform-specific> - <html> - <html-template location="component://order/webapp/ordermgr/return/returnList.ftl"/> - </html> - </platform-specific> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleReturnList}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <platform-specific> + <html> + <html-template location="component://order/webapp/ordermgr/return/returnList.ftl"/> + </html> + </platform-specific> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -122,19 +163,24 @@ <actions> <set field="titleProperty" value="PageTitleReturnItems"/> <set field="headerItem" value="return"/> + <set field="tabButtonItem" value="OrderReturnItems"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh"/> </actions> <widgets> <decorator-screen name="CommonOrderReturnDecorator"> <decorator-section name="body"> - <platform-specific> - <html> - <html-template location="component://order/webapp/ordermgr/return/returnItems.ftl"/> - </html> - </platform-specific> + <section> + <widgets> + <platform-specific> + <html> + <html-template location="component://order/webapp/ordermgr/return/returnItems.ftl"/> + </html> + </platform-specific> + </widgets> + </section> </decorator-section> </decorator-screen> </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |