Removed support for UPS CGI API which was shut down in May 2023 (#3287)

OpenMage · Jul 3, 2023 · 17bc336 · 17bc336
1 parent ac2fe45
commit 17bc336
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -264,6 +264,8 @@ not compatible with the new implementations made by ZF1-Future, which is much mo
 This may generate a problem with `Zend_Db_Select' statements that do not use 'Zend_Db_Expr' to quote expressions.
 If you see SQL errors after upgrading please remember to check for this specific issue in your code.
 
+UPS shut down their old CGI APIs so we removed the support for it from the Mage_Usa module.
+
 ### New Config Options
 
 - `admin/design/use_legacy_theme`

diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
@@ -305,9 +305,6 @@ public function getResult()
     protected function _getQuotes()
     {
         switch ($this->getConfigData('type')) {
-            case 'UPS':
-                return $this->_getCgiQuotes();
-
             case 'UPS_XML':
                 return $this->_getXmlQuotes();
         }
@@ -1058,9 +1055,7 @@ public function getTracking($trackings)
             $trackings = [$trackings];
         }
 
-        if ($this->getConfigData('type') == 'UPS') {
-            $this->_getCgiTracking($trackings);
-        } elseif ($this->getConfigData('type') == 'UPS_XML') {
+        if ($this->getConfigData('type') == 'UPS_XML') {
             $this->setXMLAccessRequest();
             $this->_getXmlTracking($trackings);
         }

diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups/Source/Type.php
@@ -25,8 +25,6 @@ class Mage_Usa_Model_Shipping_Carrier_Ups_Source_Type
     public function toOptionArray()
     {
         return [
-            ['value' => 'UPS', 'label' => Mage::helper('usa')->__('United Parcel Service')],
-            #array('value' => Mage_Paypal_Model_Api_Abstract::PAYMENT_TYPE_ORDER, 'label' => Mage::helper('usa')->__('Order')),
             ['value' => 'UPS_XML', 'label' => Mage::helper('usa')->__('United Parcel Service XML')],
         ];
     }

diff --git a/app/code/core/Mage/Usa/etc/config.xml b/app/code/core/Mage/Usa/etc/config.xml
@@ -154,7 +154,6 @@
                 <cutoff_cost/>
                 <dest_type>RES</dest_type>
                 <free_method>GND</free_method>
-                <gateway_url>http://www.ups.com/using/services/rave/qcostcgi.cgi</gateway_url>
                 <gateway_xml_url>https://onlinetools.ups.com/ups.app/xml/Rate</gateway_xml_url>
                 <tracking_xml_url>https://onlinetools.ups.com/ups.app/xml/Track</tracking_xml_url>
                 <shipconfirm_xml_url>https://onlinetools.ups.com/ups.app/xml/ShipConfirm</shipconfirm_xml_url>