Merge branch 'ACP2E-3354' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-31-10-2024

Author: abukatar

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

@@ -417,7 +417,7 @@ protected function _formRateRequest($purpose): array
                         ]
                     ]
                 ],
-                'rateRequestType' => ['LIST']
+                'rateRequestType' => ['LIST', 'ACCOUNT']
             ]
         ];
 

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

@@ -421,7 +421,17 @@ public function testCollectRatesRateAmountOriginBased(
         $rateResponse = $this->getRateResponse($amount, $currencyCode, $rateType);
 
         $this->serializer->method('serialize')
-            ->willReturn('CollectRateString' . $amount);
+            ->willReturn(
+                json_encode(
+                    [
+                        'accountNumber' => '123456789',
+                        'requestedShipment' =>
+                            ['rateRequestTypes' =>
+                                ['LIST', 'ACCOUNT']
+                            ]
+                    ]
+                ) .'CollectRateString' . $amount
+            );
 
         $rateCurrency = $this->getMockBuilder(Currency::class)
             ->disableOriginalConstructor()
@@ -454,6 +464,7 @@ public function testCollectRatesRateAmountOriginBased(
             ->addMethods(['getBaseCurrency'])
             ->disableOriginalConstructor()
             ->getMock();
+
         $request->method('getBaseCurrency')
             ->willReturn($baseCurrency);
 
@@ -465,6 +476,7 @@ public function testCollectRatesRateAmountOriginBased(
             ->willReturnOnConsecutiveCalls($accessTokenResponse, $rateResponse);
 
         $allRates1 = $this->carrier->collectRates($request)->getAllRates();
+
         foreach ($allRates1 as $rate) {
             $this->assertEquals($expected, $rate->getData('cost'));
         }