MC-29444: Extra Values of UPS and USPS are in dropdown list Cart Price Rule - Condition - Shipping Method

Author: viktorpetryk

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

@@ -1312,13 +1312,20 @@ public function getResponse()
      */
     public function getAllowedMethods()
     {
+        $allowedMethods = explode(',', (string)$this->getConfigData('allowed_methods'));
         $isUpsXml = $this->getConfigData('type') === 'UPS_XML';
         $origin = $this->getConfigData('origin_shipment');
-        $allowedMethods = $isUpsXml
+
+        $availableByTypeMethods = $isUpsXml
             ? $this->configHelper->getCode('originShipment', $origin)
             : $this->configHelper->getCode('method');
+
+        $filteredMethods = array_filter($availableByTypeMethods, function ($methodCode) use ($allowedMethods) {
+            return in_array($methodCode, $allowedMethods);
+        }, ARRAY_FILTER_USE_KEY);
+
         $methods = [];
-        foreach ($allowedMethods as $methodCode => $methodData) {
+        foreach ($filteredMethods as $methodCode => $methodData) {
             $methods[$methodCode] = $methodData->getText();
         }
 

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

@@ -404,6 +404,7 @@ public function countryDataProvider()
      * @param string $methodType
      * @param string $methodCode
      * @param string $methodTitle
+     * @param string $allowedMethods
      * @param array $expectedMethods
      * @return void
      */
@@ -412,11 +413,18 @@ public function testGetAllowedMethods(
         string $methodType,
         string $methodCode,
         string $methodTitle,
+        string $allowedMethods,
         array $expectedMethods
     ): void {
         $this->scope->method('getValue')
             ->willReturnMap(
                 [
+                    [
+                        'carriers/ups/allowed_methods',
+                        ScopeInterface::SCOPE_STORE,
+                        null,
+                        $allowedMethods
+                    ],
                     [
                         'carriers/ups/type',
                         ScopeInterface::SCOPE_STORE,
@@ -449,13 +457,23 @@ public function allowedMethodsDataProvider(): array
                 'method',
                 '1DM',
                 'Next Day Air Early AM',
+                '',
+                [],
+            ],
+            [
+                'UPS',
+                'method',
+                '1DM',
+                'Next Day Air Early AM',
+                '1DM,1DML,1DA',
                 ['1DM' => 'Next Day Air Early AM'],
             ],
             [
                 'UPS_XML',
                 'originShipment',
                 '01',
                 'UPS Next Day Air',
+                '01,02,03',
                 ['01' => 'UPS Next Day Air'],
             ],
         ];