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/02/07 16:56:58 UTC
svn commit: r741906 -
/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
Author: jleroux
Date: Sat Feb 7 15:56:57 2009
New Revision: 741906
URL: http://svn.apache.org/viewvc?rev=741906&view=rev
Log:
A modified patch from Karim Rahimpur "Quote item view improvements (when productId is not specified" (https://issues.apache.org/jira/browse/OFBIZ-2120) - OFBIZ-2120
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=741906&r1=741905&r2=741906&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl Sat Feb 7 15:56:57 2009
@@ -29,9 +29,9 @@
<table cellspacing="0" class="basic-table">
<tr valign="bottom" class="header-row">
<td width="10%">${uiLabelMap.ProductItem}</td>
- <td width="35%">${uiLabelMap.EcommerceProduct}</td>
+ <td width="35%">${uiLabelMap.ProductProduct}</td>
<td width="10%" align="right">${uiLabelMap.ProductQuantity}</td>
- <td width="10%" align="right">${uiLabelMap.OrderAmount}</td>
+ <td width="10%" align="right">${uiLabelMap.OrderSelAmount}</td>
<td width="10%" align="right">${uiLabelMap.OrderOrderQuoteUnitPrice}</td>
<td width="10%" align="right">${uiLabelMap.OrderAdjustments}</td>
<td width="10%" align="right">${uiLabelMap.CommonSubtotal}</td>
@@ -42,6 +42,8 @@
<#list quoteItems as quoteItem>
<#if quoteItem.productId?exists>
<#assign product = quoteItem.getRelatedOne("Product")>
+ <#else>
+ <#assign product = null> <#-- don't drag it along to the next iteration -->
</#if>
<#assign quoteItemAmount = quoteItem.quoteUnitPrice?default(0) * quoteItem.quantity?default(0) * quoteItem.selectedAmount?default(1)>
<#assign quoteItemAdjustments = quoteItem.getRelated("QuoteAdjustment")>
@@ -65,7 +67,13 @@
<div>
${(product.internalName)?if_exists}
<#if showQuoteManagementLinks?exists>
- <a href="/catalog/control/EditProduct?productId=${quoteItem.productId?if_exists}" class="buttontext">${quoteItem.productId?if_exists}</a>
+ <a href="/catalog/control/EditProduct?productId=${quoteItem.productId?if_exists}" class="buttontext">
+ <#if quoteItem.productId?exists>
+ ${quoteItem.productId}
+ <#else>
+ ${uiLabelMap.ProductCreateProduct}
+ </#if>
+ </a>
<#else>
<a href="<@o...@ofbizUrl>" class="buttontext">${quoteItem.productId?if_exists}</a>
</#if>