You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/04/05 22:16:46 UTC
svn commit: r762149 - in /ofbiz/trunk:
applications/manufacturing/webapp/manufacturing/jobshopmgt/
applications/order/webapp/ordermgr/order/
applications/product/webapp/facility/shipment/
specialpurpose/ecommerce/webapp/ecommerce/customer/ specialpurpo...
Author: jleroux
Date: Sun Apr 5 20:16:46 2009
New Revision: 762149
URL: http://svn.apache.org/viewvc?rev=762149&view=rev
Log:
A modified patch from Ashish Nagar "Secure URLs in Freemarker templates files" https://issues.apache.org/jira/browse/OFBIZ-2260
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl?rev=762149&r1=762148&r2=762149&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/WorkWithShipmentPlans.ftl Sun Apr 5 20:16:46 2009
@@ -26,16 +26,39 @@
${listShipmentPlanForm.renderFormString(context)}
<#if workInProgress>
<br/>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingTasksReport}</a></div>
- <div><a href="<@o...@ofbizUrl>" target="_report" class="buttontext">${uiLabelMap.ManufacturingCuttingListReport}</a></div>
+ <div>
+ <form name= "shipmentWorkEffortTasks" method= "post" action= "<@o...@ofbizUrl>" >
+ <input type= "hidden" name= "shipmentId" value= "${shipmentId}">
+ <a href="javascript:document.shipmentWorkEffortTasks.submit()" class="buttontext" target="_report">${uiLabelMap.ManufacturingTasksReport}</a>
+ </form>
+ </div>
+ <div>
+ <form name= "cuttingListReport" method= "post" action= "<@o...@ofbizUrl>" >
+ <input type= "hidden" name= "shipmentId" value= "${shipmentId}">
+ <a href="javascript:document.cuttingListReport.submit()" target="_report" class="buttontext">${uiLabelMap.ManufacturingCuttingListReport}</a>
+ </form>
+ </div>
<#else>
- <div><a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ManufacturingCreateProductionRun}</a></div>
+ <div>
+ <form name= "createProductionRunsForShipment" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "shipmentId" value= "${shipmentId}">
+ <a href="javascript:document.createProductionRunsForShipment.submit()" class="buttontext">${uiLabelMap.ManufacturingCreateProductionRun}</a>
+ </form>
+ </div>
<br/>
- <div><a href="<@o...@ofbizUrl>" target="_report" class="buttontext">${uiLabelMap.ManufacturingShipmentPlanStockReport}</a></div>
+ <div>
+ <form name= "shipmentPlanStockReport" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "shipmentId" value= "${shipmentId}">
+ <a href="javascript:document.shipmentPlanStockReport.submit()" target="_report" class="buttontext">${uiLabelMap.ManufacturingShipmentPlanStockReport}</a></div>
+ </form>
+ </div>
</#if>
-
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_report">${uiLabelMap.ManufacturingPackageLabelsReport}</a></div>
- </div>
+ <div>
+ <form name= "shipmentLabel" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "shipmentId" value= "${shipmentId}">
+ <a href="javascript:document.shipmentLabel.submit()" class="buttontext" target="_report">${uiLabelMap.ManufacturingPackageLabelsReport}</a></div>
+ </form>
+ </div>
</div>
<#else>
<div class="screenlet">
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl?rev=762149&r1=762148&r2=762149&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/associatedProductionRuns.ftl Sun Apr 5 20:16:46 2009
@@ -16,7 +16,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<#-- Mandatory work efforts -->
<#if mandatoryWorkEfforts?has_content>
<p>
@@ -24,12 +23,21 @@
<#list mandatoryWorkEfforts as mandatoryWorkEffortAssoc>
<#assign mandatoryWorkEffort = mandatoryWorkEffortAssoc.getRelatedOne("FromWorkEffort")>
<#if "PRUN_COMPLETED" == mandatoryWorkEffort.getString("currentStatusId") || "PRUN_CLOSED" == mandatoryWorkEffort.getString("currentStatusId")>
- <a href="<@o...@ofbizUrl>" class="buttontext">${mandatoryWorkEffort.workEffortName}</a>
+ <form name= "productionRunDeclarationMandatory" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "productionRunId" value= "${mandatoryWorkEffort.workEffortId}"/>
+ <a href="javascript:document.productionRunDeclarationMandatory.submit()" class="buttontext">${mandatoryWorkEffort.workEffortName}</a>
+ </form
<#else>
<#if "PRUN_CREATED" == mandatoryWorkEffort.getString("currentStatusId") || "PRUN_SCHEDULED" == mandatoryWorkEffort.getString("currentStatusId")>
- <a href="<@o...@ofbizUrl>" class="buttontext">${mandatoryWorkEffort.workEffortName}</a>[*]
+ <form name= "editProductionRunMandatory" method= "post" action= "<@o...@ofbizUrl>" >
+ <input type= "hidden" name= "productionRunId" value= "${mandatoryWorkEffort.workEffortId}"/>
+ <a href= "javascript:document.editProductionRunMandatory.submit()" class="buttontext">${mandatoryWorkEffort.workEffortName}</a>[*]
+ </form>
<#else>
- <a href="<@o...@ofbizUrl>" class="buttontext">${mandatoryWorkEffort.workEffortName}</a>[*]
+ <form name= "prodRunDeclaration" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "productionRunId" value= "${mandatoryWorkEffort.workEffortId}"/>
+ <a href= "javascript:document.prodRunDeclaration.submit()" class="buttontext">${mandatoryWorkEffort.workEffortName}</a>[*]
+ </form>
</#if>
</#if>
</#list>
@@ -42,12 +50,21 @@
<#list dependentWorkEfforts as dependentWorkEffortAssoc>
<#assign dependentWorkEffort = dependentWorkEffortAssoc.getRelatedOne("ToWorkEffort")>
<#if "PRUN_COMPLETED" == dependentWorkEffort.currentStatusId || "PRUN_CLOSED" == dependentWorkEffort.currentStatusId>
- <a href="<@o...@ofbizUrl>" class="buttontext">${dependentWorkEffort.workEffortName}</a>
+ <form name= "productionRunDeclarationDependent" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "productionRunId" value= "${dependentWorkEffort.workEffortId}"/>
+ <a href= "javascript:document.productionRunDeclarationDependent.submit()" class="buttontext">${dependentWorkEffort.workEffortName}</a>
+ </form>
<#else>
<#if "PRUN_CREATED" == dependentWorkEffort.getString("currentStatusId") || "PRUN_SCHEDULED" == dependentWorkEffort.getString("currentStatusId")>
- <a href="<@o...@ofbizUrl>" class="buttontext">${dependentWorkEffort.workEffortName}</a>[*]
+ <form name= "editProductionRunDependent" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "productionRunId" value= "${dependentWorkEffort.workEffortId}"/>
+ <a href="javascript:document.editProductionRunDependent.submit()" class="buttontext">${dependentWorkEffort.workEffortName}</a>[*]
+ </form>
<#else>
- <a href="<@o...@ofbizUrl>" class="buttontext">${dependentWorkEffort.workEffortName}</a>[*]
+ <form name= "prodRunDeclarationDependent" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "productionRunId" value= "${dependentWorkEffort.workEffortId}"/>
+ <a href="javascript:document.prodRunDeclarationDependent.submit()" class="buttontext">${dependentWorkEffort.workEffortName}</a>[*]
+ </form>
</#if>
</#if>
</#list>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=762149&r1=762148&r2=762149&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Sun Apr 5 20:16:46 2009
@@ -67,10 +67,21 @@
</div>
<#if productId?exists>
<div style="margin-top: 15px; margin-left: 10px;">
- <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.OrderEcommerce}</a>
+ <form name= "editProduct" method= "post" action= "/catalog/control/EditProduct">
+ <input type= "hidden" name= "productId" value= "${productId}">
+ <a href="javascript:document.editProduct.submit()"class="buttontext" target="_blank">${uiLabelMap.ProductCatalog}</a>
+ </form>
+ <form name= "viewProduct" method= "post" action= "/ecommerce/control/product">
+ <input type= "hidden" name= "productId" value= "${productId}">
+ <a href="javascript:document.viewProduct.submit()" class="buttontext" target="_blank">${uiLabelMap.OrderEcommerce}</a>
+ </form>
<#if orderItemContentWrapper.get("IMAGE_URL")?has_content>
- <a href="<@o...@ofbizUrl>" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a>
+ <form name= "viewImage" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "orderId" value= "${orderId}">
+ <input type= "hidden" name= "orderItemSeqId" value= "${orderItem.orderItemSeqId}">
+ <input type= "hidden" name= "orderContentTypeId" value= "IMAGE_URL">
+ <a href="javascript:document.viewImage.submit()" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a>
+ </form>
</#if>
</div>
@@ -89,7 +100,12 @@
<div style="margin-top: 15px; margin-left: 20px;">
<table cellspacing="0" cellpadding="0" border="0">
<tr><td style="text-align: right; padding-bottom: 10px;">
- <a class="buttontext" href="/catalog/control/EditProductInventoryItems?productId=${productId}&showAllFacilities=Y&externalLoginKey=${externalLoginKey}" target="_blank">${uiLabelMap.ProductInventory}</a>
+ <form name= "EditProductInventoryItems" method= "post" action= "/catalog/control/EditProductInventoryItems">
+ <input type= "hidden" name="productId" value= "${productId}">
+ <input type= "hidden" name="showAllFacilities" value= "Y">
+ <input type= "hidden" name="externalLoginKey" value= "${externalLoginKey}">
+ <a class="buttontext" href="javascript:document.EditProductInventoryItems.submit()" target="_blank">${uiLabelMap.ProductInventory}</a>
+ </form>
</td><td> </td></tr>
<tr><td>${uiLabelMap.OrderRequiredForSO}</td>
<td style="padding-left: 15px; text-align: left;">${requiredQuantity}</td></tr>
@@ -134,7 +150,11 @@
<#assign returnHeader = returnItem.getRelatedOne("ReturnHeader")>
<#if returnHeader.statusId != "RETURN_CANCELLED">
<div>
- <font color="red">${uiLabelMap.OrderReturned}</font> #<a href="<@o...@ofbizUrl>" class="buttontext">${returnItem.returnId}</a>
+ <font color="red">${uiLabelMap.OrderReturned}</font>#
+ <form name= "returnMain" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "returnId" value= "${returnItem.returnId}">
+ <a href="javascript:document.returnMain.submit()" class="buttontext">${returnItem.returnId}</a>
+ </form>
</div>
</#if>
</#list>
@@ -231,7 +251,11 @@
<div>
<#if orderItem.orderItemTypeId != "RENTAL_ORDER_ITEM">
<span class="label">${uiLabelMap.ManufacturingProductionRun}</span>
- <a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortId}&externalLoginKey=${externalLoginKey}" class="buttontext">${workEffort.workEffortId}</a>
+ <form name= "ShowProductionRun" method= "post" action= "/manufacturing/control/ShowProductionRun">
+ <input type= "hidden" name= "productionRunId" value= "${workEffort.workEffortId}">
+ <input type= "hidden" name= "externalLoginKey" value= "${externalLoginKey}">
+ <a href="javascript:document.ShowProductionRun.submit()" class="buttontext">${workEffort.workEffortId}</a>
+ </form>
${uiLabelMap.OrderCurrentStatus} ${(delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId"))).get("description",locale))?if_exists}
<#else>
${uiLabelMap.CommonFrom}: ${workEffort.estimatedStartDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonTo}: ${workEffort.estimatedCompletionDate?string("yyyy-MM-dd")} ${uiLabelMap.OrderNumberOfPersons}: ${workEffort.reservPersons?default("")}
@@ -259,7 +283,10 @@
<td colspan="6">
<div>
<span class="label">${uiLabelMap.OrderLinkedToOrderItem}</span> (${linkedOrderItem.orderItemAssocTypeId})
- <a href="/ordermgr/control/orderview?orderId=${linkedOrderId}" class="buttontext">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description?if_exists}
+ <form name= "orderview" method= "post" action= "/ordermgr/control/orderview">
+ <input type= "hidden" name= "orderId" value= "${linkedOrderId}">
+ <a href="javascript:document.orderview.submit()" class="buttontext">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description?if_exists}
+ </form>
</div>
</td>
</tr>
@@ -276,7 +303,10 @@
<td colspan="6">
<div>
<span class="label">${uiLabelMap.OrderLinkedFromOrderItem}</span> ${linkedOrderItem.orderItemAssocTypeId})
- <a href="/ordermgr/control/orderview?orderId=${linkedOrderId}" class="buttontext">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description?if_exists}
+ <form name= "orderView" method= "post" action= "/ordermgr/control/orderview">
+ <input type= "hidden" name= "orderId" value= "${linkedOrderId}">
+ <a href="javascript:document.orderView.submit()"class="buttontext">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description?if_exists}
+ </form>
</div>
</td>
</tr>
@@ -293,7 +323,10 @@
<td colspan="6">
<div>
<span class="label">${uiLabelMap.OrderLinkedToRequirement}</span>
- <a href="<@o...@ofbizUrl>" class="buttontext">${linkedRequirement.requirementId}</a>
+ <form name= "orderView" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "requirementId" value= "${linkedRequirement.requirementId}">
+ <a href="javascript:document.orderView.submit()" class="buttontext">${linkedRequirement.requirementId}</a>
+ </form>
</div>
</td>
</tr>
@@ -309,7 +342,11 @@
<td colspan="6">
<div>
<span class="label">${uiLabelMap.OrderLinkedToQuote}</span>
- <a href="<@o...@ofbizUrl>" class="buttontext">${linkedQuote.quoteId}-${linkedQuote.quoteItemSeqId}</a>
+ <form name= "EditQuoteItem" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "quoteId" value= "${linkedQuote.quoteId}">
+ <input type= "hidden" name= "quoteItemSeqId" value= "${linkedQuote.quoteItemSeqId}">
+ <a href="javascript:document.EditQuoteItem.submit()"class="buttontext">${linkedQuote.quoteId}-${linkedQuote.quoteItemSeqId}</a>
+ </form>
</div>
</td>
</tr>
@@ -326,7 +363,13 @@
<span class="label">${uiLabelMap.OrderAdjustment}</span> ${adjustmentType.get("description",locale)}
${orderItemAdjustment.get("description",locale)?if_exists}
<#if orderItemAdjustment.comments?has_content>(${orderItemAdjustment.comments?default("")})</#if>
- <#if orderItemAdjustment.productPromoId?has_content><a href="/catalog/control/EditProductPromo?productPromoId=${orderItemAdjustment.productPromoId}&externalLoginKey=${externalLoginKey}">${orderItemAdjustment.getRelatedOne("ProductPromo").getString("promoName")}</a></#if>
+ <#if orderItemAdjustment.productPromoId?has_content>
+ <form name= "EditQuoteItem" method= "post" action= "/catalog/control/EditProductPromo">
+ <input type= "hidden" name= "productPromoId" value= "${orderItemAdjustment.productPromoId}">
+ <input type= "hidden" name= "externalLoginKey" value= "${externalLoginKey}">
+ <a href="javascript:document.EditQuoteItem.submit()">${orderItemAdjustment.getRelatedOne("ProductPromo").getString("promoName")}</a>
+ </form>
+ </#if>
<#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX">
<#if orderItemAdjustment.primaryGeoId?has_content>
<#assign primaryGeo = orderItemAdjustment.getRelatedOneCache("PrimaryGeo")/>
@@ -384,7 +427,12 @@
<td align="right" colspan="2">
<div>
<span class="label">${uiLabelMap.CommonSurveys}</span>
- <a href="/content/control/ViewSurveyResponses?surveyResponseId=${survey.surveyResponseId}&surveyId=${survey.surveyId}&externalLoginKey=${externalLoginKey}" class="buttontext">${survey.surveyId}</a>
+ <form name= "ViewSurveyResponses" method= "post" action= "/content/control/ViewSurveyResponses">
+ <input type= "hidden" name= "surveyResponseId" value= "${survey.surveyResponseId}">
+ <input type= "hidden" name= "surveyId" value= "${survey.surveyId}">
+ <input type= "hidden" name= "externalLoginKey" value= "${externalLoginKey}">
+ <a href="javascript:document.ViewSurveyResponses.submit()" class="buttontext">${survey.surveyId}</a>
+ </form>
</div>
</td>
<td colspan="5"> </td>
@@ -450,9 +498,13 @@
<tr>
<td align="right" colspan="2">
<div>
- <span class="label">${uiLabelMap.FacilityInventory}</span>
- <a href="/facility/control/EditInventoryItem?inventoryItemId=${orderItemShipGrpInvRes.inventoryItemId}&externalLoginKey=${externalLoginKey}" class="buttontext">${orderItemShipGrpInvRes.inventoryItemId}</a>
- <span class="label">${uiLabelMap.OrderShipGroup}</span> ${orderItemShipGrpInvRes.shipGroupSeqId}
+ <span class="label">${uiLabelMap.FacilityInventory}</span>
+ <form name= "EditInventoryItem" method= "post" action= "/facility/control/EditInventoryItem">
+ <input type= "hidden" name= "inventoryItemId" value= "${orderItemShipGrpInvRes.inventoryItemId}">
+ <input type= "hidden" name= "externalLoginKey" value= "${externalLoginKey}">
+ <a href="javascript:document.EditInventoryItem.submit()">${orderItemShipGrpInvRes.inventoryItemId}</a>
+ </form>
+ <span class="label">${uiLabelMap.OrderShipGroup}</span> ${orderItemShipGrpInvRes.shipGroupSeqId}
</div>
</td>
<td align="center">
@@ -476,7 +528,13 @@
<#list orderShipments as orderShipment>
<tr>
<td align="right" colspan="2">
- <div><span class="label">${uiLabelMap.OrderPlannedInShipment}</span> <a target="facility" href="/facility/control/ViewShipment?shipmentId=${orderShipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${orderShipment.shipmentId}</a>: ${orderShipment.shipmentItemSeqId}</div>
+ <div><span class="label">${uiLabelMap.OrderPlannedInShipment}</span>
+ <form name= "ViewShipmentOrder" method= "post" action= "/facility/control/ViewShipment">
+ <input type= "hidden" name= "shipmentId" value= "${orderShipment.shipmentId}">
+ <input type= "hidden" name= "externalLoginKey" value= "${externalLoginKey}">
+ <a target="facility" href="javascript:document.ViewShipmentOrder.submit()"class="buttontext">${orderShipment.shipmentId}</a>: ${orderShipment.shipmentItemSeqId}
+ </form>
+ </div>
</td>
<td align="center">
<div>${orderShipment.quantity?string.number} </div>
@@ -495,7 +553,11 @@
<div>
<#if itemIssuance.shipmentId?has_content>
<span class="label">${uiLabelMap.OrderIssuedToShipmentItem}</span>
- <a target="facility" href="/facility/control/ViewShipment?shipmentId=${itemIssuance.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${itemIssuance.shipmentId}</a>: ${itemIssuance.shipmentItemSeqId?if_exists}
+ <form name= "ViewShipmentIssuance" method= "post" action= "/facility/control/ViewShipment">
+ <input type= "hidden" name= "shipmentId" value= "${itemIssuance.shipmentId}">
+ <input type= "hidden" name= "externalLoginKey" value= "${externalLoginKey}">
+ <a target="facility" href="javascript:document.ViewShipmentIssuance.submit()" class="buttontext">${itemIssuance.shipmentId}</a>: ${itemIssuance.shipmentItemSeqId?if_exists}
+ </form>
<#else>
<span class="label">${uiLabelMap.OrderIssuedWithoutShipment}</span>
</#if>
@@ -518,7 +580,11 @@
<#if itemIssuance.inventoryItemId?has_content>
<#assign inventoryItem = itemIssuance.getRelatedOne("InventoryItem")/>
<span class="label">${uiLabelMap.FacilityInventory}</span>
- <a href="/facility/control/EditInventoryItem?inventoryItemId=${itemIssuance.inventoryItemId}&externalLoginKey=${externalLoginKey}" class="buttontext">${itemIssuance.inventoryItemId}</a>
+ <form name= "EditInventoryItem1" method= "post" action= "/facility/control/EditInventoryItem">
+ <input type= "hidden" name= "inventoryItemId" value= "${itemIssuance.inventoryItemId}">
+ <input type= "hidden" name= "externalLoginKey" value= "${externalLoginKey}">
+ <a href="javascript:document.EditInventoryItem1.submit()" class="buttontext">${itemIssuance.inventoryItemId}</a>
+ </form>
<span class="label">${uiLabelMap.OrderShipGroup}</span> ${itemIssuance.shipGroupSeqId?if_exists}
<#if (inventoryItem.serialNumber?has_content)><br><span class="label">${uiLabelMap.ProductSerialNumber}</span> ${inventoryItem.serialNumber} </#if>
</#if>
@@ -541,11 +607,19 @@
<div>
<#if shipmentReceipt.shipmentId?has_content>
<span class="label">${uiLabelMap.OrderShipmentReceived}</span>
- <a target="facility" href="/facility/control/ViewShipment?shipmentId=${shipmentReceipt.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${shipmentReceipt.shipmentId}</a>:${shipmentReceipt.shipmentItemSeqId?if_exists}
+ <form name= "viewShipmentShipment" method= "post" action= "/facility/control/ViewShipment">
+ <input type= "hidden" name= "shipmentId" value= "${shipmentReceipt.shipmentId}">
+ <input type= "hidden" name= "externalLoginKey" value= "${externalLoginKey}">
+ <a target="facility" href="javascript:document.viewShipmentShipment.submit()" class="buttontext">${shipmentReceipt.shipmentId}</a>:${shipmentReceipt.shipmentItemSeqId?if_exists}
+ </form>
</#if>
${shipmentReceipt.datetimeReceived}
<span class="label">${uiLabelMap.FacilityInventory}</span>
- <a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}&externalLoginKey=${externalLoginKey}" class="buttontext">${shipmentReceipt.inventoryItemId}</a>
+ <form name= "viewShipmentInventory" method= "post" action= "/facility/control/EditInventoryItem">
+ <input type= "hidden" name= "inventoryItemId" value= "${shipmentReceipt.inventoryItemId}">
+ <input type= "hidden" name= "externalLoginKey" value= "${externalLoginKey}">
+ <a href="javascript:document.viewShipmentInventory.submit()" class="buttontext">${shipmentReceipt.inventoryItemId}</a>
+ </form>
</div>
</td>
<td align="center">
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?rev=762149&r1=762148&r2=762149&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Sun Apr 5 20:16:46 2009
@@ -361,7 +361,13 @@
<#if !shipGroup.supplierPartyId?has_content>
<a href="/facility/control/PackOrder?facilityId=${storeFacilityId?if_exists}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a>
<br/>
- <a href="/facility/control/createShipment?primaryOrderId=${orderId}&primaryShipGroupSeqId=${shipGroup.shipGroupSeqId}&statusId=SHIPMENT_INPUT&originFacilityId=${storeFacilityId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a>
+ <a href="javascript:document.createShipment.submit()" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup}</a>
+ <form name="createShipment" method="post" action="/facility/control/createShipment">
+ <input type="hidden" name="orderId" value="${orderId}"/>
+ <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/>
+ <input type="hidden" name="statusId" value="SHIPMENT_INPUT">
+ <input type="hidden" name="facilityId" value=${storeFacilityId?if_exists}>
+ </form>
</#if>
<#else>
<#assign facilities = facilitiesForShipGroup.get(shipGroup.shipGroupSeqId)>
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl?rev=762149&r1=762148&r2=762149&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipment.ftl Sun Apr 5 20:16:46 2009
@@ -23,7 +23,12 @@
</#if>
-->
<#if shipmentId?has_content>
- <div><a href="<@o...@ofbizUrl>" class="buttontext" target="_blank">${uiLabelMap.ProductGenerateShipmentManifestReport}</a></div>
+ <div>
+ <form name= "shipmentManifest" action= "<@o...@ofbizUrl>" method= "post">
+ <input type= "hidden" name= "shipmentId" value= "${shipmentId}">
+ <a href="javascript:document.shipmentManifest.submit()" class="buttontext" target="_blank">${uiLabelMap.ProductGenerateShipmentManifestReport}</a>
+ </form>
+ </div>
</#if>
<div class="screenlet">
<div class="screenlet-title-bar">
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl?rev=762149&r1=762148&r2=762149&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl Sun Apr 5 20:16:46 2009
@@ -80,7 +80,17 @@
(${uiLabelMap.CommonSince}:${partyContactMechPurpose.fromDate.toString()})
<#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpires}:${partyContactMechPurpose.thruDate.toString()})</#if>
</div></td>
- <td bgcolor='white'><div><a href='<@o...@ofbizUrl>' class='buttontext'> ${uiLabelMap.CommonDelete} </a></div></td>
+ <td bgcolor='white'>
+ <div>
+ <form name= "deletePartyContactMechPurpose" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "contactMechId" value= "${contactMechId}">
+ <input type= "hidden" name= "contactMechPurposeTypeId" value= "${partyContactMechPurpose.contactMechPurposeTypeId}">
+ <input type= "hidden" name= "fromDate" value= "${partyContactMechPurpose.fromDate}">
+ <input type= "hidden" name= "useValues" value= "true">
+ <a href="javascript:document.deletePartyContactMechPurpose.submit()" class='buttontext'> ${uiLabelMap.CommonDelete} </a>
+ </form>
+ </div>
+ </td>
</tr>
</#list>
<#if purposeTypes?has_content>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl?rev=762149&r1=762148&r2=762149&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl Sun Apr 5 20:16:46 2009
@@ -29,7 +29,10 @@
<div class="screenlet-header">
<div class="boxlink">
<#if (communicationEvent.partyIdFrom?if_exists != (userLogin.partyId)?if_exists)>
- <a href="<@o...@ofbizUrl>" class="submenutext">${uiLabelMap.PartyReply}</a>
+ <form name= "newmessage" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "communicationEventId" value= "${communicationEvent.communicationEventId}">
+ <a href="javascript:document.newmessage.submit()" class="submenutext">${uiLabelMap.PartyReply}</a>
+ </form>
</#if>
<a href="<@o...@ofbizUrl>" class="submenutextright">${uiLabelMap.EcommerceViewList}</a>
</div>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl?rev=762149&r1=762148&r2=762149&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl Sun Apr 5 20:16:46 2009
@@ -34,14 +34,19 @@
<td><div class="tabletext">${communicationEvent.subject?default("")}</div></td>
<td><div class="tabletext">${communicationEvent.entryDate}</div></td>
<td align="right">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceRead}</a>
+ <form name="readMessage" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="communicationEventId" value="{communicationEvent.communicationEventId}">
+ <a href="javascript:document.readMessage.submit()" class="buttontext">${uiLabelMap.EcommerceRead}</a>
+ </form>
<#if isSentMessage>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PartyReply}</a>
+ <form name="newMessage" method="post" action="<@o...@ofbizUrl>">
+ <input type="hidden" name="communicationEventId" value="{communicationEvent.communicationEventId}">
+ <a href="javascript:document.newMessage.submit()"class="buttontext">${uiLabelMap.PartyReply}</a>
+ </form>
</#if>
</td>
</tr>
</#macro>
-
<div class="screenlet">
<div class="screenlet-header">
<div class="boxlink">
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?rev=762149&r1=762148&r2=762149&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Sun Apr 5 20:16:46 2009
@@ -38,7 +38,10 @@
<#if showOld>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PartyHideOld}</a>
<#else>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.PartyShowOld}</a>
+ <form name= "viewProfile" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "SHOW_OLD" value= "true">
+ <a href="javascript:document.viewProfile.submit()" class="buttontext">${uiLabelMap.PartyShowOld}</a>
+ </form>
</#if>
<#if (productStore.enableDigProdUpload)?if_exists == "Y">
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceDigitalProductUpload}</a>
@@ -144,7 +147,12 @@
<#if contactMechPurposeType.contactMechPurposeTypeId == "SHIPPING_LOCATION" && (profiledefs.defaultShipAddr)?default("") == contactMech.contactMechId>
<span class="buttontextdisabled">${uiLabelMap.EcommerceIsDefault}</span>
<#elseif contactMechPurposeType.contactMechPurposeTypeId == "SHIPPING_LOCATION">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceSetDefault}</a>
+ <form name= "setProfileDefault" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "productStoreId" value= "${productStoreId}">
+ <input type= "hidden" name= "defaultShipAddr" value= "${contactMech.contactMechId}">
+ <input type= "hidden" name= "partyId" value= "${party.partyId}">
+ <a href="javascript:document.setProfileDefault.submit()" class="buttontext">${uiLabelMap.EcommerceSetDefault}</a>
+ </form>
</#if>
<#else>
<b>${uiLabelMap.PartyPurposeTypeNotFound}: "${partyContactMechPurpose.contactMechPurposeTypeId}"</b>
@@ -210,12 +218,20 @@
<td align="center" valign="top" nowrap width="1%"><div class="tabletext"><b>(${partyContactMech.allowSolicitation?if_exists})</b></div></td>
<td width="5"> </td>
<td align="right" valign="top" nowrap width="1%" nowrap>
- <div><a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonUpdate}</a> </div>
+ <div>
+ <form name= "editContactMech" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "contactMechId" value= "${contactMech.contactMechId}">
+ <a href="javascript:document.editContactMech.submit()" class="buttontext">${uiLabelMap.CommonUpdate}</a>
+ </form>
+ </div>
</td>
<td align="right" valign="top" width="1%" nowrap>
- <div><a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonExpire}</a> </div>
+ <div>
+ <form name= "deleteContactMech" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "contactMechId" value= "${contactMech.contactMechId}">
+ <a href= "javascript:document.deleteContactMech.submit()"class="buttontext"> ${uiLabelMap.CommonExpire}</a>
+ </form>
+ </div>
</td>
</tr>
</#list>
@@ -266,8 +282,12 @@
</td>
<td width="5"> </td>
<td align="right" valign="top" width="1%" nowrap>
- <div><a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonUpdate}</a></div>
+ <div>
+ <form name= "editCreditCard" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "paymentMethodId" value= "${paymentMethod.paymentMethodId}">
+ <a href="javascript:document.editCreditCard.submit()" class="buttontext">${uiLabelMap.CommonUpdate}</a>
+ </form>
+ </div>
</td>
<#elseif paymentMethod.paymentMethodTypeId?if_exists == "GIFT_CARD">
<#if giftCard?has_content && giftCard.cardNumber?has_content>
@@ -296,8 +316,11 @@
</td>
<td width="5"> </td>
<td align="right" valign="top" width="1%" nowrap>
- <div><a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonUpdate}</a></div>
+ <div>
+ <form name= "editGiftCard" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "paymentMethodId" value= "${paymentMethod.paymentMethodId}">
+ <a href="javascript:document.editGiftCard.submit()" class="buttontext">${uiLabelMap.CommonUpdate}</a>
+ </div>
</td>
<#elseif paymentMethod.paymentMethodTypeId?if_exists == "EFT_ACCOUNT">
<td width="80%" valign="top">
@@ -310,20 +333,34 @@
</td>
<td width="5"> </td>
<td align="right" valign="top" width="1%" nowrap>
- <div><a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonUpdate}</a></div>
+ <div>
+ <form name= "editEftAccount" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "paymentMethodId" value= "${paymentMethod.paymentMethodId}">
+ <a href="javascript:document.editEftAccount.submit()" class="buttontext">${uiLabelMap.CommonUpdate}</a>
+ </form>
+ </div>
</td>
</#if>
<td align="right" valign="top" width="1%" nowrap>
- <div><a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.CommonExpire}</a></div>
+ <div>
+ <form name= "deletePaymentMethod" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "paymentMethodId" value= "${paymentMethod.paymentMethodId}">
+ <a href="javascript:document.deletePaymentMethod.submit()" class="buttontext">${uiLabelMap.CommonExpire}</a>
+ </form>
+ </div>
</td>
<td align="right" valign="top" width="1%" nowrap>
<#if (profiledefs.defaultPayMeth)?default("") == paymentMethod.paymentMethodId>
<span class="buttontextdisabled">${uiLabelMap.EcommerceIsDefault}</span>
<#else>
- <div><a href="<@o...@ofbizUrl>" class="buttontext">
- ${uiLabelMap.EcommerceSetDefault}</a></div>
+ <div>
+ <form name= "setProfileDefault" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "productStoreId" value= "${productStoreId}">
+ <input type= "hidden" name= "defaultPayMeth" value= "${paymentMethod.paymentMethodId}">
+ <input type= "hidden" name= "partyId" value= "${party.partyId}">
+ <a href="javascript:document.setProfileDefault.submit()" class="buttontext"> ${uiLabelMap.EcommerceSetDefault}</a>
+ </form>
+ </div>
</#if>
</td>
</tr>
@@ -416,15 +453,27 @@
<#assign mimeType = content.getRelatedOneCache("MimeType")?if_exists>
<#assign status = content.getRelatedOneCache("StatusItem")>
<tr>
- <td><a href="<@o...@ofbizUrl>" class="buttontext">${content.contentId}</a>
+ <td>
+ <form name= "img" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "imgId" value= "${content.dataResourceId?if_exists}">
+ <a href="javascript:document.img.submit()" class="buttontext">${content.contentId}</a>
+ </form>
<td><div class="tabletext">${content.contentName?if_exists}</div></td>
<td><div class="tabletext">${(contentType.get("description",locale))?if_exists}</div></td>
<td><div class="tabletext">${mimeType?if_exists.description?if_exists}</div></td>
<td><div class="tabletext">${(status.get("description",locale))?if_exists}</div></td>
<td><div class="tabletext">${contentRole.fromDate?if_exists}</div></td>
<td align="right">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonView}</a>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a>
+ <form name= "imgForm" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "imgId" value= "${content.dataResourceId?if_exists}">
+ <a href="javascript:document.imgForm.submit()" class="buttontext">${uiLabelMap.CommonView}</a>
+ </form>
+ <form name= "removePartyAsset" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "contentId" value= "${contentRole.contentId}">
+ <input type= "hidden" name= "partyId" value= "${contentRole.partyId}">
+ <input type= "hidden" name= "roleTypeId" value= "${contentRole.roleTypeId}">
+ <a href="javascript:document.removePartyAsset.submit()"class="buttontext">${uiLabelMap.CommonRemove}</a>
+ </form>
</td>
</tr>
</#list>
@@ -493,7 +542,13 @@
<td width="5"> </td>
<td width="20%" nowrap>
<#if (contactListParty.statusId?if_exists == "CLPT_ACCEPTED")>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceUnsubscribe}</a>
+ <form method="post" action="<@o...@ofbizUrl>" name="clistReject">
+ <input type="hidden" name="partyId" value="${party.partyId}"/>
+ <input type="hidden" name="contactListId" value="${contactListParty.contactListId}"/>
+ <input type="hidden" name="fromDate" value="${contactListParty.fromDate}"/>
+ <input type="hidden" name="statusId" value="CLPT_REJECTED"/>
+ <a href="javascript:document.clistReject.submit()" class="buttontext">${uiLabelMap.EcommerceUnsubscribe}</a>
+ </form>
<#elseif (contactListParty.statusId?if_exists == "CLPT_PENDING")>
<form method="post" action="<@o...@ofbizUrl>" name="clistAcceptForm${contactListParty_index}">
<input type="hidden" name="partyId" value="${party.partyId}"/>
@@ -504,7 +559,13 @@
<input type="submit" value="${uiLabelMap.EcommerceVerifySubscription}" class="smallSubmit"/>
</form>
<#elseif (contactListParty.statusId?if_exists == "CLPT_REJECTED")>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.EcommerceSubscribe}</a>
+ <form method="post" action="<@o...@ofbizUrl>" name="clistPending">
+ <input type="hidden" name="partyId" value="${party.partyId}"/>
+ <input type="hidden" name="contactListId" value="${contactListParty.contactListId}"/>
+ <input type="hidden" name="fromDate" value="${contactListParty.fromDate}"/>
+ <input type="hidden" name="statusId" value="CLPT_PENDING"/>
+ <a href="javascript:document.clistPending.submit()" class="buttontext">${uiLabelMap.EcommerceSubscribe}</a>
+ </form>
</#if>
</td>
</tr>
@@ -561,7 +622,12 @@
<#if (responses > 0 && survey.allowUpdate?default("N") == "Y")>
<#assign surveyLabel = uiLabelMap.EcommerceUpdateSurvey>
</#if>
- <td align="right" width="10%" nowrap><a href="<@o...@ofbizUrl>" class="buttontext">${surveyLabel}</a></td>
+ <td align="right" width="10%" nowrap>
+ <form name= "takeSurvey" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "productStoreSurveyId" value= "${surveyAppl.productStoreSurveyId}">
+ <a href="javascript:document.takeSurvey.submit()" class="buttontext">${surveyLabel}</a>
+ </form>
+ </td>
<#else>
</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl?rev=762149&r1=762148&r2=762149&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/anonymoustrail.ftl Sun Apr 5 20:16:46 2009
@@ -17,4 +17,15 @@
under the License.
-->
-<#if shipAddr?exists><a href="<@o...@ofbizUrl>" class="${trailClass.shipAddr}">${uiLabelMap.EcommerceChangeShippingAddress}</a><#if shipOptions?exists><a href="<@o...@ofbizUrl>" class="${trailClass.shipOptions}">${uiLabelMap.EcommerceChangeShippingOptions}</a><#if billing?exists><a href="<@o...@ofbizUrl>" class="${trailClass.paymentType}">${uiLabelMap.EcommerceChangePaymentInfo}</a></#if></#if></#if>
+<#if shipAddr?exists>
+ <a href="<@o...@ofbizUrl>" class="${trailClass.shipAddr}">${uiLabelMap.EcommerceChangeShippingAddress}</a>
+ <#if shipOptions?exists>
+ <a href="<@o...@ofbizUrl>" class="${trailClass.shipOptions}">${uiLabelMap.EcommerceChangeShippingOptions}</a>
+ <#if billing?exists>
+ <form name= "setBilling" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "resetType" value= "Y">
+ <a href="javascript:document.setBilling.submit()" class="${trailClass.paymentType}">${uiLabelMap.EcommerceChangePaymentInfo}</a>
+ </form>
+ </#if>
+ </#if>
+</#if>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl?rev=762149&r1=762148&r2=762149&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderheader.ftl Sun Apr 5 20:16:46 2009
@@ -33,17 +33,28 @@
<div class="screenlet-header">
<div class="boxlink">
<#if maySelectItems?default("N") == "Y" && returnLink?default("N") == "Y" && (orderHeader.statusId)?if_exists == "ORDER_COMPLETED" && roleTypeId?if_exists == "PLACING_CUSTOMER">
- <a href="<@o...@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderRequestReturn}</a>
+ <form name= "makeReturn" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "orderId" value= "${orderHeader.orderId}">
+ <a href="javascript:document.makeReturn.submit()" class="submenutextright">${uiLabelMap.OrderRequestReturn}</a>
+ </form>
</#if>
</div>
<div class="boxhead">
${uiLabelMap.OrderOrder}
<#if orderHeader?has_content>
- ${uiLabelMap.CommonNbr}<a href="<@o...@ofbizUrl>" class="lightbuttontext">${orderHeader.orderId}</a>
+ ${uiLabelMap.CommonNbr}
+ <form name= "orderStatus" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "orderId" value= "${orderHeader.orderId}">
+ <a href="javascript:document.orderStatus.submit()" class="lightbuttontext">${orderHeader.orderId}</a>
+ </form>
</#if>
${uiLabelMap.CommonInformation}
<#if (orderHeader.orderId)?exists>
- ${externalOrder?if_exists} [ <a href="<@o...@ofbizUrl>" class="lightbuttontext" target="_blank">PDF</a> ]
+ ${externalOrder?if_exists} [
+ <form name= "orderPdf" method= "post" action= "<@o...@ofbizUrl>">
+ <input type= "hidden" name= "orderId" value= "${(orderHeader.orderId)?if_exists}">
+ <a href="javascript:document.orderPdf.submit()" class="lightbuttontext" target="_blank">PDF</a> ]
+ </form>
</#if>
</div>
</div>
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl?rev=762149&r1=762148&r2=762149&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderitems.ftl Sun Apr 5 20:16:46 2009
@@ -65,7 +65,7 @@
<#break>
</#if>
</#list>
- <#else>
+ <#else>
<#assign WorkOrderItemFulfillments = orderItem.getRelated("WorkOrderItemFulfillment")?if_exists>
<#if WorkOrderItemFulfillments?has_content>
<#list WorkOrderItemFulfillments as WorkOrderItemFulfillment>
@@ -136,7 +136,7 @@
<td> </td>
</#if>
<td align="right" valign="top">
- <div class="tabletext">${orderItem.quantity?string.number}</div>
+ <div class="tabletext">${orderItem.quantity?string.number}</div>
</td>
<#if maySelectItems?default("N") == "Y">
<td align="right" valign="top">
@@ -162,10 +162,10 @@
<td align="right" valign="top">
<#if workEfforts?exists>
<div class="tabletext"><@ofbizCurrency amount=localOrderReadHelper.getOrderItemTotal(orderItem)*rentalQuantity isoCode=currencyUomId/></div>
- <#else>
+ <#else>
<div class="tabletext"><@ofbizCurrency amount=localOrderReadHelper.getOrderItemTotal(orderItem) isoCode=currencyUomId/></div>
</#if>
- </td>
+ </td>
<#if maySelectItems?default("N") == "Y" && roleTypeId?if_exists == "PLACING_CUSTOMER">
<td> </td>
<td>
@@ -177,17 +177,19 @@
</tr>
<#-- now cancel reason and comment field -->
<#if maySelectItems?default("N") == "Y" && (orderHeader.statusId != "ORDER_SENT" && orderItem.statusId != "ITEM_COMPLETED" && orderItem.statusId != "ITEM_CANCELLED" && pickedQty == 0)>
- <tr align="right"><td colspan="7"><div class="tabletext"><b>${uiLabelMap.OrderReturnReason}</b>
- <select name="irm_${orderItem.orderItemSeqId}" class="selectBox">
- <option value=""> </option>
- <#list orderItemChangeReasons as reason>
- <option value="${reason.enumId}">${reason.get("description",locale)?default(reason.enumId)}</option>
- </#list>
- </select>
- <b>${uiLabelMap.CommonComments}</b>
- <input class="inputBox" type="text" name="icm_${orderItem.orderItemSeqId}" value="" size="30" maxlength="60"/></div></td>
- <td colspan="4" align="right"><a href="javascript:document.addCommonToCartForm.method='post';document.addCommonToCartForm.action='<@o...@ofbizUrl>';document.addCommonToCartForm.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a></td>
- </tr>
+ <tr align="right"><td colspan="7"><div class="tabletext"><b>${uiLabelMap.OrderReturnReason}</b>
+ <select name="irm_${orderItem.orderItemSeqId}" class="selectBox">
+ <option value=""> </option>
+ <#list orderItemChangeReasons as reason>
+ <option value="${reason.enumId}">${reason.get("description",locale)?default(reason.enumId)}</option>
+ </#list>
+ </select>
+ <b>${uiLabelMap.CommonComments}</b>
+ <input class="inputBox" type="text" name="icm_${orderItem.orderItemSeqId}" value="" size="30" maxlength="60"/></div></td>
+ <td colspan="4" align="right"><a href="javascript:document.addCommonToCartForm.method='post';document.addCommonToCartForm.action='<@o...@ofbizUrl>';document.addCommonToCartForm.submit()" class="buttontext">${uiLabelMap.CommonCancel}</a>
+ <input type="hidden" name="orderItemSeqId" value="${orderItem.orderItemSeqId}"/>
+ </td>
+ </tr>
</#if>
<#-- show info from workeffort if it was a rental item -->
<#if orderItem.orderItemTypeId == "RENTAL_ORDER_ITEM">
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl?rev=762149&r1=762148&r2=762149&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl Sun Apr 5 20:16:46 2009
@@ -17,7 +17,7 @@
under the License.
-->
<#if orderHeader?has_content>
- <form name="addCommonToCartForm" action="<@o...@ofbizUrl>" method="GET">
+ <form name="addCommonToCartForm" action="<@o...@ofbizUrl>" method="post">
<input type="hidden" name="add_all" value="false">
<input type="hidden" name="orderId" value="${orderHeader.orderId}">
${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")}