ACP2E-3667: [Mainline ]Fedex International Priority unavailable.

Author: soklymeach

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

@@ -718,6 +718,15 @@ public function getCode($type, $code = ''): \Magento\Framework\Phrase|array|fals
                 'INTERNATIONAL_FIRST' => __('International First'),
                 'INTERNATIONAL_GROUND' => __('International Ground'),
                 'INTERNATIONAL_PRIORITY' => __('International Priority'),
+                'FEDEX_INTERNATIONAL_PRIORITY' => __('FedEx International Priority'),
+                'FEDEX_INTERNATIONAL_PRIORITY_EXPRESS' => __('FedEx International Priority Express'),
+                'FEDEX_FIRST' => __('First'),
+                'FEDEX_PRIORITY' => __('Priority'),
+                'FEDEX_PRIORITY_EXPRESS' => __('Priority Express'),
+                'FEDEX_PRIORITY_EXPRESS_FREIGHT' => __('Priority Express Freight'),
+                'FEDEX_PRIORITY_FREIGHT' => __('Priority Freight'),
+                'FEDEX_ECONOMY_SELECT' => __('Economy Select'),
+                'PRIORITY_EXPRESS' => __('Priority Express'),
                 'INTERNATIONAL_PRIORITY_FREIGHT' => __('Intl Priority Freight'),
                 'PRIORITY_OVERNIGHT' => __('Priority Overnight'),
                 'SMART_POST' => __('Smart Post'),
@@ -756,7 +765,11 @@ public function getCode($type, $code = ''): \Magento\Framework\Phrase|array|fals
                             ],
                         ],
                         'from_us' => [
-                            'method' => ['INTERNATIONAL_FIRST', 'INTERNATIONAL_ECONOMY', 'INTERNATIONAL_PRIORITY'],
+                            'method' => [
+                                'INTERNATIONAL_FIRST',
+                                'INTERNATIONAL_ECONOMY',
+                                'FEDEX_INTERNATIONAL_PRIORITY'
+                            ],
                         ],
                     ],
                 ],
@@ -778,15 +791,19 @@ public function getCode($type, $code = ''): \Magento\Framework\Phrase|array|fals
                             ],
                         ],
                         'from_us' => [
-                            'method' => ['INTERNATIONAL_FIRST', 'INTERNATIONAL_ECONOMY', 'INTERNATIONAL_PRIORITY'],
+                            'method' => [
+                                'INTERNATIONAL_FIRST',
+                                'INTERNATIONAL_ECONOMY',
+                                'FEDEX_INTERNATIONAL_PRIORITY'
+                            ],
                         ],
                     ],
                 ],
                 [
                     'containers' => ['FEDEX_10KG_BOX', 'FEDEX_25KG_BOX'],
                     'filters' => [
                         'within_us' => [],
-                        'from_us' => ['method' => ['INTERNATIONAL_PRIORITY']],
+                        'from_us' => ['method' => ['FEDEX_INTERNATIONAL_PRIORITY']],
                     ],
                 ],
                 [
@@ -814,7 +831,8 @@ public function getCode($type, $code = ''): \Magento\Framework\Phrase|array|fals
                             'method' => [
                                 'INTERNATIONAL_FIRST',
                                 'INTERNATIONAL_ECONOMY',
-                                'INTERNATIONAL_PRIORITY',
+                                'FEDEX_INTERNATIONAL_PRIORITY',
+                                'FEDEX_INTERNATIONAL_PRIORITY_EXPRESS',
                                 'INTERNATIONAL_GROUND',
                                 'FEDEX_FREIGHT',
                                 'FEDEX_1_DAY_FREIGHT',

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

@@ -995,6 +995,75 @@ public function testGetTracking($tracking, $shipTimeStamp, $expectedDate, $expec
         $this->assertEquals($expectedTime, $event['deliverytime']);
     }
 
+    /**
+     * Test getCode with invalid type
+     */
+    public function testGetCodeWithInvalidType(): void
+    {
+        $result = $this->carrier->getCode('invalid_type');
+        $this->assertFalse($result, 'Should return false for invalid type');
+    }
+
+    /**
+     * Test getCode with valid type and no code (returns all codes)
+     */
+    public function testGetCodeWithValidTypeNoCode(): void
+    {
+        $result = $this->carrier->getCode('method');
+        $this->assertIsArray($result, 'Should return array of all method codes');
+        $this->assertArrayHasKey('FEDEX_INTERNATIONAL_PRIORITY', $result);
+        $this->assertArrayHasKey('FEDEX_INTERNATIONAL_PRIORITY_EXPRESS', $result);
+        $this->assertEquals(__('FedEx International Priority'), $result['FEDEX_INTERNATIONAL_PRIORITY']);
+    }
+
+    /**
+     * Test getCode with valid type and valid code
+     */
+    public function testGetCodeWithValidTypeAndCode(): void
+    {
+        $result = $this->carrier->getCode('method', 'FEDEX_INTERNATIONAL_PRIORITY');
+        $this->assertInstanceOf(
+            \Magento\Framework\Phrase::class,
+            $result,
+            'Should return Phrase object for valid method code'
+        );
+        $this->assertEquals('FedEx International Priority', $result->getText());
+    }
+
+    /**
+     * Test getCode with valid type and invalid code
+     */
+    public function testGetCodeWithValidTypeAndInvalidCode(): void
+    {
+        $result = $this->carrier->getCode('method', 'INVALID_CODE');
+        $this->assertFalse($result);
+    }
+
+    /**
+     * Test getCode with packaging type
+     */
+    public function testGetCodeWithPackagingType(): void
+    {
+        $result = $this->carrier->getCode('packaging', 'FEDEX_ENVELOPE');
+        $this->assertInstanceOf(
+            \Magento\Framework\Phrase::class,
+            $result,
+            'Should return Phrase object for valid packaging code'
+        );
+        $this->assertEquals('FedEx Envelope', $result->getText());
+    }
+
+    /**
+     * Test getCode with dropoff type and empty code
+     */
+    public function testGetCodeWithDropoffTypeNoCode(): void
+    {
+        $result = $this->carrier->getCode('dropoff');
+        $this->assertIsArray($result, 'Should return array of all dropoff codes');
+        $this->assertArrayHasKey('REGULAR_PICKUP', $result);
+        $this->assertEquals(__('Regular Pickup'), $result['REGULAR_PICKUP']);
+    }
+
     /**
      * Gets list of variations for testing ship date.
      *
@@ -1065,7 +1134,7 @@ public static function shipDateDataProvider(): array
             ],
             'tracking8' => [
                 'tracking8',
-                'shipTimestamp' => '2024-09-19T02:06:35+03:00',
+                'shipTimeStamp' => '2024-09-19T02:06:35+03:00',
                 'expectedDate' => '2024-09-21',
                 '18:31:00',
                 true