Author: sichen
Date: Wed Jan 17 09:57:09 2007
New Revision: 497101
URL: http://svn.apache.org/viewvc?view=rev&rev=497101
Log:
OFBIZ-628: Add product category lookup to ordermgr's showcart for PO, fix some
issues in catalog mgr caused by new prod category lookups.
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/showcart.bsh
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/showcart.bsh
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/showcart.bsh?view=diff&rev=497101&r1=497100&r2=497101
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/showcart.bsh
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/showcart.bsh
Wed Jan 17 09:57:09 2007
@@ -49,10 +49,6 @@
context.put("contentPathPrefix", CatalogWorker.getContentPathPrefix(request));
-// get productCategory list
-productCategoryList = delegator.findAll("ProductCategory",
UtilMisc.toList("description", "productCategoryId"));
-context.put("productCategoryList", productCategoryList);
-
partyId = shoppingCart.getPartyId();
if (partyId != null && partyId.equals("_NA_")) partyId = null;
context.put("partyId", partyId);
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?view=diff&rev=497101&r1=497100&r2=497101
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Wed
Jan 17 09:57:09 2007
@@ -1414,9 +1414,17 @@
<view-map name="orderitemreportjasper" type="jasperreportspdf"
page="/reports/orderitemreport.xml" content-type="application/pdf"
encoding="none"/>
-->
+ <request-map uri="LookupProductCategory">
+ <security auth="true" https="true"/>
+ <response name="success" type="view" value="LookupProductCategory"/>
+ </request-map>
+
<!-- end of request mappings -->
<!-- View Mappings -->
+
+ <view-map name="LookupProductCategory" type="screen"
page="component://product/widget/catalog/LookupScreens.xml#LookupProductCategory"/>
+
<view-map name="error" page="/error/error.jsp"/>
<view-map name="main" type="screen"
page="component://order/widget/ordermgr/OrderViewScreens.xml#OrderHeaderListView"/>
<view-map name="login" type="screen"
page="component://order/widget/ordermgr/CommonScreens.xml#login"/>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl?view=diff&rev=497101&r1=497100&r2=497101
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcart.ftl Wed
Jan 17 09:57:09 2007
@@ -14,7 +14,6 @@
License for the specific language governing permissions and limitations
under the License.
-->
-
<script language="JavaScript" type="text/javascript">
function toggle(e) {
e.checked = !e.checked;
@@ -194,12 +193,8 @@
<form method="post" action="<@ofbizUrl>additem</@ofbizUrl>"
name="bulkworkaddform" style="margin: 0;">
<div class="tableheadtext">
${uiLabelMap.CommonOrderItemType}: <select
name="add_item_type" class="selectBox"><option
value="BULK_ORDER_ITEM">${uiLabelMap.ProductBulkItem}</option><option
value="WORK_ORDER_ITEM">${uiLabelMap.ProductWorkItem}</option></select>
- ${uiLabelMap.ProductProductCategory}: <select
name="add_category_id" class="selectBox">
- <option></option>
- <#list productCategoryList as productCategory>
- <option
value="${productCategory.productCategoryId}">${productCategory.description?default("No
Description")} [${productCategory.productCategoryId}]</option>
- </#list>
- </select>
+ <br>${uiLabelMap.ProductProductCategory}: <input
type="text" class="inputBox" name="add_category_id" size="20" maxlength="20"
value="${requestParameters.add_category_id?if_exists}"/>
+ <a
href="javascript:call_fieldlookup2(document.bulkworkaddform.add_category_id,'LookupProductCategory');"><img
src='/images/fieldlookup.gif' width='15' height='14' border='0' alt='Click
here For Field Lookup'/></a>
</div>
<div class="tableheadtext">
${uiLabelMap.CommonDescription}: <input type="text"
class="inputBox" size="25" name="add_item_description"
value="${requestParameters.add_product_id?if_exists}"/>
Modified:
ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl?view=diff&rev=497101&r1=497100&r2=497101
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl
Wed Jan 17 09:57:09 2007
@@ -19,7 +19,6 @@
<#assign unselectedClassName = "tabButton">
<#assign selectedClassMap = {page.tabButtonItem?default("void") :
"tabButtonSelected"}>
-<#if productCategory?has_content>
<div class="tabContainer">
<a
href="<@ofbizUrl>EditCategory?productCategoryId=${productCategoryId}</@ofbizUrl>"
class="${selectedClassMap.EditCategory?default(unselectedClassName)}">${uiLabelMap.ProductCategory}</a>
<a
href="<@ofbizUrl>EditCategoryContent?productCategoryId=${productCategoryId}</@ofbizUrl>"
class="${selectedClassMap.EditCategoryContent?default(unselectedClassName)}">${uiLabelMap.ProductCategoryContent}</a>
@@ -30,4 +29,3 @@
<a
href="<@ofbizUrl>EditCategoryParties?productCategoryId=${productCategoryId}</@ofbizUrl>"
class="${selectedClassMap.EditCategoryParties?default(unselectedClassName)}">${uiLabelMap.PartyParties}</a>
<a
href="<@ofbizUrl>EditCategoryAttributes?productCategoryId=${productCategoryId}</@ofbizUrl>"
class="${selectedClassMap.EditCategoryAttributes?default(unselectedClassName)}">${uiLabelMap.ProductAttributes}</a>
</div>
-</#if>
Modified:
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl?view=diff&rev=497101&r1=497100&r2=497101
==============================================================================
---
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
(original)
+++
ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
Wed Jan 17 09:57:09 2007
@@ -19,7 +19,7 @@
<#else>
<a
href="<@ofbizUrl>EditCategoryProducts?productCategoryId=${productCategoryId?if_exists}&activeOnly=true</@ofbizUrl>"
class="buttontext">${uiLabelMap.ProductActiveOnly}</a>
</#if>
- <#if productCategoryId?exists && productCategory?exists>
+
<#if (listSize > 0)>
<table border="0" cellpadding="2">
<tr>
@@ -171,4 +171,4 @@
<input type="submit"
value="${uiLabelMap.CommonRemoveExpired}">
</div>
</form>
- </#if>
+
Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?view=diff&rev=497101&r1=497100&r2=497101
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
(original)
+++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Wed Jan
17 09:57:09 2007
@@ -75,10 +75,6 @@
<set field="productCategoryId"
from-field="parameters.productCategoryId"/>
<entity-one entity-name="ProductCategory"
value-name="productCategory"/>
- <entity-condition entity-name="ProductCategory"
list-name="categoryList">
- <condition-expr field-name="showInSelect"
operator="not-equals" value="N"/>
- <order-by field-name="description"/>
- </entity-condition>
<entity-condition entity-name="ProductCategoryType"
list-name="productCategoryTypes">
<order-by field-name="description"/>
</entity-condition>
@@ -171,8 +167,6 @@
<set field="labelTitleProperty" value="ProductRollup"/>
<set field="productCategoryId"
from-field="parameters.showProductCategoryId"/>
- <entity-one entity-name="ProductCategory"
value-name="productCategory"/>
-
<entity-condition entity-name="ProductCategoryRollup"
list-name="currentProductCategoryRollups">
<condition-expr field-name="productCategoryId"
env-name="productCategoryId"/>
<order-by field-name="sequenceNum"/>
@@ -182,9 +176,6 @@
<order-by field-name="sequenceNum"/>
</entity-condition>
- <entity-condition entity-name="ProductCategory"
list-name="productCategoryCol">
- <order-by field-name="description"/>
- </entity-condition>
</actions>
<widgets>
<decorator-screen name="CommonCategoryDecorator">
@@ -206,12 +197,6 @@
<set field="labelTitleProperty" value="ProductProducts"/>
<set field="productCategoryId"
from-field="parameters.productCategoryId"/>
- <entity-one entity-name="ProductCategory"
value-name="productCategory"/>
-
- <entity-condition entity-name="ProductCategory"
list-name="productCategories">
- <condition-expr field-name="showInSelect"
operator="not-equals" value="N"/>
- <order-by field-name="description"/>
- </entity-condition>
<script
location="component://product/webapp/catalog/WEB-INF/actions/category/EditCategoryProducts.bsh"/>
</actions>
Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?view=diff&rev=497101&r1=497100&r2=497101
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Wed Jan
17 09:57:09 2007
@@ -34,10 +34,6 @@
<screen name="keywordsearchbox">
<section>
<actions>
- <entity-condition entity-name="ProductCategory"
list-name="productCategories">
- <condition-expr field-name="showInSelect"
operator="not-equals" value="N"/>
- <order-by field-name="description"/>
- </entity-condition>
<script
location="component://product/webapp/catalog/WEB-INF/actions/find/keywordsearchbox.bsh"/>
</actions>
<widgets>
