This is an automated email from the ASF dual-hosted git repository.
mridulpathak pushed a commit to branch release24.09
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release24.09 by this push:
new df0c294ca0 Fixed: ProductServices group-order, discontinuation, and
review regressions (OFBIZ-13537)
df0c294ca0 is described below
commit df0c294ca0b4b904ad9da2511db2e46fec391d59
Author: Mridul Pathak <[email protected]>
AuthorDate: Mon Sep 7 17:21:09 2026 +0530
Fixed: ProductServices group-order, discontinuation, and review regressions
(OFBIZ-13537)
- Fixed createJobForProductGroupOrder's inverted empty-check (if (jobId) ->
if (!jobId)), which had permanently disabled the group-order expiration job
since 2020
- Fixed discontinueProductSales reusing one condition (built with
productId) for both ProductCategoryMember and ProductAssoc, when the latter
needs productIdTo to expire the correct association direction
- Fixed countProductView falling into a duplicate-create() constraint
violation for a ProductCalculatedInfo row that exists with a null
totalTimesViewed, by restoring the existence-check branch condition and
coalescing null to 0 before adding
- Restored createProductReview's dropped "auto-approve a rating-only review
with no text" rule
- Quoted the unquoted ProductReviewErrorCouldNotChangeOrderStatusFromTo
identifier in setProductReviewStatus, which crashed every
invalid-status-transition rejection
---
.../product/product/ProductServicesScript.groovy | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git
a/applications/product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductServicesScript.groovy
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductServicesScript.groovy
index fac76d9bb0..5a03b964ee 100644
---
a/applications/product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductServicesScript.groovy
+++
b/applications/product/src/main/groovy/org/apache/ofbiz/product/product/product/ProductServicesScript.groovy
@@ -360,8 +360,12 @@ Map discontinueProductSales() {
delegator.storeByCondition('ProductCategoryMember',
[thruDate: nowTimestamp], condition)
// expire product from all associations going to it
+ assocCondition = new EntityConditionBuilder().AND {
+ EQUALS(productIdTo: product.productId)
+ EQUALS(thruDate: null)
+ }
delegator.storeByCondition('ProductAssoc',
- [thruDate: nowTimestamp], condition)
+ [thruDate: nowTimestamp], assocCondition)
return success()
}
@@ -369,8 +373,8 @@ Map countProductView() {
long weight = parameters.weight ?: 1L
GenericValue productCalculatedInfo =
from('ProductCalculatedInfo').where(parameters).queryOne()
- if (productCalculatedInfo?.totalTimesViewed) {
- productCalculatedInfo.totalTimesViewed += weight
+ if (productCalculatedInfo) {
+ productCalculatedInfo.totalTimesViewed =
(productCalculatedInfo.totalTimesViewed ?: 0L) + weight
productCalculatedInfo.store()
} else {
// go ahead and create it
@@ -403,6 +407,10 @@ Map createProductReview() {
if (productStore && productStore.autoApproveReviews == 'Y') {
newEntity.statusId = 'PRR_APPROVED'
}
+ // auto approve the review if it is just a rating and has no review text
+ if (!parameters.productReview) {
+ newEntity.statusId = 'PRR_APPROVED'
+ }
// create the new ProductReview
newEntity.productReviewId = delegator.getNextSeqId('ProductReview')
@@ -453,7 +461,7 @@ Map setProductReviewStatus() {
.where(statusId: productReview.statusId, statusIdTo:
parameters.statusId)
.queryCount() == 0) {
String errorMessage =
UtilProperties.getMessage('ProductErrorUiLabels',
- ProductReviewErrorCouldNotChangeOrderStatusFromTo,
parameters.locale)
+ 'ProductReviewErrorCouldNotChangeOrderStatusFromTo',
parameters.locale)
logError(errorMessage)
return error(errorMessage)
}
@@ -801,7 +809,7 @@ Map deleteProductGroupOrder() {
*/
Map createJobForProductGroupOrder() {
GenericValue productGroupOrder =
from('ProductGroupOrder').where(parameters).queryOne()
- if (productGroupOrder.jobId) {
+ if (!productGroupOrder.jobId) {
// Create RuntimeData For ProductGroupOrder
Map runtimeDataMap = [groupOrderId: parameters.groupOrderId]
XmlSerializer xmlSerializer = new XmlSerializer()
