Skip to content

Commit 1f2bbba

Browse files
committed
ACP2E-3667: [Mainline ]Fedex International Priority unavailable.
1 parent f211b57 commit 1f2bbba

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,6 @@ public function getCode($type, $code = ''): \Magento\Framework\Phrase|array|fals
725725
'FEDEX_PRIORITY_EXPRESS_FREIGHT' => __('Priority Express Freight'),
726726
'FEDEX_PRIORITY_FREIGHT' => __('Priority Freight'),
727727
'FEDEX_ECONOMY_SELECT' => __('Economy Select'),
728-
'PRIORITY_EXPRESS' => __('Priority Express'),
729728
'INTERNATIONAL_PRIORITY_FREIGHT' => __('Intl Priority Freight'),
730729
'PRIORITY_OVERNIGHT' => __('Priority Overnight'),
731730
'SMART_POST' => __('Smart Post'),

app/code/Magento/Fedex/etc/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<shipment_requesttype>0</shipment_requesttype>
2222
<active>0</active>
2323
<sallowspecific>0</sallowspecific>
24-
<allowed_methods>EUROPE_FIRST_INTERNATIONAL_PRIORITY,FEDEX_1_DAY_FREIGHT,FEDEX_2_DAY_FREIGHT,FEDEX_2_DAY,FEDEX_2_DAY_AM,FEDEX_3_DAY_FREIGHT,FEDEX_EXPRESS_SAVER,FEDEX_GROUND,FIRST_OVERNIGHT,GROUND_HOME_DELIVERY,INTERNATIONAL_ECONOMY,INTERNATIONAL_ECONOMY_FREIGHT,INTERNATIONAL_FIRST,INTERNATIONAL_GROUND,FEDEX_INTERNATIONAL_PRIORITY,FEDEX_INTERNATIONAL_PRIORITY_EXPRESS,FEDEX_FIRST,FEDEX_PRIORITY,FEDEX_PRIORITY_EXPRESS,FEDEX_PRIORITY_EXPRESS_FREIGHT,FEDEX_PRIORITY_FREIGHT,FEDEX_ECONOMY_SELECT,PRIORITY_EXPRESS,INTERNATIONAL_PRIORITY_FREIGHT,PRIORITY_OVERNIGHT,SMART_POST,STANDARD_OVERNIGHT,FEDEX_FREIGHT,FEDEX_NATIONAL_FREIGHT</allowed_methods>
24+
<allowed_methods>EUROPE_FIRST_INTERNATIONAL_PRIORITY,FEDEX_1_DAY_FREIGHT,FEDEX_2_DAY_FREIGHT,FEDEX_2_DAY,FEDEX_2_DAY_AM,FEDEX_3_DAY_FREIGHT,FEDEX_EXPRESS_SAVER,FEDEX_GROUND,FIRST_OVERNIGHT,GROUND_HOME_DELIVERY,INTERNATIONAL_ECONOMY,INTERNATIONAL_ECONOMY_FREIGHT,INTERNATIONAL_FIRST,INTERNATIONAL_GROUND,FEDEX_INTERNATIONAL_PRIORITY,FEDEX_INTERNATIONAL_PRIORITY_EXPRESS,FEDEX_FIRST,FEDEX_PRIORITY,FEDEX_PRIORITY_EXPRESS,FEDEX_PRIORITY_EXPRESS_FREIGHT,FEDEX_PRIORITY_FREIGHT,FEDEX_ECONOMY_SELECT,INTERNATIONAL_PRIORITY_FREIGHT,PRIORITY_OVERNIGHT,SMART_POST,STANDARD_OVERNIGHT,FEDEX_FREIGHT,FEDEX_NATIONAL_FREIGHT</allowed_methods>
2525
<cutoff_cost />
2626
<dropoff>REGULAR_PICKUP</dropoff>
2727
<free_method>FEDEX_GROUND</free_method>

app/code/Magento/Fedex/i18n/en_US.csv

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ Ground,Ground
1313
"International First","International First"
1414
"International Ground","International Ground"
1515
"International Priority","International Priority"
16+
"International Priority Express","International Priority Express"
17+
"First", "First"
18+
"Priority", "Priority"
19+
"Priority Express", "Priority Express"
20+
"Priority Express Freight", "Priority Express Freight"
21+
"Priority Freight", "Priority Freight"
22+
"Economy Select", "Economy Select"
1623
"Intl Priority Freight","Intl Priority Freight"
1724
"Priority Overnight","Priority Overnight"
1825
"Smart Post","Smart Post"

dev/tests/integration/testsuite/Magento/Fedex/Model/CarrierTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function testGetCode($type, $expectedCount)
3838
public static function getCodeDataProvider()
3939
{
4040
return [
41-
['method', 29],
41+
['method', 28],
4242
['dropoff', 5],
4343
['packaging', 7],
4444
['containers_filter', 4],

0 commit comments

Comments
 (0)