Skip to content

Commit b5dd74c

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into GL_PR_Arrows_August_07_2023
2 parents 6097b96 + 968fb3e commit b5dd74c

31 files changed

+2688
-28811
lines changed

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

Lines changed: 527 additions & 597 deletions
Large diffs are not rendered by default.

‎app/code/Magento/Fedex/Model/Source/Dropoff.php

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎app/code/Magento/Fedex/Model/Source/PickupType.php

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/************************************************************************
3+
*
4+
* ADOBE CONFIDENTIAL
5+
* ___________________
6+
*
7+
* Copyright 2023 Adobe
8+
* All Rights Reserved.
9+
*
10+
* NOTICE: All information contained herein is, and remains
11+
* the property of Adobe and its suppliers, if any. The intellectual
12+
* and technical concepts contained herein are proprietary to Adobe
13+
* and its suppliers and are protected by all applicable intellectual
14+
* property laws, including trade secret and copyright laws.
15+
* Dissemination of this information or reproduction of this material
16+
* is strictly forbidden unless prior written permission is obtained
17+
* from Adobe.
18+
* ************************************************************************
19+
*/
20+
21+
declare(strict_types=1);
22+
23+
namespace Magento\Fedex\Model\Source;
24+
25+
/**
26+
* Fedex pickupType source implementation
27+
*/
28+
class PickupType extends \Magento\Fedex\Model\Source\Generic
29+
{
30+
/**
31+
* Carrier code
32+
*
33+
* @var string
34+
*/
35+
protected $_code = 'pickup_type';
36+
}

‎app/code/Magento/Fedex/Test/Mftf/Section/AdminShippingMethodFedExSection.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@
1313
<element name="carriersFedExActive" type="input" selector="#carriers_fedex_active_inherit"/>
1414
<element name="carriersFedExTitle" type="input" selector="#carriers_fedex_title_inherit"/>
1515
<element name="carriersFedExAccountId" type="input" selector="#carriers_fedex_account"/>
16-
<element name="carriersFedExMeterNumber" type="input" selector="#carriers_fedex_meter_number"/>
17-
<element name="carriersFedExKey" type="input" selector="#carriers_fedex_key"/>
18-
<element name="carriersFedExPassword" type="input" selector="#carriers_fedex_password"/>
16+
<element name="carriersFedExApiKey" type="input" selector="#carriers_fedex_api_key"/>
17+
<element name="carriersFedExSecretKey" type="input" selector="#carriers_fedex_secret_key"/>
1918
<element name="carriersFedExSandboxMode" type="input" selector="#carriers_fedex_sandbox_mode_inherit"/>
2019
<element name="carriersFedExShipmentRequestType" type="input" selector="#carriers_fedex_shipment_requesttype_inherit"/>
2120
<element name="carriersFedExPackaging" type="input" selector="#carriers_fedex_packaging_inherit"/>
22-
<element name="carriersFedExDropoff" type="input" selector="#carriers_fedex_dropoff_inherit"/>
21+
<element name="carriersFedExPickupType" type="input" selector="#carriers_fedex_pickup_type"/>
2322
<element name="carriersFedExUnitOfMeasure" type="input" selector="#carriers_fedex_unit_of_measure_inherit"/>
2423
<element name="carriersFedExMaxPackageWeight" type="input" selector="#carriers_fedex_max_package_weight_inherit"/>
2524
<element name="carriersFedExHandlingType" type="input" selector="#carriers_fedex_handling_type_inherit"/>

‎app/code/Magento/Fedex/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,15 @@
2929
<actualResult type="const">$grabFedExAccountIdDisabled</actualResult>
3030
<expectedResult type="string">true</expectedResult>
3131
</assertEquals>
32-
<grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExMeterNumber}}" userInput="disabled" stepKey="grabFedExMeterNumberDisabled"/>
33-
<assertEquals stepKey="assertFedExMeterNumberDisabled">
34-
<actualResult type="const">$grabFedExMeterNumberDisabled</actualResult>
35-
<expectedResult type="string">true</expectedResult>
32+
<grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExApiKey}}" userInput="disabled" stepKey="grabFedExApiKeyDisabled"/>
33+
<assertEquals stepKey="assertFedExApiKeyDisabled">
34+
<actualResult type="const">$grabFedExApiKeyDisabled</actualResult>
35+
<expectedResult type="string">true</expectedResult>
3636
</assertEquals>
37-
<grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExKey}}" userInput="disabled" stepKey="grabFedExKeyDisabled"/>
38-
<assertEquals stepKey="assertFedExKeyDisabled">
39-
<actualResult type="const">$grabFedExKeyDisabled</actualResult>
40-
<expectedResult type="string">true</expectedResult>
41-
</assertEquals>
42-
<grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExPassword}}" userInput="disabled" stepKey="grabFedExPasswordDisabled"/>
43-
<assertEquals stepKey="assertFedExPasswordDisabled">
44-
<actualResult type="const">$grabFedExPasswordDisabled</actualResult>
45-
<expectedResult type="string">true</expectedResult>
37+
<grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExSecretKey}}" userInput="disabled" stepKey="grabFedExSecretKeyDisabled"/>
38+
<assertEquals stepKey="assertFedExSecretKeyDisabled">
39+
<actualResult type="const">$grabFedExSecretKeyDisabled</actualResult>
40+
<expectedResult type="string">true</expectedResult>
4641
</assertEquals>
4742
<grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExSandboxMode}}" userInput="disabled" stepKey="grabFedExSandboxDisabled"/>
4843
<assertEquals stepKey="assertFedExSandboxDisabled">
@@ -59,10 +54,10 @@
5954
<actualResult type="const">$grabFedExPackagingDisabled</actualResult>
6055
<expectedResult type="string">true</expectedResult>
6156
</assertEquals>
62-
<grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExDropoff}}" userInput="disabled" stepKey="grabFedExDropoffDisabled"/>
63-
<assertEquals stepKey="assertFedExDropoffDisabled">
64-
<actualResult type="const">$grabFedExDropoffDisabled</actualResult>
65-
<expectedResult type="string">true</expectedResult>
57+
<grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExPickupType}}" userInput="disabled" stepKey="grabFedExPickupTypeDisabled"/>
58+
<assertEquals stepKey="assertFedExPickupTypeDisabled">
59+
<actualResult type="const">$grabFedExPickupTypeDisabled</actualResult>
60+
<expectedResult type="string">true</expectedResult>
6661
</assertEquals>
6762
<grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExUnitOfMeasure}}" userInput="disabled" stepKey="grabFedExUnitOfMeasureDisabled"/>
6863
<assertEquals stepKey="assertFedExUnitOfMeasureDisabled">

0 commit comments

Comments
 (0)