COMMERCE-5977 Force activation only when coming from status scheduled

riccardo-alberti · Mar 5, 2021 · 72b8e30 · 72b8e30
1 parent 7deedb5
commit 72b8e30
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...ain/java/com/liferay/commerce/discount/service/impl/CommerceDiscountLocalServiceImpl.java b/...ain/java/com/liferay/commerce/discount/service/impl/CommerceDiscountLocalServiceImpl.java
@@ -951,7 +951,11 @@ public CommerceDiscount updateStatus(
 				commerceDiscount.setExpirationDate(null);
 			}
 
-			commerceDiscount.setActive(true);
+			if (commerceDiscount.getStatus() ==
+					WorkflowConstants.STATUS_SCHEDULED) {
+
+				commerceDiscount.setActive(true);
+			}
 		}
 
 		if (status == WorkflowConstants.STATUS_EXPIRED) {