Merge branch 'OpenMage:main' into main

openmage-strict · May 28, 2024 · 28bbb75 · 28bbb75
2 parents 10a44ec + 1f32c70
commit 28bbb75
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php b/app/code/core/Mage/Usa/Model/Shipping/Carrier/Ups.php
@@ -1330,18 +1330,12 @@ public function getResponse()
     public function getAllowedMethods()
     {
         $allowedMethods = explode(',', (string)$this->getConfigData('allowed_methods'));
-        $isUpsXml = $this->getConfigData('type') === 'UPS_XML';
-        $isUpsRest = $this->getConfigData('type') === 'UPS_REST';
-        $origin = $this->getConfigData('origin_shipment');
-
-        $availableByTypeMethods = ($isUpsXml || $isUpsRest)
-            ? $this->getCode('originShipment', $origin)
-            : $this->getCode('method');
+        $availableByTypeMethods = $this->getCode('originShipment', $this->getConfigData('origin_shipment'));
 
         $methods = [];
         foreach ($availableByTypeMethods as $methodCode => $methodData) {
             if (in_array($methodCode, $allowedMethods)) {
-                $methods[$methodCode] = $methodData->getText();
+                $methods[$methodCode] = $methodData;
             }
         }