ACP2E-3340: small refactoring, fixed static error, removed unneeded config for account

Author: alzota

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

@@ -937,15 +937,14 @@ protected function _getAccessToken(): string|null
         return $this->retrieveAccessToken($apiKey, $secretKey);
     }
 
-
     /**
      * Make the call to get the access token
      *
-     * @param $apiKey
-     * @param $secretKey
+     * @param string|null $apiKey
+     * @param string|null $secretKey
      * @return string|null
      */
-    private function retrieveAccessToken($apiKey, $secretKey): string|null
+    private function retrieveAccessToken(?string $apiKey, ?string $secretKey): string|null
     {
         if (!$apiKey || !$secretKey) {
             $this->_debug(__('Authentication keys are missing.'));
@@ -977,7 +976,7 @@ private function retrieveAccessToken($apiKey, $secretKey): string|null
      *
      * @return string|null
      */
-    private function _getTrackingApiAccessToken(): string|null
+    private function getTrackingApiAccessToken(): string|null
     {
         $trackingApiKey = $this->getConfigData('tracking_api_key') ?? null;
         $trackingSecretKey = $this->getConfigData('tracking_api_secret_key') ?? null;
@@ -1034,8 +1033,8 @@ protected function sendRequest($endpoint, $request, $accessToken = null): array|
      */
     protected function _getTrackingInformation($tracking): void
     {
-        if ($this->getConfigData('enable_tracking_api')) {
-            $accessToken = $this->_getTrackingApiAccessToken();
+        if ($this->getConfigData('enabled_tracking_api')) {
+            $accessToken = $this->getTrackingApiAccessToken();
         } else {
             $accessToken = $this->_getAccessToken();
         }

app/code/Magento/Fedex/etc/adminhtml/system.xml

@@ -31,30 +31,22 @@
                     <label>Secret Key</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                 </field>
-                <field id="enable_tracking_api" translate="label" type="select" sortOrder="61" showInDefault="1" showInWebsite="1" canRestore="1">
+                <field id="enabled_tracking_api" translate="label" type="select" sortOrder="61" showInDefault="1" showInWebsite="1" canRestore="1">
                     <label>Enable Tracking API credentials</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
-                <field id="tracking_api_account" translate="label comment" type="obscure" sortOrder="62" showInDefault="1" showInWebsite="1">
-                    <label>Tracking API Account ID</label>
-                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
-                    <comment>Please make sure to use only digits here. No dashes are allowed.</comment>
-                    <depends>
-                        <field id="enable_tracking_api">1</field>
-                    </depends>
-                </field>
-                <field id="tracking_api_key" translate="label" type="obscure" sortOrder="63" showInDefault="1" showInWebsite="1">
+                <field id="tracking_api_key" translate="label" type="obscure" sortOrder="62" showInDefault="1" showInWebsite="1">
                     <label>Tracking API Key</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <depends>
-                        <field id="enable_tracking_api">1</field>
+                        <field id="enabled_tracking_api">1</field>
                     </depends>
                 </field>
-                <field id="tracking_api_secret_key" translate="label" type="obscure" sortOrder="64" showInDefault="1" showInWebsite="1">
+                <field id="tracking_api_secret_key" translate="label" type="obscure" sortOrder="63" showInDefault="1" showInWebsite="1">
                     <label>Tracking API Secret Key</label>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <depends>
-                        <field id="enable_tracking_api">1</field>
+                        <field id="enabled_tracking_api">1</field>
                     </depends>
                 </field>
                 <field id="sandbox_mode" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" canRestore="1">