This is an automated email from the ASF dual-hosted git repository. golja pushed a commit to branch release24.09 in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit a3909b1d4cbc2d63ac56501d989d0c2b5516053b Author: Anahita Goljahani <[email protected]> AuthorDate: Mon Jun 22 18:13:01 2026 +0200 Fixed: Add order type check for gift message display logic in order view screen The commit hides gift-related information on the order view page for 'purchase' orders, as it is not relevant. (cherry picked from commit 17cce1c6c09ca07537185bc4b0b1e71e5229d446) --- applications/order/template/order/OrderShippingInfo.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/order/template/order/OrderShippingInfo.ftl b/applications/order/template/order/OrderShippingInfo.ftl index c0a92a0275..cbad6a256c 100644 --- a/applications/order/template/order/OrderShippingInfo.ftl +++ b/applications/order/template/order/OrderShippingInfo.ftl @@ -687,8 +687,8 @@ under the License. </#if> </td> </tr> - - <#if shipGroup.isGift?has_content && noShipment?default("false") != "true"> + + <#if orderHeader?has_content && "PURCHASE_ORDER" != orderHeader.orderTypeId && shipGroup.isGift?has_content && noShipment?default("false") != "true"> <tr><td colspan="3"><hr /></td></tr> <tr> <td class="label">
