From 8251619bea8cb317d5db5639f401b7a85d3f6756 Mon Sep 17 00:00:00 2001 From: Peter Richards Date: Tue, 1 Mar 2022 14:10:32 +0000 Subject: [PATCH] Updated Recent Shipments fragment --- .../commerce/dependencies/recent-shipments/index.html | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/commerce-fragment-contributor/src/main/resources/com/liferay/liferaybotics/fragment/collection/contributor/commerce/dependencies/recent-shipments/index.html b/modules/commerce-fragment-contributor/src/main/resources/com/liferay/liferaybotics/fragment/collection/contributor/commerce/dependencies/recent-shipments/index.html index 136562a..7a912e5 100644 --- a/modules/commerce-fragment-contributor/src/main/resources/com/liferay/liferaybotics/fragment/collection/contributor/commerce/dependencies/recent-shipments/index.html +++ b/modules/commerce-fragment-contributor/src/main/resources/com/liferay/liferaybotics/fragment/collection/contributor/commerce/dependencies/recent-shipments/index.html @@ -31,14 +31,17 @@ - [#if shipments?has_content] [#list shipments as item] [#assign sentTo - = item.fetchCommerceAddress() /] + [#if shipments?has_content] [#list shipments as item] ${item.getCommerceShipmentId()} + [#if item.fetchCommerceAddress()??] [#assign sentTo + = item.fetchCommerceAddress() /] ${(sentTo.street1??)?then(sentTo.street1 + ', ' + sentTo.street2,sentTo.street2)},
${sentTo.city},${sentTo.zip} - [#if item.getStatus()==0] - + + [#else] + + [/#if] [#if item.getStatus()==0] Processing [#elseif item.getStatus()==3]