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-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new 52a9baa1b Fixed: Remove leftover references from deleted shipping
carrier integrations (OFBIZ-7935) (#297)
52a9baa1b is described below
commit 52a9baa1b3c11dcacd010ad0c24909809919a9e6
Author: Mridul Pathak <[email protected]>
AuthorDate: Fri Jun 26 15:46:04 2026 +0530
Fixed: Remove leftover references from deleted shipping carrier
integrations (OFBIZ-7935) (#297)
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:
- Dead UspsMockApiServlet definition and mapping from birt plugin
web.xml
- Stale TODO comment referencing UPS/FedEx in ecommerce OrderHeader.ftl
---
birt/webapp/facility/WEB-INF/web.xml | 11 -----------
ecommerce/template/order/OrderHeader.ftl | 1 -
2 files changed, 12 deletions(-)
diff --git a/birt/webapp/facility/WEB-INF/web.xml
b/birt/webapp/facility/WEB-INF/web.xml
index 6528980cc..dd20360d2 100644
--- a/birt/webapp/facility/WEB-INF/web.xml
+++ b/birt/webapp/facility/WEB-INF/web.xml
@@ -93,21 +93,10 @@ under the License.
<servlet-class>org.apache.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
- <servlet>
- <description>Mock USPS Webtools API Servlet</description>
- <display-name>ShippingAPI</display-name>
- <servlet-name>ShippingAPI</servlet-name>
-
<servlet-class>org.apache.ofbiz.shipment.thirdparty.usps.UspsMockApiServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
<servlet-mapping>
<servlet-name>ControlServlet</servlet-name>
<url-pattern>/control/*</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>ShippingAPI</servlet-name>
- <url-pattern>/ShippingAPI.dll</url-pattern>
- </servlet-mapping>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
diff --git a/ecommerce/template/order/OrderHeader.ftl
b/ecommerce/template/order/OrderHeader.ftl
index 92d06efdb..caf25e7d2 100644
--- a/ecommerce/template/order/OrderHeader.ftl
+++ b/ecommerce/template/order/OrderHeader.ftl
@@ -314,7 +314,6 @@ under the License.
<#if trackingNumber?has_content ||
orderShipmentInfoSummaryList?has_content>
<li>
${uiLabelMap.OrderTrackingNumber}
- <#-- TODO: add links to UPS/FEDEX/etc based on carrier partyId
-->
<#if shipGroup.trackingNumber?has_content>
${shipGroup.trackingNumber}
</#if>
