(ofbiz-framework) branch trunk updated: Fixed: Remove leftover references from deleted shipping carrier integrations (OFBIZ-7935)

[mridulpathak]

This is an automated email from the ASF dual-hosted git repository.

mridulpathak pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 371d00ba25 Fixed: Remove leftover references from deleted shipping 
carrier integrations (OFBIZ-7935)
371d00ba25 is described below

commit 371d00ba250e1b58a72a5771739698d6bbaff3cf
Author: Mridul Pathak <mridul.pat...@hotwaxsystems.com>
AuthorDate: Tue Jun 23 17:08:56 2026 +0530

    Fixed: Remove leftover references from deleted shipping carrier 
integrations (OFBIZ-7935)
    
    Follow-up cleanup after PR #1335 removed DHL, FedEx, UPS, and USPS shipping
    carrier integrations. Removes:
    - Orphaned </#if> in ReturnLinks.ftl caused by incomplete UPS block removal
    - Stale UPS comment in OrderView.groovy
    - Stale TODO comments referencing UPS/FedEx in OrderShippingInfo.ftl
      and OrderHeaderInfo.ftl
---
 .../groovy/org/apache/ofbiz/order/order/OrderView.groovy  |  4 ----
 .../order/template/entry/order/OrderHeaderInfo.ftl        |  1 -
 applications/order/template/order/OrderShippingInfo.ftl   |  1 -
 applications/order/template/return/ReturnLinks.ftl        | 15 ---------------
 4 files changed, 21 deletions(-)

diff --git 
a/applications/order/src/main/groovy/org/apache/ofbiz/order/order/OrderView.groovy
 
b/applications/order/src/main/groovy/org/apache/ofbiz/order/order/OrderView.groovy
index 602cfb91c8..c688d2bedb 100644
--- 
a/applications/order/src/main/groovy/org/apache/ofbiz/order/order/OrderView.groovy
+++ 
b/applications/order/src/main/groovy/org/apache/ofbiz/order/order/OrderView.groovy
@@ -532,10 +532,6 @@ if (orderItems) {
     context.orderItem = orderItem
 }
 
-// getting online ship estimates corresponding to this Order from UPS when 
"Hold" button will be clicked, when user packs from weight package screen.
-// This case comes when order's shipping amount is  more then or less than 
default percentage (defined in shipment.properties)
-// of online UPS shipping amount.
-
 shipments = from('Shipment').where('primaryOrderId', orderId, 'statusId', 
'SHIPMENT_PICKED').queryList()
 if (shipments) {
     pickedShipmentId = EntityUtil.getFirst(shipments).shipmentId
diff --git a/applications/order/template/entry/order/OrderHeaderInfo.ftl 
b/applications/order/template/entry/order/OrderHeaderInfo.ftl
index 4a29c0539a..51494235a9 100644
--- a/applications/order/template/entry/order/OrderHeaderInfo.ftl
+++ b/applications/order/template/entry/order/OrderHeaderInfo.ftl
@@ -101,7 +101,6 @@ under the License.
                 </td>
                 <td width="5">&nbsp;</td>
                 <td valign="top" width="80%">
-                    <#-- TODO: add links to UPS/FEDEX/etc based on carrier 
partyId  -->
                     <div>${trackingNumber}</div>
                 </td>
             </tr>
diff --git a/applications/order/template/order/OrderShippingInfo.ftl 
b/applications/order/template/order/OrderShippingInfo.ftl
index 85529a0bd3..eb3a3a0239 100644
--- a/applications/order/template/order/OrderShippingInfo.ftl
+++ b/applications/order/template/order/OrderShippingInfo.ftl
@@ -555,7 +555,6 @@ under the License.
                 <span 
class="label">&nbsp;${uiLabelMap.OrderTrackingNumber}</span>
               </td>
               <td>
-                <#-- TODO: add links to UPS/FEDEX/etc based on carrier partyId 
 -->
                 <#if shipGroup.trackingNumber?has_content>
                   ${shipGroup.trackingNumber}
                 </#if>
diff --git a/applications/order/template/return/ReturnLinks.ftl 
b/applications/order/template/return/ReturnLinks.ftl
index bc7712d46f..055d74c61f 100644
--- a/applications/order/template/return/ReturnLinks.ftl
+++ b/applications/order/template/return/ReturnLinks.ftl
@@ -43,21 +43,6 @@ under the License.
           <#assign partyId = "${(returnHeader.fromPartyId)!}"/>
           <li><a 
href="<@ofbizUrl>setOrderCurrencyAgreementShipDates?partyId=${partyId!}&amp;originOrderId=${orderId!}</@ofbizUrl>"
 class="buttontext">${uiLabelMap.OrderCreateExchangeOrder} 
${uiLabelMap.CommonFor} ${orderId!}</a></li>
         </#if>
-        <#if returnHeader.statusId?has_content && "RETURN_ACCEPTED" == 
returnHeader.statusId>
-          <#assign returnItems = 
EntityQuery.use(delegator).from("ReturnItem").where("returnId", 
returnId!).queryList()!/>
-          <#if returnItems?has_content>
-            <#assign orderId = 
(Static["org.apache.ofbiz.entity.util.EntityUtil"].getFirst(returnItems)).getString("orderId")/>
-            <#assign shipGroupAssoc = 
EntityQuery.use(delegator).from("OrderItemShipGroupAssoc").where("orderId", 
orderId!).queryFirst()!/>
-            <#assign shipGroup = delegator.findOne("OrderItemShipGroup", 
{"orderId" : orderId, "shipGroupSeqId" : shipGroupAssoc.shipGroupSeqId}, false)>
-            <#if shipGroup?? && shipGroup.shipmentMethodTypeId != 
"NO_SHIPPING">
-              <#assign shipGroupShipment = 
EntityQuery.use(delegator).from("Shipment").where("primaryOrderId", 
shipGroup.orderId!, "primaryShipGroupSeqId", 
shipGroup.shipGroupSeqId!).queryFirst()! />
-                <#if shipGroupShipment??>
-                <#assign shipmentRouteSegment = 
EntityQuery.use(delegator).from("ShipmentRouteSegment").where("shipmentId", 
shipGroupShipment.shipmentId!).queryFirst()!>
-                </#if>
-              </#if>
-            </#if>
-          </#if>
-        </#if>
       </#if>
           </ul>
         </li>