COMMERCE-2329 Fixed widget errors on 7.2.x

liferay · Dec 12, 2019 · 9841b95 · 9841b95
1 parent 16f273d
commit 9841b95
Show file tree

Hide file tree

Showing 17 changed files with 570 additions and 375 deletions.
diff --git a/.../liferay/commerce/account/web/internal/display/context/CommerceAccountDisplayContext.java b/.../liferay/commerce/account/web/internal/display/context/CommerceAccountDisplayContext.java
@@ -354,6 +354,23 @@ public boolean hasCommerceAccountModelPermissions(String actionId)
 			getCurrentCommerceAccount(), actionId);
 	}
 
+	public boolean hasCommerceChannel() throws PortalException {
+		HttpServletRequest httpServletRequest =
+			_commerceAccountRequestHelper.getRequest();
+
+		CommerceContext commerceContext =
+			(CommerceContext)httpServletRequest.getAttribute(
+				CommerceWebKeys.COMMERCE_CONTEXT);
+
+		long commerceChannelId = commerceContext.getCommerceChannelId();
+
+		if (commerceChannelId > 0) {
+			return true;
+		}
+
+		return false;
+	}
+
 	public boolean hasManageCommerceAccountPermissions() {
 		if (PortalPermissionUtil.contains(
 				_commerceAccountRequestHelper.getPermissionChecker(),

diff --git a/commerce-account-web/src/main/resources/META-INF/resources/view.jsp b/commerce-account-web/src/main/resources/META-INF/resources/view.jsp
@@ -23,6 +23,11 @@ List<CommerceAccount> commerceAccounts = commerceAccountDisplayContext.getCommer
 %>
 
 <c:choose>
+	<c:when test="<%= !commerceAccountDisplayContext.hasCommerceChannel() %>">
+		<div class="alert alert-info mx-auto">
+			<liferay-ui:message key="this-site-does-not-have-a-channel" />
+		</div>
+	</c:when>
 	<c:when test="<%= commerceAccountDisplayContext.getCommerceSiteType() == CommerceAccountConstants.SITE_TYPE_B2C %>">
 		<liferay-util:include page="/edit_user.jsp" servletContext="<%= application %>" />
 	</c:when>

diff --git a/.../commerce/address/content/web/internal/display/context/CommerceAddressDisplayContext.java b/.../commerce/address/content/web/internal/display/context/CommerceAddressDisplayContext.java
@@ -18,6 +18,8 @@
 import com.liferay.commerce.account.util.CommerceAccountHelper;
 import com.liferay.commerce.address.content.web.internal.portlet.action.ActionHelper;
 import com.liferay.commerce.address.content.web.internal.portlet.configuration.CommerceAddressContentPortletInstanceConfiguration;
+import com.liferay.commerce.constants.CommerceWebKeys;
+import com.liferay.commerce.context.CommerceContext;
 import com.liferay.commerce.model.CommerceAddress;
 import com.liferay.commerce.model.CommerceCountry;
 import com.liferay.commerce.model.CommerceRegion;
@@ -281,6 +283,20 @@ public SearchContainer<CommerceAddress> getSearchContainer()
 		return _searchContainer;
 	}
 
+	public boolean hasCommerceChannel() throws PortalException {
+		CommerceContext commerceContext =
+			(CommerceContext)_httpServletRequest.getAttribute(
+				CommerceWebKeys.COMMERCE_CONTEXT);
+
+		long commerceChannelId = commerceContext.getCommerceChannelId();
+
+		if (commerceChannelId > 0) {
+			return true;
+		}
+
+		return false;
+	}
+
 	private final ActionHelper _actionHelper;
 	private final CommerceAccountHelper _commerceAccountHelper;
 	private CommerceAddress _commerceAddress;

diff --git a/commerce-address-content-web/src/main/resources/META-INF/resources/init.jsp b/commerce-address-content-web/src/main/resources/META-INF/resources/init.jsp
@@ -14,6 +14,8 @@
  */
 --%>
 
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
 <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
 
 <%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %><%@

diff --git a/commerce-address-content-web/src/main/resources/META-INF/resources/view.jsp b/commerce-address-content-web/src/main/resources/META-INF/resources/view.jsp
@@ -32,64 +32,73 @@ portletURL.setParameter("searchContainerId", "commerceAddresses");
 request.setAttribute("view.jsp-portletURL", portletURL);
 %>
 
-<liferay-ddm:template-renderer
-	className="<%= CommerceAddressContentPortlet.class.getName() %>"
-	contextObjects="<%= contextObjects %>"
-	displayStyle="<%= commerceAddressDisplayContext.getDisplayStyle() %>"
-	displayStyleGroupId="<%= commerceAddressDisplayContext.getDisplayStyleGroupId() %>"
-	entries="<%= commerceAddressSearchContainer.getResults() %>"
->
-	<div class="container-fluid-1280" id="<portlet:namespace />addressesContainer">
-		<aui:form action="<%= portletURL.toString() %>" cssClass="container-fluid-1280" method="post" name="fm">
-			<aui:input name="<%= Constants.CMD %>" type="hidden" value="<%= Constants.DELETE %>" />
-			<aui:input name="redirect" type="hidden" value="<%= portletURL.toString() %>" />
-
-			<div class="addresses-container" id="<portlet:namespace />entriesContainer">
-				<liferay-ui:search-container
-					id="commerceAddresses"
-					iteratorURL="<%= portletURL %>"
-					searchContainer="<%= commerceAddressSearchContainer %>"
-				>
-					<liferay-ui:search-container-row
-						className="com.liferay.commerce.model.CommerceAddress"
-						cssClass="entry-display-style"
-						keyProperty="commerceAddressId"
-						modelVar="commerceAddress"
-					>
-						<liferay-ui:search-container-column-text
-							href="<%= commerceAddressDisplayContext.getEditCommerceAddressURL(commerceAddress.getCommerceAddressId()) %>"
-							property="name"
-						/>
-
-						<liferay-ui:search-container-column-text
-							cssClass="table-cell-content"
-							property="street1"
-						/>
-
-						<liferay-ui:search-container-column-text
-							property="city"
-						/>
-
-						<liferay-ui:search-container-column-text
-							property="zip"
-						/>
-
-						<liferay-ui:search-container-column-jsp
-							cssClass="entry-action-column"
-							path="/address_action.jsp"
-						/>
-					</liferay-ui:search-container-row>
-
-					<liferay-ui:search-iterator
-						displayStyle="list"
-						markupView="lexicon"
-					/>
-				</liferay-ui:search-container>
+<c:choose>
+	<c:when test="<%= !commerceAddressDisplayContext.hasCommerceChannel() %>">
+		<div class="alert alert-info mx-auto">
+			<liferay-ui:message key="this-site-does-not-have-a-channel" />
+		</div>
+	</c:when>
+	<c:otherwise>
+		<liferay-ddm:template-renderer
+			className="<%= CommerceAddressContentPortlet.class.getName() %>"
+			contextObjects="<%= contextObjects %>"
+			displayStyle="<%= commerceAddressDisplayContext.getDisplayStyle() %>"
+			displayStyleGroupId="<%= commerceAddressDisplayContext.getDisplayStyleGroupId() %>"
+			entries="<%= commerceAddressSearchContainer.getResults() %>"
+		>
+			<div class="container-fluid-1280" id="<portlet:namespace />addressesContainer">
+				<aui:form action="<%= portletURL.toString() %>" cssClass="container-fluid-1280" method="post" name="fm">
+					<aui:input name="<%= Constants.CMD %>" type="hidden" value="<%= Constants.DELETE %>" />
+					<aui:input name="redirect" type="hidden" value="<%= portletURL.toString() %>" />
+
+					<div class="addresses-container" id="<portlet:namespace />entriesContainer">
+						<liferay-ui:search-container
+							id="commerceAddresses"
+							iteratorURL="<%= portletURL %>"
+							searchContainer="<%= commerceAddressSearchContainer %>"
+						>
+							<liferay-ui:search-container-row
+								className="com.liferay.commerce.model.CommerceAddress"
+								cssClass="entry-display-style"
+								keyProperty="commerceAddressId"
+								modelVar="commerceAddress"
+							>
+								<liferay-ui:search-container-column-text
+									href="<%= commerceAddressDisplayContext.getEditCommerceAddressURL(commerceAddress.getCommerceAddressId()) %>"
+									property="name"
+								/>
+
+								<liferay-ui:search-container-column-text
+									cssClass="table-cell-content"
+									property="street1"
+								/>
+
+								<liferay-ui:search-container-column-text
+									property="city"
+								/>
+
+								<liferay-ui:search-container-column-text
+									property="zip"
+								/>
+
+								<liferay-ui:search-container-column-jsp
+									cssClass="entry-action-column"
+									path="/address_action.jsp"
+								/>
+							</liferay-ui:search-container-row>
+
+							<liferay-ui:search-iterator
+								displayStyle="list"
+								markupView="lexicon"
+							/>
+						</liferay-ui:search-container>
+					</div>
+				</aui:form>
+
+				<aui:button-row>
+					<aui:button cssClass="btn-lg" href="<%= commerceAddressDisplayContext.getAddCommerceAddressURL() %>" name="addAddressButton" value='<%= LanguageUtil.get(request, "add-address") %>' />
+				</aui:button-row>
 			</div>
-		</aui:form>
-
-		<aui:button-row>
-			<aui:button cssClass="btn-lg" href="<%= commerceAddressDisplayContext.getAddCommerceAddressURL() %>" name="addAddressButton" value='<%= LanguageUtil.get(request, "add-address") %>' />
-		</aui:button-row>
-	</div>
-</liferay-ddm:template-renderer>
+		</liferay-ddm:template-renderer>
+	</c:otherwise>
+</c:choose>
diff --git a/...va/com/liferay/commerce/checkout/web/internal/display/context/CheckoutDisplayContext.java b/...va/com/liferay/commerce/checkout/web/internal/display/context/CheckoutDisplayContext.java
@@ -15,10 +15,13 @@
 package com.liferay.commerce.checkout.web.internal.display.context;
 
 import com.liferay.commerce.constants.CommerceCheckoutWebKeys;
+import com.liferay.commerce.constants.CommerceWebKeys;
+import com.liferay.commerce.context.CommerceContext;
 import com.liferay.commerce.model.CommerceOrder;
 import com.liferay.commerce.model.CommerceOrderItem;
 import com.liferay.commerce.util.CommerceCheckoutStep;
 import com.liferay.commerce.util.CommerceCheckoutStepServicesTracker;
+import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.portlet.LiferayPortletRequest;
 import com.liferay.portal.kernel.portlet.LiferayPortletResponse;
 import com.liferay.portal.kernel.util.ParamUtil;
@@ -31,6 +34,7 @@
 
 /**
  * @author Marco Leo
+ * @author Alessio Antonio Rendina
  */
 public class CheckoutDisplayContext {
 
@@ -104,6 +108,20 @@ public String getPreviousCheckoutStepName() throws Exception {
 		return commerceCheckoutStep.getName();
 	}
 
+	public boolean hasCommerceChannel() throws PortalException {
+		CommerceContext commerceContext =
+			(CommerceContext)_httpServletRequest.getAttribute(
+				CommerceWebKeys.COMMERCE_CONTEXT);
+
+		long commerceChannelId = commerceContext.getCommerceChannelId();
+
+		if (commerceChannelId > 0) {
+			return true;
+		}
+
+		return false;
+	}
+
 	public boolean isEmptyCommerceOrder() {
 		if (_commerceOrder == null) {
 			return true;
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,8 @@ @@
      */
     --%>
+    <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
     <%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %>
     <%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %><%@
@@ Expand Down @@