File tree Expand file tree Collapse file tree 1 file changed +2
-8
lines changed
app/code/core/Mage/Usa/Model/Shipping/Carrier Expand file tree Collapse file tree 1 file changed +2
-8
lines changed Original file line number Diff line number Diff line change @@ -1330,18 +1330,12 @@ public function getResponse()
13301330 public function getAllowedMethods ()
13311331 {
13321332 $ allowedMethods = explode (', ' , (string )$ this ->getConfigData ('allowed_methods ' ));
1333- $ isUpsXml = $ this ->getConfigData ('type ' ) === 'UPS_XML ' ;
1334- $ isUpsRest = $ this ->getConfigData ('type ' ) === 'UPS_REST ' ;
1335- $ origin = $ this ->getConfigData ('origin_shipment ' );
1336-
1337- $ availableByTypeMethods = ($ isUpsXml || $ isUpsRest )
1338- ? $ this ->getCode ('originShipment ' , $ origin )
1339- : $ this ->getCode ('method ' );
1333+ $ availableByTypeMethods = $ this ->getCode ('originShipment ' , $ this ->getConfigData ('origin_shipment ' ));
13401334
13411335 $ methods = [];
13421336 foreach ($ availableByTypeMethods as $ methodCode => $ methodData ) {
13431337 if (in_array ($ methodCode , $ allowedMethods )) {
1344- $ methods [$ methodCode ] = $ methodData-> getText () ;
1338+ $ methods [$ methodCode ] = $ methodData ;
13451339 }
13461340 }
13471341
You can’t perform that action at this time.
0 commit comments