LPD-25497 - refactor

modules/apps/commerce/commerce-product-api/bnd.bnd

@@ -1,6 +1,6 @@
 Bundle-Name: Liferay Commerce Product API
 Bundle-SymbolicName: com.liferay.commerce.product.api
-Bundle-Version: 88.2.1
+Bundle-Version: 88.3.0
 Export-Package:\
 	com.liferay.commerce.product.availability,\
 	com.liferay.commerce.product.catalog,\

modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/exception/CPDefinitionOptionRelException.java

@@ -0,0 +1,29 @@
+/**
+ * SPDX-FileCopyrightText: (c) 2025 Liferay, Inc. https://liferay.com
+ * SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
+ */
+package com.liferay.commerce.product.exception;
+
+import com.liferay.portal.kernel.exception.PortalException;
+
+/**
+ * @author Marco Leo
+ */
+public class CPDefinitionOptionRelException extends PortalException {
+
+	public CPDefinitionOptionRelException() {
+	}
+
+	public CPDefinitionOptionRelException(String msg) {
+		super(msg);
+	}
+
+	public CPDefinitionOptionRelException(String msg, Throwable throwable) {
+		super(msg, throwable);
+	}
+
+	public CPDefinitionOptionRelException(Throwable throwable) {
+		super(throwable);
+	}
+
+}

modules/apps/commerce/commerce-product-api/src/main/java/com/liferay/commerce/product/exception/CPInstanceOptionValueRelException.java

@@ -0,0 +1,29 @@
+/**
+ * SPDX-FileCopyrightText: (c) 2025 Liferay, Inc. https://liferay.com
+ * SPDX-License-Identifier: LGPL-2.1-or-later OR LicenseRef-Liferay-DXP-EULA-2.0.0-2023-06
+ */
+package com.liferay.commerce.product.exception;
+
+import com.liferay.portal.kernel.exception.PortalException;
+
+/**
+ * @author Marco Leo
+ */
+public class CPInstanceOptionValueRelException extends PortalException {
+
+	public CPInstanceOptionValueRelException() {
+	}
+
+	public CPInstanceOptionValueRelException(String msg) {
+		super(msg);
+	}
+
+	public CPInstanceOptionValueRelException(String msg, Throwable throwable) {
+		super(msg, throwable);
+	}
+
+	public CPInstanceOptionValueRelException(Throwable throwable) {
+		super(throwable);
+	}
+
+}

modules/apps/commerce/commerce-product-api/src/main/resources/com/liferay/commerce/product/exception/packageinfo

@@ -1 +1 @@
-version 13.5.0
+version 13.6.0

modules/apps/commerce/commerce-product-content-web/src/main/resources/META-INF/resources/product_publisher/render/list/entry/view.jsp

@@ -15,6 +15,8 @@ CPContentHelper cpContentHelper = (CPContentHelper)request.getAttribute(CPConten
 CPCatalogEntry cpCatalogEntry = cpContentHelper.getCPCatalogEntry(request);
 
 boolean hasMultipleCPSkus = cpContentHelper.hasMultipleCPSkus(cpCatalogEntry);
+
+boolean hasOptions = cpContentHelper.hasCPDefinitionOptionRels(cpCatalogEntry.getCPDefinitionId());
 %>
 
 <div class="cp-renderer">
@@ -101,7 +103,7 @@ boolean hasMultipleCPSkus = cpContentHelper.hasMultipleCPSkus(cpCatalogEntry);
 
 			<div>
 				<c:choose>
-					<c:when test="<%= !hasMultipleCPSkus && (cpSku != null) %>">
+					<c:when test="<%= (!hasMultipleCPSkus && (cpSku != null)) && !hasOptions %>">
 						<div class="mt-2">
 							<commerce-ui:add-to-cart
 								alignment="full-width"

modules/apps/commerce/commerce-product-service/service.xml

@@ -1542,6 +1542,7 @@
 		<exception>CPDefinitionMetaKeywords</exception>
 		<exception>CPDefinitionMetaTitle</exception>
 		<exception>CPDefinitionNameDefaultLanguage</exception>
+		<exception>CPDefinitionOptionRel</exception>
 		<exception>CPDefinitionOptionRelPriceType</exception>
 		<exception>CPDefinitionOptionSKUContributor</exception>
 		<exception>CPDefinitionOptionValueRelCPInstance</exception>
@@ -1563,6 +1564,7 @@
 		<exception>CPInstanceJson</exception>
 		<exception>CPInstanceMaxPriceValue</exception>
 		<exception>CPInstanceMinPriceValue</exception>
+		<exception>CPInstanceOptionValueRel</exception>
 		<exception>CPInstancePrice</exception>
 		<exception>CPInstancePromoPrice</exception>
 		<exception>CPInstanceReplacementCPInstanceUuid</exception>