Author: nmalin
Date: Sat Jan 6 15:38:29 2018
New Revision: 1820409
URL: http://svn.apache.org/viewvc?rev=1820409&view=rev
Log:
Fixed: ProductPriceRuleCondition 'is Product' (enum:PRIP_PRODUCT_ID) don't
check the virtual product (OFBIZ-10149).
Modified:
ofbiz/branches/release16.11/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java
Modified:
ofbiz/branches/release16.11/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java?rev=1820409&r1=1820408&r2=1820409&view=diff
==============================================================================
---
ofbiz/branches/release16.11/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java
(original)
+++
ofbiz/branches/release16.11/applications/product/src/main/java/org/apache/ofbiz/product/price/PriceServices.java
Sat Jan 6 15:38:29 2018
@@ -1031,7 +1031,7 @@ public class PriceServices {
int compare = 0;
if
("PRIP_PRODUCT_ID".equals(productPriceCond.getString("inputParamEnumId"))) {
- compare =
productId.compareTo(productPriceCond.getString("condValue"));
+ compare = UtilMisc.toList(productId,
virtualProductId).contains(productPriceCond.getString("condValue"))? 0: 1;
} else if
("PRIP_PROD_CAT_ID".equals(productPriceCond.getString("inputParamEnumId"))) {
// if a ProductCategoryMember exists for this productId and the
specified productCategoryId
String productCategoryId = productPriceCond.getString("condValue");