OFBiz › OFBiz - Commits

svn commit: r778451 - in /ofbiz/trunk: applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ applications/product/data/ applications/product/entitydef/ applications/product/script/org/ofbiz/product/inventory/ applications/product/servicedef...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

mor-2

svn commit: r778451 - in /ofbiz/trunk: applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ applications/product/data/ applications/product/entitydef/ applications/product/script/org/ofbiz/product/inventory/ applications/product/servicedef...

Author: mor
Date: Mon May 25 16:37:23 2009
New Revision: 778451

URL: http://svn.apache.org/viewvc?rev=778451&view=rev
Log:
Adding back the feature to show/hide out of stock products on site. This new implementation is configurable through a new field showOutOfStockProducts (by default equal to Y) on
ProductStore. A new field lastInventoryCount on ProductFacility is also added and it is a mirror of availableToPromiseTotal of a product at a certain point of time and is
being updated every hour by a schedule service to reflect the current value of inventory count in the system.
If showOutOfStockProducts is equals to N and for a particular product lastInventoryCount is <= zero, then this particular product will not be shown on the site. If the inventory
count becomes +ve again then the product will be again available on the site, in minimum one hour time but could possibly take long depending on the inventory levels.

Patch from Ratnesh Upadhyay, part of OFBIZ-2480 (https://issues.apache.org/jira/browse/OFBIZ-2480).

Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy
ofbiz/trunk/applications/product/data/ProductScheduledServices.xml
ofbiz/trunk/applications/product/entitydef/entitymodel.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/inventory/InventoryServices.xml
ofbiz/trunk/applications/product/servicedef/services_facility.xml
ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy?rev=778451&r1=778450&r2=778451&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CategoryDetail.groovy Mon May 25 16:37:23 2009
@@ -27,6 +27,7 @@
import org.ofbiz.service.*;
import org.ofbiz.product.catalog.*;
import org.ofbiz.product.category.CategoryContentWrapper;
+import org.ofbiz.product.store.ProductStoreWorker;

productCategoryId = request.getAttribute("productCategoryId");
context.productCategoryId = productCategoryId;
@@ -59,7 +60,26 @@
catResult = dispatcher.runSync("getProductCategoryAndLimitedMembers", andMap);

productCategory = catResult.productCategory;
-context.productCategoryMembers = catResult.productCategoryMembers;
+productCategoryMembers = catResult.productCategoryMembers;
+
+// Prevents out of stock product to be displayed on site
+productStore = ProductStoreWorker.getProductStore(request);
+if(productStore) {
+ if("N".equals(productStore.showOutOfStockProducts)) {
+ productsInStock = [];
+ productCategoryMembers.each { productCategoryMember ->
+ productFacility = delegator.findOne("ProductFacility", [productId : productCategoryMember.productId, facilityId : productStore.inventoryFacilityId], true);
+ if(productFacility) {
+ if(productFacility.lastInventoryCount >= 1) {
+ productsInStock.add(productCategoryMember);
+ }
+ }
+ }
+ context.productCategoryMembers = productsInStock;
+ } else {
+ context.productCategoryMembers = productCategoryMembers;
+ }
+}
context.productCategory = productCategory;
context.viewIndex = catResult.viewIndex;
context.viewSize = catResult.viewSize;

Modified: ofbiz/trunk/applications/product/data/ProductScheduledServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/data/ProductScheduledServices.xml?rev=778451&r1=778450&r2=778451&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/data/ProductScheduledServices.xml (original)
+++ ofbiz/trunk/applications/product/data/ProductScheduledServices.xml Mon May 25 16:37:23 2009
@@ -21,6 +21,26 @@
<entity-engine-xml>
<JobSandbox jobId="8100" jobName="Purge Old Store Auto-Entered Promos" runTime="2000-01-01 00:00:00.000" serviceName="purgeOldStoreAutoPromos" poolId="pool" runAsUser="system" tempExprId="MIDNIGHT_DAILY" maxRecurrenceCount="-1"/>

+ <RecurrenceRule recurrenceRuleId="500" untilDateTime="" frequency="HOURLY" intervalNumber="1" countNumber="-1"/>
+ <RecurrenceInfo recurrenceInfoId="500" startDateTime="2008-05-14 22:00:00.000" recurrenceRuleId="500" recurrenceCount="0"/>
+ <RuntimeData runtimeDataId="8801">
+ <runtimeInfo><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+ <ofbiz-ser>
+ <map-HashMap>
+ <map-Entry>
+ <map-Key>
+ <std-String value="recurrenceInfoId"/>
+ </map-Key>
+ <map-Value>
+ <std-String value="500"/>
+ </map-Value>
+ </map-Entry>
+ </map-HashMap>
+ </ofbiz-ser>
+ ]]></runtimeInfo>
+ </RuntimeData>
+ <JobSandbox jobId="8801" jobName="Set Last Inventory Count on ProductFacility" runTime="2000-01-01 00:00:00.000" serviceName="setLastInventoryCount" runtimeDataId="8801" poolId="pool" runAsUser="system" recurrenceInfoId="500"/>
+


<ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveCCProcessor" paymentCustomMethodId="CC_AUTH_ALWAYSAPPROV"/>