Skip to content

Commit cab418b

Browse files
committed
MC-29444: Extra Values of UPS and USPS are in dropdown list Cart Price Rule - Condition - Shipping Method
1 parent aa697ce commit cab418b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

app/code/Magento/Ups/Model/Carrier.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1901,7 +1901,7 @@ public function getContainerTypes(\Magento\Framework\DataObject $params = null)
19011901
return ['00' => __('Customer Packaging')] + $containerTypes;
19021902
} elseif ($countryShipper == self::USA_COUNTRY_ID
19031903
&& $countryRecipient == self::PUERTORICO_COUNTRY_ID
1904-
&& ($method == '03' || $method == '02' || $method == '01')
1904+
&& in_array($method, ['01', '02', '03'])
19051905
) {
19061906
// Container types should be the same as for domestic
19071907
$params->setCountryRecipient(self::USA_COUNTRY_ID);

app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,13 +423,13 @@ public function testGetAllowedMethods(
423423
'carriers/ups/allowed_methods',
424424
ScopeInterface::SCOPE_STORE,
425425
null,
426-
$allowedMethods
426+
$allowedMethods,
427427
],
428428
[
429429
'carriers/ups/type',
430430
ScopeInterface::SCOPE_STORE,
431431
null,
432-
$carrierType
432+
$carrierType,
433433
],
434434
[
435435
'carriers/ups/origin_shipment',

0 commit comments

Comments
 (0)