Merge branch '2.4-develop' of https://github.com/mage-os/mirror-magento2

into 2.4-develop
mage-os · Sep 9, 2023 · 3ffbbd2 · 3ffbbd2
2 parents b9f6321 + 968fb3e
commit 3ffbbd2
Show file tree

Hide file tree

Showing 47 changed files with 3,697 additions and 28,845 deletions.
diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
diff --git a/app/code/Magento/Fedex/Model/Source/Dropoff.php b/app/code/Magento/Fedex/Model/Source/Dropoff.php
diff --git a/app/code/Magento/Fedex/Model/Source/PickupType.php b/app/code/Magento/Fedex/Model/Source/PickupType.php
@@ -0,0 +1,36 @@
+<?php
+/************************************************************************
+ *
+ * ADOBE CONFIDENTIAL
+ * ___________________
+ *
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ************************************************************************
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Fedex\Model\Source;
+
+/**
+ * Fedex pickupType source implementation
+ */
+class PickupType extends \Magento\Fedex\Model\Source\Generic
+{
+    /**
+     * Carrier code
+     *
+     * @var string
+     */
+    protected $_code = 'pickup_type';
+}
diff --git a/app/code/Magento/Fedex/Test/Mftf/Section/AdminShippingMethodFedExSection.xml b/app/code/Magento/Fedex/Test/Mftf/Section/AdminShippingMethodFedExSection.xml
@@ -13,13 +13,12 @@
         <element name="carriersFedExActive" type="input" selector="#carriers_fedex_active_inherit"/>
         <element name="carriersFedExTitle" type="input" selector="#carriers_fedex_title_inherit"/>
         <element name="carriersFedExAccountId" type="input" selector="#carriers_fedex_account"/>
-        <element name="carriersFedExMeterNumber" type="input" selector="#carriers_fedex_meter_number"/>
-        <element name="carriersFedExKey" type="input" selector="#carriers_fedex_key"/>
-        <element name="carriersFedExPassword" type="input" selector="#carriers_fedex_password"/>
+        <element name="carriersFedExApiKey" type="input" selector="#carriers_fedex_api_key"/>
+        <element name="carriersFedExSecretKey" type="input" selector="#carriers_fedex_secret_key"/>
         <element name="carriersFedExSandboxMode" type="input" selector="#carriers_fedex_sandbox_mode_inherit"/>
         <element name="carriersFedExShipmentRequestType" type="input" selector="#carriers_fedex_shipment_requesttype_inherit"/>
         <element name="carriersFedExPackaging" type="input" selector="#carriers_fedex_packaging_inherit"/>
-        <element name="carriersFedExDropoff" type="input" selector="#carriers_fedex_dropoff_inherit"/>
+        <element name="carriersFedExPickupType" type="input" selector="#carriers_fedex_pickup_type"/>
         <element name="carriersFedExUnitOfMeasure" type="input" selector="#carriers_fedex_unit_of_measure_inherit"/>
         <element name="carriersFedExMaxPackageWeight" type="input" selector="#carriers_fedex_max_package_weight_inherit"/>
         <element name="carriersFedExHandlingType" type="input" selector="#carriers_fedex_handling_type_inherit"/>

diff --git a/...code/Magento/Fedex/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml b/...code/Magento/Fedex/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml
@@ -29,20 +29,15 @@
 			<actualResult type="const">$grabFedExAccountIdDisabled</actualResult>
 			<expectedResult type="string">true</expectedResult>
         </assertEquals>
-        <grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExMeterNumber}}" userInput="disabled" stepKey="grabFedExMeterNumberDisabled"/>
-        <assertEquals stepKey="assertFedExMeterNumberDisabled">
-			<actualResult type="const">$grabFedExMeterNumberDisabled</actualResult>
-			<expectedResult type="string">true</expectedResult>
+        <grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExApiKey}}" userInput="disabled" stepKey="grabFedExApiKeyDisabled"/>
+        <assertEquals stepKey="assertFedExApiKeyDisabled">
+            <actualResult type="const">$grabFedExApiKeyDisabled</actualResult>
+            <expectedResult type="string">true</expectedResult>
         </assertEquals>
-        <grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExKey}}" userInput="disabled" stepKey="grabFedExKeyDisabled"/>
-        <assertEquals stepKey="assertFedExKeyDisabled">
-			<actualResult type="const">$grabFedExKeyDisabled</actualResult>
-			<expectedResult type="string">true</expectedResult>
-        </assertEquals>
-        <grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExPassword}}" userInput="disabled" stepKey="grabFedExPasswordDisabled"/>
-        <assertEquals stepKey="assertFedExPasswordDisabled">
-			<actualResult type="const">$grabFedExPasswordDisabled</actualResult>
-			<expectedResult type="string">true</expectedResult>
+        <grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExSecretKey}}" userInput="disabled" stepKey="grabFedExSecretKeyDisabled"/>
+        <assertEquals stepKey="assertFedExSecretKeyDisabled">
+            <actualResult type="const">$grabFedExSecretKeyDisabled</actualResult>
+            <expectedResult type="string">true</expectedResult>
         </assertEquals>
         <grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExSandboxMode}}" userInput="disabled" stepKey="grabFedExSandboxDisabled"/>
         <assertEquals stepKey="assertFedExSandboxDisabled">
@@ -59,10 +54,10 @@
 			<actualResult type="const">$grabFedExPackagingDisabled</actualResult>
 			<expectedResult type="string">true</expectedResult>
         </assertEquals>
-        <grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExDropoff}}" userInput="disabled" stepKey="grabFedExDropoffDisabled"/>
-        <assertEquals stepKey="assertFedExDropoffDisabled">
-			<actualResult type="const">$grabFedExDropoffDisabled</actualResult>
-			<expectedResult type="string">true</expectedResult>
+        <grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExPickupType}}" userInput="disabled" stepKey="grabFedExPickupTypeDisabled"/>
+        <assertEquals stepKey="assertFedExPickupTypeDisabled">
+            <actualResult type="const">$grabFedExPickupTypeDisabled</actualResult>
+            <expectedResult type="string">true</expectedResult>
         </assertEquals>
         <grabAttributeFrom selector="{{AdminShippingMethodFedExSection.carriersFedExUnitOfMeasure}}" userInput="disabled" stepKey="grabFedExUnitOfMeasureDisabled"/>
         <assertEquals stepKey="assertFedExUnitOfMeasureDisabled">