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 672b6d02e6 Fixed: Remove leftover carrier-specific shipping gateway
configuration code (OFBIZ-13447) (#1377)
672b6d02e6 is described below
commit 672b6d02e6776ad5875d1a7b95c7e4764a73e3e0
Author: Mridul Pathak <[email protected]>
AuthorDate: Fri Jun 26 16:13:18 2026 +0530
Fixed: Remove leftover carrier-specific shipping gateway configuration code
(OFBIZ-13447) (#1377)
Fixed: Remove leftover carrier-specific shipping gateway configuration
code
(OFBIZ-13447)
After PR #1335 removed the DHL, FedEx, UPS, and USPS Java carrier
integrations, carrier-specific entity definitions, services, UI forms,
screens, controller mappings, seed data, and UI labels remained. This
commit removes all of them while preserving the generic
ShipmentGatewayConfig and ShipmentGatewayConfigType infrastructure.
---
.../datamodel/data/seed/ProductSeedData.xml | 17 --
.../datamodel/entitydef/shipment-entitymodel.xml | 86 --------
applications/product/config/ProductUiLabels.xml | 179 ----------------
.../servicedef/services_shipmentgateway.xml | 62 ------
.../product/webapp/facility/WEB-INF/controller.xml | 24 ---
.../widget/facility/ShipmentGatewayConfigForms.xml | 231 ---------------------
.../facility/ShipmentGatewayConfigScreens.xml | 52 -----
7 files changed, 651 deletions(-)
diff --git a/applications/datamodel/data/seed/ProductSeedData.xml
b/applications/datamodel/data/seed/ProductSeedData.xml
index b9a861bd50..ee9d6cb219 100644
--- a/applications/datamodel/data/seed/ProductSeedData.xml
+++ b/applications/datamodel/data/seed/ProductSeedData.xml
@@ -756,23 +756,6 @@ under the License.
<StatusValidChange statusId="PICKITEM_PENDING"
statusIdTo="PICKITEM_COMPLETED" transitionName="Complete"/>
<StatusValidChange statusId="PICKITEM_PENDING"
statusIdTo="PICKITEM_CANCELLED" transitionName="Cancel"/>
- <!-- Shipment Gateway Config -->
- <ShipmentGatewayConfigType shipmentGatewayConfTypeId="SHIP_GATEWAY_DHL"
hasTable="Y" description="Shipment Gateway DHL"/>
- <ShipmentGatewayConfig shipmentGatewayConfigId="DHL_CONFIG"
shipmentGatewayConfTypeId="SHIP_GATEWAY_DHL" description="DHL Config"/>
- <ShipmentGatewayDhl shipmentGatewayConfigId="DHL_CONFIG"
connectUrl="https://eCommerce.airborne.com/ApiLandingTest.asp";
connectTimeout="60" headVersion="1.1" headAction="Request" accessUserId="YOUR
DHL ShipIT USER ID" accessPassword="YOUR DHL ShipIT ACCESS PASSWORD"
accessAccountNbr="YOUR DHL ShipIT ACCOUNT NUMBER" accessShippingKey="YOUR DHL
ShipIT SHIPPING KEY" labelImageFormat="PNG"
rateEstimateTemplate="api.schema.DHL"/>
-
- <ShipmentGatewayConfigType shipmentGatewayConfTypeId="SHIP_GATEWAY_FEDEX"
hasTable="Y" description="Shipment Gateway Fedex"/>
- <ShipmentGatewayConfig shipmentGatewayConfigId="FEDEX_CONFIG"
shipmentGatewayConfTypeId="SHIP_GATEWAY_FEDEX" description="Fedex Config"/>
- <ShipmentGatewayFedex shipmentGatewayConfigId="FEDEX_CONFIG"
connectUrl="https://gatewaybeta.fedex.com/GatewayDC";
connectSoapUrl="https://gatewaybeta.fedex.com:443/web-services";
connectTimeout="60" labelImageType="PNG" defaultDropoffType="REGULARPICKUP"
defaultPackagingType="YOURPACKNG"
templateShipment="component://product/template/shipment/FedexShipRequestTemplate.xml.ftl"
templateSubscription="component://product/template/shipment/FedexSubscriptionRequestTemplate.xml.ftl"
rateEsti [...]
-
- <ShipmentGatewayConfigType shipmentGatewayConfTypeId="SHIP_GATEWAY_UPS"
hasTable="Y" description="Shipment Gateway UPS"/>
- <ShipmentGatewayConfig shipmentGatewayConfigId="UPS_CONFIG"
shipmentGatewayConfTypeId="SHIP_GATEWAY_UPS" description="UPS Config"/>
- <ShipmentGatewayUps shipmentGatewayConfigId="UPS_CONFIG"
connectUrl="https://wwwcie.ups.com/ups.app/xml"; connectTimeout="60"
shipperNumber="12345E" billShipperAccountNumber="12345E"
accessLicenseNumber="TEST262223144CAT" accessUserId="REG111111"
accessPassword="REG111111" saveCertInfo="true"
saveCertPath="${sys:getProperty('ofbiz.home')}/runtime/output/upscert"
shipperPickupType="06" customerClassification="03" maxEstimateWeight="90"
minEstimateWeight="0.1" codAllowCod="true" codSurc [...]
-
- <ShipmentGatewayConfigType shipmentGatewayConfTypeId="SHIP_GATEWAY_USPS"
hasTable="Y" description="Shipment Gateway USPS"/>
- <ShipmentGatewayConfig shipmentGatewayConfigId="USPS_CONFIG"
shipmentGatewayConfTypeId="SHIP_GATEWAY_USPS" description="USPS Config"/>
- <ShipmentGatewayUsps shipmentGatewayConfigId="USPS_CONFIG"
connectUrl="http://production.shippingapis.com/ShippingAPITest.dll";
connectUrlLabels="http://production.shippingapis.com/ShippingAPITest.dll";
connectTimeout="60" accessUserId="000000000000" accessPassword="999999999999"
maxEstimateWeight="70" test="N"/>
-
<!-- Shipment Gateway custom methods by type -->
<CustomMethodType customMethodTypeId="SHIP_EST" hasTable="N"
description="Shipment Gateway rate estimate methods"/>
diff --git a/applications/datamodel/entitydef/shipment-entitymodel.xml
b/applications/datamodel/entitydef/shipment-entitymodel.xml
index ec63d84cf0..f6a103ef8b 100644
--- a/applications/datamodel/entitydef/shipment-entitymodel.xml
+++ b/applications/datamodel/entitydef/shipment-entitymodel.xml
@@ -929,92 +929,6 @@ under the License.
<key-map field-name="shipmentGatewayConfTypeId"
rel-field-name="shipmentGatewayConfTypeId"/>
</relation>
</entity>
- <entity entity-name="ShipmentGatewayDhl"
- package-name="org.apache.ofbiz.shipment.shipment"
- title="DHL Shipment Gateway Configuration">
- <field name="shipmentGatewayConfigId" type="id"></field>
- <field name="connectUrl" type="value"><description>DHL Connection
URL</description></field>
- <field name="connectTimeout" type="numeric"><description>Timeout in
seconds</description></field>
- <field name="headVersion" type="short-varchar"><description>Head version
attribute</description></field>
- <field name="headAction" type="value"><description>Head action
attribute</description></field>
- <field name="accessUserId" type="value" encrypt="true"><description>Your
DHL ShipIT User Id</description></field>
- <field name="accessPassword" type="value"
encrypt="true"><description>Your DHL ShipIT Access
Password</description></field>
- <field name="accessAccountNbr" type="value"
encrypt="true"><description>Your DHL ShipIT Account Number</description></field>
- <field name="accessShippingKey" type="value"
encrypt="true"><description>Your DHL ShipIT Shipping Key</description></field>
- <field name="labelImageFormat" type="short-varchar"><description>Label
image format</description></field>
- <field name="rateEstimateTemplate" type="value"><description>API Schema
Templates</description></field>
- <prim-key field="shipmentGatewayConfigId"/>
- <relation type="one" fk-name="SGDHL_SGC"
rel-entity-name="ShipmentGatewayConfig">
- <key-map field-name="shipmentGatewayConfigId"/>
- </relation>
- </entity>
- <entity entity-name="ShipmentGatewayFedex"
- package-name="org.apache.ofbiz.shipment.shipment"
- title="Fedex Shipment Gateway Configuration">
- <field name="shipmentGatewayConfigId" type="id"></field>
- <field name="connectUrl" type="value"><description>Fedex Connection
URL</description></field>
- <field name="connectSoapUrl" type="value"><description>Fedex Soap
Connection URL</description></field>
- <field name="connectTimeout" type="numeric"><description>Timeout in
seconds</description></field>
- <field name="accessAccountNbr" type="value"
encrypt="true"><description>Your Fedex account number</description></field>
- <field name="accessMeterNumber" type="value"
encrypt="true"><description>Your Fedex meter number</description></field>
- <field name="accessUserKey" type="value"
encrypt="true"><description>Your Fedex user credential key</description></field>
- <field name="accessUserPwd" type="value"
encrypt="true"><description>Your Fedex user credential
password</description></field>
- <field name="labelImageType" type="short-varchar"><description>Label
image type</description></field>
- <field name="defaultDropoffType" type="value"><description>Default
dropoff type</description></field>
- <field name="defaultPackagingType" type="value"><description>Default
packaging type</description></field>
- <field name="templateShipment" type="value"><description>Shipment
Template location</description></field>
- <field name="templateSubscription"
type="value"><description>Subscription Template location</description></field>
- <field name="rateEstimateTemplate" type="value"><description>FedEx API
Rate Estimate Template</description></field>
- <prim-key field="shipmentGatewayConfigId"/>
- <relation type="one" fk-name="SGFED_SGC"
rel-entity-name="ShipmentGatewayConfig">
- <key-map field-name="shipmentGatewayConfigId"/>
- </relation>
- </entity>
- <entity entity-name="ShipmentGatewayUps"
- package-name="org.apache.ofbiz.shipment.shipment"
- title="UPS Shipment Gateway Configuration">
- <field name="shipmentGatewayConfigId" type="id"></field>
- <field name="connectUrl" type="value"><description>UPS Connection
URL</description></field>
- <field name="connectTimeout" type="numeric"><description>Timeout in
seconds</description></field>
- <field name="shipperNumber" type="value"><description>UPS Shipper
Number</description></field>
- <field name="billShipperAccountNumber" type="value"><description>UPS
Bill Shipper Account Number</description></field>
- <field name="accessLicenseNumber" type="value"
encrypt="true"><description>UPS XPCI Access License Number</description></field>
- <field name="accessUserId" type="value" encrypt="true"><description>UPS
XPCI Access User ID</description></field>
- <field name="accessPassword" type="value"
encrypt="true"><description>UPS XPCI Access Password</description></field>
- <field name="saveCertInfo" type="short-varchar"><description>Setting to
save files needed for UPS certification (true|false)</description></field>
- <field name="saveCertPath" type="value"><description>UPS file
certificate path</description></field>
- <field name="shipperPickupType"
type="short-varchar"><description>Shipper Default Pickup
Type</description></field>
- <field name="customerClassification"
type="short-varchar"><description>Customer Classification</description></field>
- <field name="maxEstimateWeight" type="fixed-point"><description>Estimate
split into packages</description></field>
- <field name="minEstimateWeight" type="fixed-point"><description>Minimum
weight for a package</description></field>
- <field name="codAllowCod" type="value"><description>All shipment package
items are from orders which have been fully paid via
EXT_COD</description></field>
- <field name="codSurchargeAmount"
type="fixed-point"><description>Surcharge amount</description></field>
- <field name="codSurchargeCurrencyUomId"
type="short-varchar"><description>Surcharge currency</description></field>
- <field name="codSurchargeApplyToPackage"
type="short-varchar"><description>Surcharge amount will be applied to each
shipment package</description></field>
- <field name="codFundsCode" type="short-varchar"><description>The code
that indicates the type of funds used for the COD payment</description></field>
- <field name="defaultReturnLabelMemo" type="value"><description>Return
label email memo</description></field>
- <field name="defaultReturnLabelSubject" type="value"><description>Return
label subject</description></field>
- <prim-key field="shipmentGatewayConfigId"/>
- <relation type="one" fk-name="SGUPS_SGC"
rel-entity-name="ShipmentGatewayConfig">
- <key-map field-name="shipmentGatewayConfigId"/>
- </relation>
- </entity>
- <entity entity-name="ShipmentGatewayUsps"
- package-name="org.apache.ofbiz.shipment.shipment"
- title="USPS Shipment Gateway Configuration">
- <field name="shipmentGatewayConfigId" type="id"></field>
- <field name="connectUrl" type="value"><description>USPS Connection
URL</description></field>
- <field name="connectUrlLabels" type="value"><description>USPS Connection
URL for Labels</description></field>
- <field name="connectTimeout" type="numeric"><description>Timeout in
seconds</description></field>
- <field name="accessUserId" type="value" encrypt="true"><description>USPS
Access User ID</description></field>
- <field name="accessPassword" type="value"
encrypt="true"><description>USPS Access Password</description></field>
- <field name="maxEstimateWeight" type="numeric"><description>Estimate
split into packages</description></field>
- <field name="test" type="short-varchar"><description>Test/Production
mode</description></field>
- <prim-key field="shipmentGatewayConfigId"/>
- <relation type="one" fk-name="SGUSPS_SGC"
rel-entity-name="ShipmentGatewayConfig">
- <key-map field-name="shipmentGatewayConfigId"/>
- </relation>
- </entity>
<entity entity-name="ShipmentItem"
package-name="org.apache.ofbiz.shipment.shipment"
title="Shipment Item">
diff --git a/applications/product/config/ProductUiLabels.xml
b/applications/product/config/ProductUiLabels.xml
index 50fa26f662..d4e1694d21 100644
--- a/applications/product/config/ProductUiLabels.xml
+++ b/applications/product/config/ProductUiLabels.xml
@@ -9283,22 +9283,6 @@
<value xml:lang="zh">更新送货网关配置</value>
<value xml:lang="zh-TW">更新出貨閘道配置</value>
</property>
- <property key="PageTitleUpdateShipmentGatewayConfigDhl">
- <value xml:lang="de">Aktualisiere Versandportal Konfiguration
DHL</value>
- <value xml:lang="en">Update Shipment Gateway Config DHL</value>
- <value xml:lang="es">Actualizar configuración de envío Gateway
DHL</value>
- <value xml:lang="it">Aggiorna configurazione gateway spedizione
DHL</value>
- <value xml:lang="zh">更新敦豪快递送货网站配置</value>
- <value xml:lang="zh-TW">更新DHL出貨網站配置</value>
- </property>
- <property key="PageTitleUpdateShipmentGatewayConfigFedex">
- <value xml:lang="de">Aktualisiere Versandportal Konfiguration
FedEx</value>
- <value xml:lang="en">Update Shipment Gateway Config FedEx</value>
- <value xml:lang="es">Actualizar configuración de envío Gateway
FedEx</value>
- <value xml:lang="it">Aggiorna configurazione gateway spedizione
FedEx</value>
- <value xml:lang="zh">更新联邦快递送货网关配置</value>
- <value xml:lang="zh-TW">更新FedEx出貨閘道配置</value>
- </property>
<property key="PageTitleUpdateShipmentGatewayConfigType">
<value xml:lang="de">Aktualisiere Versandportal Konfigurations
Typ</value>
<value xml:lang="en">Update Shipment Gateway Config Type</value>
@@ -9307,22 +9291,6 @@
<value xml:lang="zh">更新送货网关配置类型</value>
<value xml:lang="zh-TW">更新出貨閘道配置類型</value>
</property>
- <property key="PageTitleUpdateShipmentGatewayConfigUps">
- <value xml:lang="de">Aktualisiere Versandportal Konfiguration
UPS</value>
- <value xml:lang="en">Update Shipment Gateway Config UPS</value>
- <value xml:lang="es">Actualizar configuración de Gateway de envío
UPS</value>
- <value xml:lang="it">Aggiorna configurazione gateway spedizione
UPS</value>
- <value xml:lang="zh">更新联合包裹送货网关配置</value>
- <value xml:lang="zh-TW">更新UPS出貨閘道配置</value>
- </property>
- <property key="PageTitleUpdateShipmentGatewayConfigUsps">
- <value xml:lang="de">Aktualisiere Versandportal Konfiguration
USPS</value>
- <value xml:lang="en">Update Shipment Gateway Config USPS</value>
- <value xml:lang="es">Actualizar configuración de Gateway de envío
USPS</value>
- <value xml:lang="it">Aggiorna configurazione gateway spedizione
USPS</value>
- <value xml:lang="zh">更新美国邮政送货网关配置</value>
- <value xml:lang="zh-TW">更新美國郵政出貨閘道配置</value>
- </property>
<property key="PageTitleViewFacilityContactMechanism">
<value xml:lang="de">Einrichtungs-Kontaktmechanismus anzeigen für
${facility.facilityName} [${facility.facilityId}]</value>
<value xml:lang="en">View Facility Contact Mechanisms for
${facility.facilityName} [${facility.facilityId}]</value>
@@ -9508,19 +9476,6 @@
<value xml:lang="zh">缩写</value>
<value xml:lang="zh-TW">縮寫</value>
</property>
- <property key="ProductAcceptUpsShipmentConfirmation">
- <value xml:lang="de">UPS Lieferbestätigung annehmen</value>
- <value xml:lang="en">Accept UPS Shipment Confirmation</value>
- <value xml:lang="es">Aceptar Confirmación de Envío UPS</value>
- <value xml:lang="fr">Confirmation de l'expédition UPS acceptée</value>
- <value xml:lang="it">Accetta Conferma Spedizione UPS</value>
- <value xml:lang="ja">UPS発送確認を受付</value>
- <value xml:lang="ro">Accepta Confirmarea Expedierii UPS</value>
- <value xml:lang="ru">Принять все подтверждения поставок UPS</value>
- <value xml:lang="th">ยอมรับการยืนยันการขนส่งสินค้า UPS</value>
- <value xml:lang="zh">接受UPS货运确认</value>
- <value xml:lang="zh-TW">接受UPS貨運確認</value>
- </property>
<property key="ProductAccountType">
<value xml:lang="de">Kontotyp</value>
<value xml:lang="en">Account Type</value>
@@ -13017,33 +12972,6 @@
<value xml:lang="zh">确认货运使用DHL</value>
<value xml:lang="zh-TW">確認貨運使用DHL</value>
</property>
- <property key="ProductConfirmShipmentFedex">
- <value xml:lang="de">Lieferung mit Fedex bestätigen</value>
- <value xml:lang="en">Confirm Shipment with Fedex</value>
- <value xml:lang="es">Confirmar envío por Fedex</value>
- <value xml:lang="fr">Confirmer l'expédition avec Fedex</value>
- <value xml:lang="it">Conferma Spedizione con Fedex</value>
- <value xml:lang="ja">Fedexで発送を確認</value>
- <value xml:lang="ru">Подтвердите доставку через Fedex</value>
- <value xml:lang="th">ยืนยันการขนส่งด้วย Fedex</value>
- <value xml:lang="vi">Xác nhận Vận chuyển bằng FedEX</value>
- <value xml:lang="zh">确认货运使用Fedex</value>
- <value xml:lang="zh-TW">確認貨運使用Fedex</value>
- </property>
- <property key="ProductConfirmShipmentUps">
- <value xml:lang="de">Lieferung mit UPS bestätigen</value>
- <value xml:lang="en">Confirm Shipment with UPS</value>
- <value xml:lang="es">Confirmar Envío por UPS</value>
- <value xml:lang="fr">Confirmer l'expédition avec UPS</value>
- <value xml:lang="it">Conferma Spedizione con UPS</value>
- <value xml:lang="ja">UPSで発送を確認</value>
- <value xml:lang="ro">Confirma Expedieri cu UPS</value>
- <value xml:lang="ru">Подтвердите доставку через UPS</value>
- <value xml:lang="th">ยืนยันการขนส่งด้วย UPS</value>
- <value xml:lang="vi">Xác nhận Vận chuyển bằng UPS</value>
- <value xml:lang="zh">确认货运使用UPS</value>
- <value xml:lang="zh-TW">確認貨運使用UPS</value>
- </property>
<property key="ProductContactTypeInformation">
<value xml:lang="de">Kontakttyp Informationen</value>
<value xml:lang="en">Contact Type Information</value>
@@ -27063,58 +26991,6 @@
<value xml:lang="zh">无法从数据库找出预估</value>
<value xml:lang="zh-TW">無法從資料庫找出預估</value>
</property>
- <property key="ProductShipmentFedexHomeAppointment">
- <value xml:lang="de">Verabredung</value>
- <value xml:lang="en">Appointment</value>
- <value xml:lang="es">Cita</value>
- <value xml:lang="fr">Rendez-vous</value>
- <value xml:lang="it">Appuntamento</value>
- <value xml:lang="ja">予約</value>
- <value xml:lang="ru">Встреча</value>
- <value xml:lang="th">การนัดหมาย</value>
- <value xml:lang="vi">Bổ nhiệm</value>
- <value xml:lang="zh">预约</value>
- <value xml:lang="zh-TW">預約</value>
- </property>
- <property key="ProductShipmentFedexHomeDateCertain">
- <value xml:lang="de">Bestimmtes Datum</value>
- <value xml:lang="en">Date Certain</value>
- <value xml:lang="es">Fecha cierta</value>
- <value xml:lang="fr">Date certaine</value>
- <value xml:lang="it">Data Sicura</value>
- <value xml:lang="ja">確定日</value>
- <value xml:lang="ru">Определенная дата</value>
- <value xml:lang="th">วันที่แน่นอน</value>
- <value xml:lang="vi">Ngày chính xác</value>
- <value xml:lang="zh">确定的日期</value>
- <value xml:lang="zh-TW">確定的日期</value>
- </property>
- <property key="ProductShipmentFedexHomeDeliveryTypeDate">
- <value xml:lang="de">Hausliefertyp/Datum (nur FedEx)</value>
- <value xml:lang="en">Home Delivery Type/Date (FedEx only)</value>
- <value xml:lang="es">Envío a domicilio tipo/fecha (sólo FedEx)</value>
- <value xml:lang="fr">Livraison à domicile Type/Date (FedEx
seulement)</value>
- <value xml:lang="it">Tipo Consegna a Casa/Data (solo FedEx)</value>
- <value xml:lang="ja">家庭配送種類/日 (FedExのみ)</value>
- <value xml:lang="ru">Тип доставки до дома/дата (только FedEx)</value>
- <value xml:lang="th">บริการส่งถึงบ้าน ประเภท/วันที่ (FedEx
only)</value>
- <value xml:lang="vi">Kiểu / Ngày nhận hàng tại nhà (chỉ với
FedEx)</value>
- <value xml:lang="zh">家庭送货类型/日期(仅适用于FedEx)</value>
- <value xml:lang="zh-TW">家庭送達類型/日期(僅適用於FedEx)</value>
- </property>
- <property key="ProductShipmentFedexHomeEvening">
- <value xml:lang="de">Abends</value>
- <value xml:lang="en">Evening</value>
- <value xml:lang="es">Tarde</value>
- <value xml:lang="fr">Soir</value>
- <value xml:lang="it">Serale</value>
- <value xml:lang="ja">夜</value>
- <value xml:lang="ru">Вечер</value>
- <value xml:lang="th">ตอนเย็น</value>
- <value xml:lang="vi">Tối</value>
- <value xml:lang="zh">傍晚</value>
- <value xml:lang="zh-TW">傍晚</value>
- </property>
<property key="ProductShipmentId">
<value xml:lang="de">Lieferung ID</value>
<value xml:lang="en">Shipment ID</value>
@@ -27509,19 +27385,6 @@
<value xml:lang="zh">货运类型标识</value>
<value xml:lang="zh-TW">貨運類型識別</value>
</property>
- <property key="ProductShipmentUpsResidential">
- <value xml:lang="de">Auslieferung Wohnhaus</value>
- <value xml:lang="en">Residential Delivery</value>
- <value xml:lang="es">Entrega residencial</value>
- <value xml:lang="fr">Livraison résidentielle</value>
- <value xml:lang="it">Consegna Residenziale</value>
- <value xml:lang="ja">戸口配送</value>
- <value xml:lang="ru">Доставка по месту жительства</value>
- <value xml:lang="th">ที่อยู่การขนส่ง</value>
- <value xml:lang="vi">Nhận tại nơi cư trú</value>
- <value xml:lang="zh">居住区投递</value>
- <value xml:lang="zh-TW">居住區投遞</value>
- </property>
<property key="ProductShipments">
<value xml:lang="de">Lieferungen</value>
<value xml:lang="en">Shipments</value>
@@ -29222,20 +29085,6 @@
<value xml:lang="zh">跟踪</value>
<value xml:lang="zh-TW">追蹤</value>
</property>
- <property key="ProductTrackUpsShipment">
- <value xml:lang="de">UPS Lieferung verfolgen</value>
- <value xml:lang="en">Track UPS Shipment</value>
- <value xml:lang="es">Seguimiento de envío UPS</value>
- <value xml:lang="fr">Suivi d'expédition via UPS</value>
- <value xml:lang="it">Tracciare Spedizione UPS</value>
- <value xml:lang="ja">UPS発送を追跡</value>
- <value xml:lang="ro">Trasare Expediere UPS</value>
- <value xml:lang="ru">Отследить поставку UPS</value>
- <value xml:lang="th">เส้นทางการขนส่งUPS</value>
- <value xml:lang="vi">Theo dõi chuyển vận UPS</value>
- <value xml:lang="zh">跟踪UPS货运</value>
- <value xml:lang="zh-TW">追蹤UPS貨運</value>
- </property>
<property key="ProductTracking">
<value xml:lang="de">Verfolgen</value>
<value xml:lang="en">Tracking</value>
@@ -30143,34 +29992,6 @@
<value xml:lang="nl">Sectie 1: Virtuelen en varianten</value>
<value xml:lang="zh">虚拟和可变</value>
</property>
- <property key="ProductVoidUpsShipment">
- <value xml:lang="de">Storniere UPS Lieferung</value>
- <value xml:lang="en">Void UPS Shipment</value>
- <value xml:lang="es">Envío vacío de UPS</value>
- <value xml:lang="fr">Absence d'expédition UPS</value>
- <value xml:lang="it">Spedizione UPS vuota</value>
- <value xml:lang="ja">無効UPS発送</value>
- <value xml:lang="ro">Expediere UPS goala</value>
- <value xml:lang="ru">Пустая поставка UPS</value>
- <value xml:lang="th">Void UPS Shipment</value>
- <value xml:lang="vi">Thủ tục chuyển vận UPS</value>
- <value xml:lang="zh">空UPS货运</value>
- <value xml:lang="zh-TW">空UPS貨運</value>
- </property>
- <property key="ProductVoidUpsShipmentConfirmation">
- <value xml:lang="de">Bestätigung UPS Lieferstornierung</value>
- <value xml:lang="en">Void UPS Shipment Confirmation</value>
- <value xml:lang="es">Confirmación del envío vacío de UPS</value>
- <value xml:lang="fr">Confirmation de l'absence d'expédition UPS</value>
- <value xml:lang="it">Conferma Spedizione UPS vuota</value>
- <value xml:lang="ja">無効UPS発送確認</value>
- <value xml:lang="ro">Confirma Expediere UPS goala</value>
- <value xml:lang="ru">Подтверждение пустой поставки UPS</value>
- <value xml:lang="th">Void UPS Shipment Confirmation</value>
- <value xml:lang="vi">Xác nhận thủ tục chuyển vận UPS</value>
- <value xml:lang="zh">空UPS货运确认</value>
- <value xml:lang="zh-TW">空UPS貨運確認</value>
- </property>
<property key="ProductWarehouseArea">
<value xml:lang="de">Lagerbereich</value>
<value xml:lang="en">Warehouse Area</value>
diff --git a/applications/product/servicedef/services_shipmentgateway.xml
b/applications/product/servicedef/services_shipmentgateway.xml
index cbdaebb388..80e507c61f 100644
--- a/applications/product/servicedef/services_shipmentgateway.xml
+++ b/applications/product/servicedef/services_shipmentgateway.xml
@@ -24,68 +24,6 @@ under the License.
<vendor>OFBiz</vendor>
<version>1.0</version>
- <service name="createShipmentGatewayDhl"
default-entity-name="ShipmentGatewayDhl" engine="entity-auto" invoke="create"
auth="true">
- <description>Create a ShipmentGatewayDhl</description>
- <auto-attributes include="pk" mode="IN" optional="false"/>
- <auto-attributes include="nonpk" mode="IN" optional="true"/>
- </service>
- <service name="updateShipmentGatewayDhl"
default-entity-name="ShipmentGatewayDhl" engine="entity-auto" invoke="update"
auth="true">
- <description>Update a ShipmentGatewayDhl record</description>
- <auto-attributes include="pk" mode="IN" optional="false"/>
- <auto-attributes include="nonpk" mode="IN" optional="true"/>
- </service>
- <service name="deleteShipmentGatewayDhl"
default-entity-name="ShipmentGatewayDhl" engine="entity-auto" invoke="delete"
auth="true">
- <description>Delete a ShipmentGatewayDhl</description>
- <auto-attributes include="pk" mode="IN" optional="false"/>
- </service>
-
- <service name="createShipmentGatewayFedex"
default-entity-name="ShipmentGatewayFedex" engine="entity-auto" invoke="create"
auth="true">
- <description>Create a ShipmentGatewayFedex</description>
- <auto-attributes include="pk" mode="IN" optional="false"/>
- <auto-attributes include="nonpk" mode="IN" optional="true"/>
- </service>
- <service name="updateShipmentGatewayFedex"
default-entity-name="ShipmentGatewayFedex" engine="entity-auto" invoke="update"
auth="true">
- <description>Update a ShipmentGatewayFedex record</description>
- <auto-attributes include="pk" mode="IN" optional="false"/>
- <auto-attributes include="nonpk" mode="IN" optional="true"/>
- </service>
- <service name="deleteShipmentGatewayFedex"
default-entity-name="ShipmentGatewayFedex" engine="entity-auto" invoke="delete"
auth="true">
- <description>Delete a ShipmentGatewayFedex</description>
- <auto-attributes include="pk" mode="IN" optional="false"/>
- </service>
-
- <!-- ShipmentGatewayUps services -->
- <service name="createShipmentGatewayUps"
default-entity-name="ShipmentGatewayUps" engine="entity-auto" invoke="create"
auth="true">
- <description>Create a ShipmentGatewayUps</description>
- <auto-attributes include="nonpk" mode="IN" optional="true"/>
- <auto-attributes include="pk" mode="INOUT" optional="false"/>
- </service>
- <service name="updateShipmentGatewayUps"
default-entity-name="ShipmentGatewayUps" engine="entity-auto" invoke="update"
auth="true">
- <description>Update a ShipmentGatewayUps</description>
- <auto-attributes include="pk" mode="IN" optional="false"/>
- <auto-attributes include="nonpk" mode="IN" optional="true"/>
- </service>
- <service name="deleteShipmentGatewayUps"
default-entity-name="ShipmentGatewayUps" engine="entity-auto" invoke="delete"
auth="true">
- <description>Delete a ShipmentGatewayUps</description>
- <auto-attributes include="pk" mode="IN" optional="false"/>
- </service>
-
- <!-- ShipmentGatewayUsps services -->
- <service name="createShipmentGatewayUsps"
default-entity-name="ShipmentGatewayUsps" engine="entity-auto" invoke="create"
auth="true">
- <description>Create a ShipmentGatewayUsps</description>
- <auto-attributes include="nonpk" mode="IN" optional="true"/>
- <auto-attributes include="pk" mode="INOUT" optional="false"/>
- </service>
- <service name="updateShipmentGatewayUsps"
default-entity-name="ShipmentGatewayUsps" engine="entity-auto" invoke="update"
auth="true">
- <description>Update a ShipmentGatewayUsps</description>
- <auto-attributes include="pk" mode="IN" optional="false"/>
- <auto-attributes include="nonpk" mode="IN" optional="true"/>
- </service>
- <service name="deleteShipmentGatewayUsps"
default-entity-name="ShipmentGatewayUsps" engine="entity-auto" invoke="delete"
auth="true">
- <description>Delete a ShipmentGatewayUsps</description>
- <auto-attributes include="pk" mode="IN" optional="false"/>
- </service>
-
<service name="createShipmentGatewayConfig" engine="entity-auto"
invoke="create" default-entity-name="ShipmentGatewayConfig" auth="true">
<description>Create a ShipmentGatewayConfig record</description>
<auto-attributes include="pk" mode="INOUT" optional="true"/>
diff --git a/applications/product/webapp/facility/WEB-INF/controller.xml
b/applications/product/webapp/facility/WEB-INF/controller.xml
index 5d840dbeb2..2a92c4f8cb 100644
--- a/applications/product/webapp/facility/WEB-INF/controller.xml
+++ b/applications/product/webapp/facility/WEB-INF/controller.xml
@@ -1197,30 +1197,6 @@ under the License.
<response name="success" type="view"
value="EditShipmentGatewayConfig"/>
<response name="error" type="view" value="EditShipmentGatewayConfig"/>
</request-map>
- <request-map uri="updateShipmentGatewayDhl">
- <security https="true" auth="true"/>
- <event type="service" invoke="updateShipmentGatewayDhl"/>
- <response name="success" type="view"
value="EditShipmentGatewayConfig"/>
- <response name="error" type="view" value="EditShipmentGatewayConfig"/>
- </request-map>
- <request-map uri="updateShipmentGatewayFedex">
- <security https="true" auth="true"/>
- <event type="service" invoke="updateShipmentGatewayFedex"/>
- <response name="success" type="view"
value="EditShipmentGatewayConfig"/>
- <response name="error" type="view" value="EditShipmentGatewayConfig"/>
- </request-map>
- <request-map uri="updateShipmentGatewayUps">
- <security https="true" auth="true"/>
- <event type="service" invoke="updateShipmentGatewayUps"/>
- <response name="success" type="view"
value="EditShipmentGatewayConfig"/>
- <response name="error" type="view" value="EditShipmentGatewayConfig"/>
- </request-map>
- <request-map uri="updateShipmentGatewayUsps">
- <security https="true" auth="true"/>
- <event type="service" invoke="updateShipmentGatewayUsps"/>
- <response name="success" type="view"
value="EditShipmentGatewayConfig"/>
- <response name="error" type="view" value="EditShipmentGatewayConfig"/>
- </request-map>
<request-map uri="FindShipmentGatewayConfigTypes">
<security https="true" auth="true"/>
<response name="success" type="view"
value="FindShipmentGatewayConfigTypes"/>
diff --git
a/applications/product/widget/facility/ShipmentGatewayConfigForms.xml
b/applications/product/widget/facility/ShipmentGatewayConfigForms.xml
index c554646d9b..35a29e4466 100644
--- a/applications/product/widget/facility/ShipmentGatewayConfigForms.xml
+++ b/applications/product/widget/facility/ShipmentGatewayConfigForms.xml
@@ -63,237 +63,6 @@ under the License.
<submit button-type="button"/>
</field>
</form>
- <form name="EditShipmentGatewayConfigDhl" type="single"
target="updateShipmentGatewayDhl" default-map-name="shipmentGatewayDhl"
header-row-style="header-row" default-table-style="basic-table">
- <auto-fields-entity entity-name="ShipmentGatewayDhl"
default-field-type="edit"/>
- <field name="shipmentGatewayConfigId"><hidden/></field>
- <field name="connectUrl"
title="${uiLabelMap.FacilityShipmentDhlConnectUrl}">
- <text size="60" maxlength="60"/>
- </field>
- <field name="connectTimeout"
title="${uiLabelMap.FacilityShipmentDhlConnectTimeout}">
- <text size="9" maxlength="9"/>
- </field>
- <field name="headVersion"
title="${uiLabelMap.FacilityShipmentDhlHeadVersion}">
- <text size="5" maxlength="5"/>
- </field>
- <field name="headAction"
title="${uiLabelMap.FacilityShipmentDhlHeadAction}">
- <drop-down>
- <option key="Request"
description="${uiLabelMap.FacilityShipmentDhlHeadActionRequest}"/>
- </drop-down>
- </field>
- <field name="accessUserId"
title="${uiLabelMap.FacilityShipmentDhlAccessUserId}">
- <text size="60" maxlength="60"/>
- </field>
- <field name="accessPassword"
title="${uiLabelMap.FacilityShipmentDhlAccessPassword}">
- <text size="60" maxlength="60"/>
- </field>
- <field name="accessAccountNbr"
title="${uiLabelMap.FacilityShipmentDhlAccessAccountNbr}">
- <text size="60" maxlength="60"/>
- </field>
- <field name="accessShippingKey"
title="${uiLabelMap.FacilityShipmentDhlAccessShippingKey}">
- <text size="60" maxlength="60"/>
- </field>
- <field name="labelImageFormat"
title="${uiLabelMap.FacilityShipmentDhlLabelImageFormat}">
- <drop-down>
- <option key="PNG"
description="${uiLabelMap.FacilityShipmentDhlLabelImageFormatPng}"/>
- </drop-down>
- </field>
- <field name="rateEstimateTemplate"
title="${uiLabelMap.FacilityShipmentDhlRateEstimate}">
- <drop-down>
- <option key="api.schema.DHL"
description="${uiLabelMap.FacilityShipmentDhlRateEstimate}"/>
- </drop-down>
- </field>
- <field name="submitButton" title="${uiLabelMap.CommonUpdate}"
widget-style="smallSubmit">
- <submit button-type="button"/>
- </field>
- </form>
- <form name="EditShipmentGatewayConfigFedex" type="single"
target="updateShipmentGatewayFedex" default-map-name="shipmentGatewayFedex"
header-row-style="header-row" default-table-style="basic-table">
- <auto-fields-entity entity-name="ShipmentGatewayFedex"
default-field-type="edit"/>
- <field name="shipmentGatewayConfigId"><hidden/></field>
- <field name="connectUrl"
title="${uiLabelMap.FacilityShipmentFedexConnectUrl}">
- <text size="60" maxlength="60"/>
- </field>
- <field name="connectSoapUrl"
title="${uiLabelMap.FacilityShipmentFedexConnectSoapUrl}">
- <text size="60" maxlength="60"/>
- </field>
- <field name="connectTimeout"
title="${uiLabelMap.FacilityShipmentFedexConnectTimeout}">
- <text size="9" maxlength="9"/>
- </field>
- <field name="accessAccountNbr"
title="${uiLabelMap.FacilityShipmentFedexAccessAccountNumber}">
- <text size="20" maxlength="20"/>
- </field>
- <field name="accessMeterNumber"
title="${uiLabelMap.FacilityShipmentFedexAccessMeterNumber}">
- <text size="20" maxlength="20"/>
- </field>
- <field name="accessUserKey"
title="${uiLabelMap.FacilityShipmentFedexAccessUserKey}">
- <text size="20" maxlength="20"/>
- </field>
- <field name="accessUserPwd"
title="${uiLabelMap.FacilityShipmentFedexAccessUserPwd}">
- <text size="20" maxlength="20"/>
- </field>
- <field name="labelImageType"
title="${uiLabelMap.FacilityShipmentFedexLabelImageType}">
- <drop-down>
- <option key="PDF"
description="${uiLabelMap.FacilityShipmentFedexLabelImageTypePdf}"/>
- <option key="PNG"
description="${uiLabelMap.FacilityShipmentFedexLabelImageTypePng}"/>
- </drop-down>
- </field>
- <field name="defaultDropoffType"
title="${uiLabelMap.FacilityShipmentFedexDropoffType}">
- <drop-down>
- <option key="REGULARPICKUP"
description="${uiLabelMap.FacilityShipmentFedexDropoffTypeRegularPickup}"/>
- <option key="REQUESTCOURIER"
description="${uiLabelMap.FacilityShipmentFedexDropoffTypeRequestCourier}"/>
- <option key="DROPBOX"
description="${uiLabelMap.FacilityShipmentFedexDropoffTypeDropBox}"/>
- <option key="BUSINESSSERVICECTR"
description="${uiLabelMap.FacilityShipmentFedexDropoffTypeBusinessService}"/>
- <option key="STATION"
description="${uiLabelMap.FacilityShipmentFedexDropoffTypeStation}"/>
- </drop-down>
- </field>
- <field name="defaultPackagingType"
title="${uiLabelMap.FacilityShipmentFedexPackingType}">
- <drop-down>
- <option key="FXENV"
description="${uiLabelMap.FacilityShipmentFedexPackingEnveloper}"/>
- <option key="FXENV_LGL"
description="${uiLabelMap.FacilityShipmentFedexPackingEnveloperLegal}"/>
- <option key="FXPAK_SM"
description="${uiLabelMap.FacilityShipmentFedexPackingPakSmall}"/>
- <option key="FXPAK_LRG"
description="${uiLabelMap.FacilityShipmentFedexPackingPakLarge}"/>
- <option key="FXBOX_SM"
description="${uiLabelMap.FacilityShipmentFedexPackingBoxSmall}"/>
- <option key="FXBOX_MED"
description="${uiLabelMap.FacilityShipmentFedexPackingBoxMedium}"/>
- <option key="FXBOX_LRG"
description="${uiLabelMap.FacilityShipmentFedexPackingBoxLarge}"/>
- <option key="FXTUBE"
description="${uiLabelMap.FacilityShipmentFedexPackingTube}"/>
- <option key="FX10KGBOX"
description="${uiLabelMap.FacilityShipmentFedexPackingBox10Kg}"/>
- <option key="FX25KGBOX"
description="${uiLabelMap.FacilityShipmentFedexPackingBox25Kg}"/>
- <option key="YOURPACKNG"
description="${uiLabelMap.FacilityShipmentFedexPackingYour}"/>
- </drop-down>
- </field>
- <field name="templateShipment"
title="${uiLabelMap.FacilityShipmentFedexShipmentTemplateLocation}">
- <text size="80" maxlength="80"/>
- </field>
- <field name="templateSubscription"
title="${uiLabelMap.FacilityShipmentFedexSubscriptionTemplateLocation}">
- <text size="80" maxlength="80"/>
- </field>
- <field name="rateEstimateTemplate"
title="${uiLabelMap.FacilityShipmentFedexRateEstimateTemplateLocation}">
- <text size="80" maxlength="80"/>
- </field>
- <field name="submitButton" title="${uiLabelMap.CommonUpdate}"
widget-style="smallSubmit">
- <submit button-type="button"/>
- </field>
- </form>
- <form name="EditShipmentGatewayConfigUps" type="single"
target="updateShipmentGatewayUps" default-map-name="shipmentGatewayUps"
header-row-style="header-row" default-table-style="basic-table">
- <auto-fields-entity entity-name="ShipmentGatewayUps"
default-field-type="edit"/>
- <field name="shipmentGatewayConfigId"><hidden/></field>
- <field name="connectUrl"
title="${uiLabelMap.FacilityShipmentUpsConnectUrl}">
- <text size="60" maxlength="60"/>
- </field>
- <field name="connectTimeout"
title="${uiLabelMap.FacilityShipmentUpsConnectTimeout}">
- <text size="9" maxlength="9"/>
- </field>
- <field name="shipperNumber"
title="${uiLabelMap.FacilityShipmentUpsShipperNumber}">
- <text size="20" maxlength="20"/>
- </field>
- <field name="billShipperAccountNumber"
title="${uiLabelMap.FacilityShipmentUpsBillShipperAccountNumber}">
- <text size="20" maxlength="20"/>
- </field>
- <field name="accessLicenseNumber"
title="${uiLabelMap.FacilityShipmentUpsAccessLicenseNumber}">
- <text size="20" maxlength="20"/>
- </field>
- <field name="accessUserId"
title="${uiLabelMap.FacilityShipmentUpsAccessUserId}">
- <text size="20" maxlength="20"/>
- </field>
- <field name="accessPassword"
title="${uiLabelMap.FacilityShipmentUpsAccessPassword}">
- <text size="20" maxlength="20"/>
- </field>
- <field name="saveCertInfo"
title="${uiLabelMap.FacilityShipmentUpsSaveCertInfo}">
- <drop-down>
- <option key="true" description="${uiLabelMap.CommonTrue}"/>
- <option key="false" description="${uiLabelMap.CommonFalse}"/>
- </drop-down>
- </field>
- <field name="saveCertPath"
title="${uiLabelMap.FacilityShipmentUpsSaveCertPath}">
- <text size="60" maxlength="60"/>
- </field>
- <field name="shipperPickupType"
title="${uiLabelMap.FacilityShipmentUpsShipperPickupType}">
- <drop-down>
- <option key="01"
description="${uiLabelMap.FacilityShipmentUpsPickupDaily}"/>
- <option key="03"
description="${uiLabelMap.FacilityShipmentUpsPickupCustomerCounter}"/>
- <option key="06"
description="${uiLabelMap.FacilityShipmentUpsPickupOneTime}"/>
- <option key="07"
description="${uiLabelMap.FacilityShipmentUpsPickupOnCallAir}"/>
- <option key="11"
description="${uiLabelMap.FacilityShipmentUpsPickupSuggestedRetailRates}"/>
- <option key="19"
description="${uiLabelMap.FacilityShipmentUpsPickupLetterCenter}"/>
- <option key="20"
description="${uiLabelMap.FacilityShipmentUpsPickupAirServiceCenter}"/>
- </drop-down>
- </field>
- <field name="customerClassification"
title="${uiLabelMap.FacilityShipmentUpsCustomerClassification}">
- <drop-down>
- <option key="01"
description="${uiLabelMap.FacilityShipmentUpsCustomerClassificationWholesale}"/>
- <option key="03"
description="${uiLabelMap.FacilityShipmentUpsCustomerClassificationOccasional}"/>
- <option key="04"
description="${uiLabelMap.FacilityShipmentUpsCustomerClassificationRetail}"/>
- </drop-down>
- </field>
- <field name="maxEstimateWeight"
title="${uiLabelMap.FacilityShipmentUpsMaxEstimateWeight}">
- <text size="9" maxlength="9"/>
- </field>
- <field name="minEstimateWeight"
title="${uiLabelMap.FacilityShipmentUpsMinEstimateWeight}">
- <text size="9" maxlength="9"/>
- </field>
- <field name="codAllowCod"
title="${uiLabelMap.FacilityShipmentUpsAllowCod}">
- <drop-down>
- <option key="true" description="${uiLabelMap.CommonTrue}"/>
- <option key="false" description="${uiLabelMap.CommonFalse}"/>
- </drop-down>
- </field>
- <field name="codSurchargeAmount"
title="${uiLabelMap.FacilityShipmentUpsSurchargeAmount}">
- <text size="9" maxlength="9"/>
- </field>
- <field name="codSurchargeCurrencyUomId"
title="${uiLabelMap.FacilityShipmentUpsSurchargeCurrencyUomId}">
- <text size="3" maxlength="3"/>
- </field>
- <field name="codSurchargeApplyToPackage"
title="${uiLabelMap.FacilityShipmentUpsSurchargeApplyToPackage}">
- <drop-down>
- <option key="all"
description="${uiLabelMap.FacilityShipmentUpsSurchargeAll}"/>
- <option key="first"
description="${uiLabelMap.FacilityShipmentUpsSurchargeFirst}"/>
- <option key="split"
description="${uiLabelMap.FacilityShipmentUpsSurchargeSplit}"/>
- <option key="none"
description="${uiLabelMap.FacilityShipmentUpsSurchargeNone}"/>
- </drop-down>
- </field>
- <field name="codFundsCode"
title="${uiLabelMap.FacilityShipmentUpsFundsCode}">
- <drop-down>
- <option key="0"
description="${uiLabelMap.FacilityShipmentUpsUnsecuredFundsAllowed}"/>
- <option key="8"
description="${uiLabelMap.FacilityShipmentUpsSecuredFundsOnly}"/>
- </drop-down>
- </field>
- <field name="defaultReturnLabelMemo"
title="${uiLabelMap.FacilityShipmentUpsDefaultReturnLabelMemo}">
- <text size="60" maxlength="60"/>
- </field>
- <field name="defaultReturnLabelSubject"
title="${uiLabelMap.FacilityShipmentUpsDefaultReturnLabelSubject}">
- <text size="60" maxlength="60"/>
- </field>
- <field name="submitButton" title="${uiLabelMap.CommonUpdate}"
widget-style="smallSubmit">
- <submit button-type="button"/>
- </field>
- </form>
- <form name="EditShipmentGatewayConfigUsps" type="single"
target="updateShipmentGatewayUsps" default-map-name="shipmentGatewayUsps"
header-row-style="header-row" default-table-style="basic-table">
- <auto-fields-entity entity-name="ShipmentGatewayUsps"
default-field-type="edit"/>
- <field name="shipmentGatewayConfigId"><hidden/></field>
- <field name="connectUrl"
title="${uiLabelMap.FacilityShipmentUspsConnectUrl}">
- <text size="60" maxlength="60"/>
- </field>
- <field name="connectTimeout"
title="${uiLabelMap.FacilityShipmentUspsConnectTimeout}">
- <text size="9" maxlength="9"/>
- </field>
- <field name="accessUserId"
title="${uiLabelMap.FacilityShipmentUspsAccessUserId}">
- <text size="20" maxlength="20"/>
- </field>
- <field name="accessPassword"
title="${uiLabelMap.FacilityShipmentUspsAccessPassword}">
- <text size="20" maxlength="20"/>
- </field>
- <field name="maxEstimateWeight"
title="${uiLabelMap.FacilityShipmentUspsMaxEstimateWeight}">
- <text size="9" maxlength="9"/>
- </field>
- <field name="test" title="${uiLabelMap.FacilityShipmentUspsTestMode}">
- <drop-down>
- <option key="Y" description="${uiLabelMap.CommonYes}"/>
- <option key="N" description="${uiLabelMap.CommonNo}"/>
- </drop-down>
- </field>
- <field name="submitButton" title="${uiLabelMap.CommonUpdate}"
widget-style="smallSubmit">
- <submit button-type="button"/>
- </field>
- </form>
<form name="FindShipmentGatewayConfigTypes" type="single"
target="FindShipmentGatewayConfigTypes" header-row-style="header-row"
default-table-style="basic-table">
<field name="shipmentGatewayConfTypeId"
title="${uiLabelMap.FacilityShipmentGatewayConfigTypeId}"><text-find
ignore-case="true"/></field>
<field name="description"
title="${uiLabelMap.FacilityShipmentGatewayConfigDescription}"><text-find
ignore-case="true"/></field>
diff --git
a/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml
b/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml
index 2458d9f385..42ea07015b 100644
--- a/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml
+++ b/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml
@@ -81,18 +81,6 @@ under the License.
<set field="tabButtonItem" value="shipmentGatewayConfigTab"/>
<set field="shipmentGatewayConfigId"
from-field="parameters.shipmentGatewayConfigId"/>
<entity-one entity-name="ShipmentGatewayConfig"
value-field="shipmentGatewayConfig"/>
- <entity-one entity-name="ShipmentGatewayDhl"
value-field="shipmentGatewayDhl">
- <field-map field-name="shipmentGatewayConfigId"
from-field="parameters.shipmentGatewayConfigId"/>
- </entity-one>
- <entity-one entity-name="ShipmentGatewayFedex"
value-field="shipmentGatewayFedex">
- <field-map field-name="shipmentGatewayConfigId"
from-field="parameters.shipmentGatewayConfigId"/>
- </entity-one>
- <entity-one entity-name="ShipmentGatewayUsps"
value-field="shipmentGatewayUsps">
- <field-map field-name="shipmentGatewayConfigId"
from-field="parameters.shipmentGatewayConfigId"/>
- </entity-one>
- <entity-one entity-name="ShipmentGatewayUps"
value-field="shipmentGatewayUps">
- <field-map field-name="shipmentGatewayConfigId"
from-field="parameters.shipmentGatewayConfigId"/>
- </entity-one>
</actions>
<widgets>
<decorator-screen name="GenericShipmentGatewayConfigDecorator">
@@ -100,46 +88,6 @@ under the License.
<screenlet
title="${uiLabelMap.PageTitleUpdateShipmentGatewayConfig}">
<include-form name="EditShipmentGatewayConfig"
location="component://product//widget/facility/ShipmentGatewayConfigForms.xml"/>
</screenlet>
- <section>
- <condition>
- <not><if-empty
field="shipmentGatewayDhl"/></not>
- </condition>
- <widgets>
- <screenlet
title="${uiLabelMap.PageTitleUpdateShipmentGatewayConfigDhl}">
- <include-form
name="EditShipmentGatewayConfigDhl"
location="component://product//widget/facility/ShipmentGatewayConfigForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- <section>
- <condition>
- <not><if-empty
field="shipmentGatewayFedex"/></not>
- </condition>
- <widgets>
- <screenlet
title="${uiLabelMap.PageTitleUpdateShipmentGatewayConfigFedex}">
- <include-form
name="EditShipmentGatewayConfigFedex"
location="component://product//widget/facility/ShipmentGatewayConfigForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- <section>
- <condition>
- <not><if-empty
field="shipmentGatewayUps"/></not>
- </condition>
- <widgets>
- <screenlet
title="${uiLabelMap.PageTitleUpdateShipmentGatewayConfigUps}">
- <include-form
name="EditShipmentGatewayConfigUps"
location="component://product//widget/facility/ShipmentGatewayConfigForms.xml"/>
- </screenlet>
- </widgets>
- </section>
- <section>
- <condition>
- <not><if-empty
field="shipmentGatewayUsps"/></not>
- </condition>
- <widgets>
- <screenlet
title="${uiLabelMap.PageTitleUpdateShipmentGatewayConfigUsps}">
- <include-form
name="EditShipmentGatewayConfigUsps"
location="component://product//widget/facility/ShipmentGatewayConfigForms.xml"/>
- </screenlet>
- </widgets>
- </section>
</decorator-section>
</decorator-screen>
</widgets>
