You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2012/04/26 20:26:57 UTC
svn commit: r1331011 - in /ofbiz/branches/release11.04/applications:
order/webapp/ordermgr/entry/cart/showcart.ftl
product/widget/catalog/LookupScreens.xml
Author: ashish
Date: Thu Apr 26 18:26:57 2012
New Revision: 1331011
URL: http://svn.apache.org/viewvc?rev=1331011&view=rev
Log:
Applied from trunk r1331010.
Bug fix - OFBIZ-4754 - Fixed fix me for ajax auto-completer for order entry process.
Fixed fixme for ajax auto-completer for showcart screen of order entry process.
Currently call_fieldlookup2 is used for the product lookup, auto completer is not supported via call_fieldlookup2 and it open a window instead of layered lookup.Need to use htmlTemplate.lookup field for the product lookup. Also removed the FIXME comment.
The FIXME issue was fixed in OFBIZ-4646, Now its working fine.
Thanks Nitesh, Deepak & Rishi!
Modified:
ofbiz/branches/release11.04/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
ofbiz/branches/release11.04/applications/product/widget/catalog/LookupScreens.xml
Modified: ofbiz/branches/release11.04/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/order/webapp/ordermgr/entry/cart/showcart.ftl?rev=1331011&r1=1331010&r2=1331011&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/order/webapp/ordermgr/entry/cart/showcart.ftl (original)
+++ ofbiz/branches/release11.04/applications/order/webapp/ordermgr/entry/cart/showcart.ftl Thu Apr 26 18:26:57 2012
@@ -78,14 +78,9 @@ under the License.
<table border="0">
<tr>
<td align="right"><div>${uiLabelMap.ProductProductId} :</div></td>
- <td><input type="text" size="25" name="add_product_id" value="${productId?if_exists}"/>
+ <td>
<span class='tabletext'>
- <a href="javascript:quicklookup(document.quickaddform.add_product_id)" class="buttontext">${uiLabelMap.OrderQuickLookup}</a>
- <a href="javascript:call_fieldlookup2(document.quickaddform.add_product_id,'<@ofbizUrl><#if orderType=="PURCHASE_ORDER">LookupSupplierProduct?partyId=${partyId?if_exists}<#e...@ofbizUrl>');">
- <img src="<@o...@ofbizContentUrl>" width="15" height="14" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"/>
- </a>
- <#-- FIXME Problem here: the input field is shared -->
- <#--if orderType=="PURCHASE_ORDER">
+ <#if orderType=="PURCHASE_ORDER">
<#if partyId?has_content>
<#assign fieldFormName="LookupSupplierProduct?partyId=${partyId}">
<#else>
@@ -94,7 +89,8 @@ under the License.
<#else>
<#assign fieldFormName="LookupProduct">
</#if>
- <@htmlTemplate.lookupField formName="quickaddform" name="add_product_id" id="add_product_id" fieldFormName="${fieldFormName}"/-->
+ <@htmlTemplate.lookupField formName="quickaddform" name="add_product_id" id="add_product_id" fieldFormName="${fieldFormName}"/>
+ <a href="javascript:quicklookup(document.quickaddform.add_product_id)" class="buttontext">${uiLabelMap.OrderQuickLookup}</a>
<a href="javascript:quicklookupGiftCertificate()" class="buttontext">${uiLabelMap.OrderAddGiftCertificate}</a>
<#if "PURCHASE_ORDER" == shoppingCart.getOrderType()>
<a href="javascript:showQohAtp()" class="buttontext">${uiLabelMap.ProductAtpQoh}</a>
Modified: ofbiz/branches/release11.04/applications/product/widget/catalog/LookupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/widget/catalog/LookupScreens.xml?rev=1331011&r1=1331010&r2=1331011&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/product/widget/catalog/LookupScreens.xml (original)
+++ ofbiz/branches/release11.04/applications/product/widget/catalog/LookupScreens.xml Thu Apr 26 18:26:57 2012
@@ -208,6 +208,7 @@ under the License.
<set field="queryString" from-field="result.queryString"/>
<set field="entityName" value="SupplierProductAndProduct"/>
<set field="searchFields" value="[productId, partyId, brandName, internalName]"/>
+ <set field="andCondition" value="${groovy: return org.ofbiz.entity.condition.EntityCondition.makeCondition(org.ofbiz.base.util.UtilMisc.toMap('partyId', parameters.partyId))}"/>
</actions>
<widgets>
<decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml">