Merge remote-tracking branch 'gl_magento2ce/AC-9653' into UPS_AC9653_OCT_22_2023

glo05363 · glo05363 · commit e7df0c2aa701 · 2023-11-10T15:52:36.000+05:30
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
@@ -1538,7 +1538,7 @@ protected function _getCgiTracking($trackings)
      */
     protected function _getXmlTracking($trackings)
     {
-        $url = $this->getConfigData('tracking_xml_url');
+        $url = $this->getConfigData('tracking_url');
 
         /** @var HttpResponseDeferredInterface[] $trackingResponses */
         $trackingResponses = [];
diff --git a/app/code/Magento/Ups/Test/Mftf/Section/AdminShippingMethodsUpsSection.xml b/app/code/Magento/Ups/Test/Mftf/Section/AdminShippingMethodsUpsSection.xml
@@ -25,7 +25,6 @@
         <element name="carriersUPSShipmentRequestType" type="input" selector="#carriers_ups_shipment_requesttype_inherit"/>
         <element name="carriersUPSContainer" type="input" selector="#carriers_ups_container_inherit"/>
         <element name="carriersUPSDestType" type="input" selector="#carriers_ups_dest_type_inherit"/>
-        <element name="carriersUPSTrackingXmlUrl" type="input" selector="#carriers_ups_tracking_xml_url_inherit"/>
         <element name="carriersUPSTrackingUrl" type="input" selector="#carriers_ups_tracking_url_inherit"/>
         <element name="carriersUPSUnitOfMeasure" type="input" selector="#carriers_ups_unit_of_measure_inherit"/>
         <element name="carriersUPSMaxPackageWeight" type="input" selector="#carriers_ups_max_package_weight_inherit"/>
diff --git a/app/code/Magento/Ups/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml b/app/code/Magento/Ups/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml
@@ -74,7 +74,7 @@
 			<actualResult type="const">$grabUPSDestTypeDisabled</actualResult>
 			<expectedResult type="string">true</expectedResult>
         </assertEquals>
-        <grabAttributeFrom selector="{{AdminShippingMethodsUpsSection.carriersUPSTrackingXmlUrl}}" userInput="disabled" stepKey="grabUPSTrackingUrlDisabled"/>
+        <grabAttributeFrom selector="{{AdminShippingMethodsUpsSection.carriersUPSTrackingUrl}}" userInput="disabled" stepKey="grabUPSTrackingUrlDisabled"/>
         <assertEquals stepKey="assertUPSTrackingUrlDisabled">
 			<actualResult type="const">$grabUPSTrackingUrlDisabled</actualResult>
 			<expectedResult type="string">true</expectedResult>
diff --git a/app/code/Magento/Ups/etc/adminhtml/system.xml b/app/code/Magento/Ups/etc/adminhtml/system.xml
@@ -102,7 +102,7 @@
                 <field id="title" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Title</label>
                 </field>
-                <field id="tracking_xml_url" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" canRestore="1">
+                <field id="tracking_url" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" canRestore="1">
                     <label>Tracking XML URL</label>
                     <backend_model>Magento\Ups\Model\Config\Backend\UpsUrl</backend_model>
                 </field>
diff --git a/app/code/Magento/Ups/etc/config.xml b/app/code/Magento/Ups/etc/config.xml
@@ -26,7 +26,7 @@
                 <model>Magento\Ups\Model\Carrier</model>
                 <pickup>CC</pickup>
                 <title>United Parcel Service</title>
-                <tracking_xml_url>https://onlinetools.ups.com/ups.app/xml/Track</tracking_xml_url>
+                <tracking_url>https://onlinetools.ups.com/ups.app/xml/Track</tracking_url>
                 <tracking_rest_url>https://wwwcie.ups.com/api/track/</tracking_rest_url>
                 <unit_of_measure>LBS</unit_of_measure>
                 <username backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
diff --git a/app/code/Magento/Ups/etc/di.xml b/app/code/Magento/Ups/etc/di.xml
@@ -12,7 +12,7 @@
                 <item name="carriers/ups/username" xsi:type="string">1</item>
                 <item name="carriers/ups/password" xsi:type="string">1</item>
                 <item name="carriers/ups/access_license_number" xsi:type="string">1</item>
-                <item name="carriers/ups/tracking_xml_url" xsi:type="string">1</item>
+                <item name="carriers/ups/tracking_url" xsi:type="string">1</item>
                 <item name="carriers/ups/tracking_rest_url" xsi:type="string">1</item>
                 <item name="carriers/ups/gateway_xml_url" xsi:type="string">1</item>
                 <item name="carriers/ups/gateway_rest_url" xsi:type="string">1</item>
diff --git a/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml b/app/code/Magento/Ups/view/adminhtml/templates/system/shipping/carrier_config.phtml
@@ -91,7 +91,7 @@ require(["prototype"], function(){
             this.originShipmentTitle = '';
             this.allowedMethodsId = 'carriers_ups_allowed_methods';
             this.freeShipmentId = 'carriers_ups_free_method';
-            this.onlyUpsXmlElements = ['carriers_ups_gateway_xml_url','carriers_ups_tracking_xml_url',
+            this.onlyUpsXmlElements = ['carriers_ups_gateway_xml_url','carriers_ups_tracking_url',
                 'carriers_ups_username','carriers_ups_password','carriers_ups_access_license_number',
                 'carriers_ups_origin_shipment','carriers_ups_negotiated_active','carriers_ups_shipper_number',
                 'carriers_ups_mode_xml','carriers_ups_include_taxes'];
diff --git a/app/code/Magento/Usps/Test/Mftf/Section/AdminShippingMethodUSPSSection.xml b/app/code/Magento/Usps/Test/Mftf/Section/AdminShippingMethodUSPSSection.xml
@@ -20,7 +20,6 @@
         <element name="carriersUSPSContainer" type="input" selector="#carriers_usps_container_inherit"/>
         <element name="carriersUSPSSize" type="input" selector="#carriers_usps_size_inherit"/>
         <element name="carriersUSPSDestType" type="input" selector="#carriers_usps_machinable_inherit"/>
-        <element name="carriersUSPSXmlMachinable" type="input" selector="#carriers_ups_tracking_xml_url_inherit"/>
         <element name="carriersUSPSMachinable" type="input" selector="#carriers_ups_tracking_url_inherit"/>
         <element name="carriersUSPSMaxPackageWeight" type="input" selector="#carriers_usps_max_package_weight_inherit"/>
         <element name="carriersUSPSHandlingType" type="input" selector="#carriers_usps_handling_type_inherit"/>
diff --git a/app/code/Magento/Usps/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml b/app/code/Magento/Usps/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml
@@ -64,7 +64,7 @@
 			<actualResult type="const">$grabUSPSDestTypeDisabled</actualResult>
 			<expectedResult type="string">true</expectedResult>
         </assertEquals>
-        <grabAttributeFrom selector="{{AdminShippingMethodUSPSSection.carriersUSPSXmlMachinable}}" userInput="disabled" stepKey="grabUSPSMachinableDisabled"/>
+        <grabAttributeFrom selector="{{AdminShippingMethodUSPSSection.carriersUSPSMachinable}}" userInput="disabled" stepKey="grabUSPSMachinableDisabled"/>
         <assertEquals stepKey="assertUSPSMachinableDisabled">
 			<actualResult type="const">$grabUSPSMachinableDisabled</actualResult>
 			<expectedResult type="string">true</expectedResult>

Original file line number	Diff line number	Diff line change
`@@ -1538,7 +1538,7 @@ protected function _getCgiTracking($trackings)`
`1538`	`1538`	`*/`
`1539`	`1539`	`protected function _getXmlTracking($trackings)`
`1540`	`1540`	`{`
`1541`		`- $url = $this->getConfigData('tracking_xml_url');`
	`1541`	`+ $url = $this->getConfigData('tracking_url');`
`1542`	`1542`
`1543`	`1543`	`/** @var HttpResponseDeferredInterface[] $trackingResponses */`
`1544`	`1544`	`$trackingResponses = [];`