Skip to content

FedEx module unable to process shipping issue fixed #39853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 2.4-develop
Choose a base branch
from
Open

FedEx module unable to process shipping issue fixed #39853

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions app/code/Magento/Fedex/Model/Carrier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
use Magento\Shipping\Model\Carrier\AbstractCarrier;
use Magento\Shipping\Model\Carrier\AbstractCarrierOnline;
use Magento\Shipping\Model\Rate\Result;
use Magento\Shipping\Model\Shipment\Request;
use Magento\Shipping\Model\Shipment\ReturnShipment;

/**
* Fedex shipping implementation
Expand Down Expand Up @@ -1164,7 +1166,7 @@ public function getAllowedMethods()
/**
* Form array with appropriate structure for shipment request
*
* @param \Magento\Framework\DataObject $request
* @param Request|ReturnShipment $request
* @return array
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
Expand Down Expand Up @@ -1221,6 +1223,15 @@ protected function _formShipmentRequest(\Magento\Framework\DataObject $request)
$optionType = $request->getShippingMethod() == self::RATE_REQUEST_SMARTPOST
? 'SERVICE_DEFAULT' : $packageParams->getDeliveryConfirmation();

$shipperStreetLines = [$request->getShipperAddressStreet1()];
if ($request->getShipperAddressStreet2()) {
$shipperStreetLines[] = $request->getShipperAddressStreet2();
}

$recipientStreetLines = [$request->getRecipientAddressStreet1()];
if ($request->getRecipientAddressStreet2()) {
$recipientStreetLines[] = $request->getRecipientAddressStreet2();
}
$requestClient = [
'requestedShipment' => [
'shipDatestamp' => date('Y-m-d'),
Expand All @@ -1234,7 +1245,7 @@ protected function _formShipmentRequest(\Magento\Framework\DataObject $request)
'phoneNumber' => $request->getShipperContactPhoneNumber(),
],
'address' => [
'streetLines' => [$request->getShipperAddressStreet()],
'streetLines' => $shipperStreetLines,
'city' => $request->getShipperAddressCity(),
'stateOrProvinceCode' => $request->getShipperAddressStateOrProvinceCode(),
'postalCode' => $request->getShipperAddressPostalCode(),
Expand All @@ -1249,7 +1260,7 @@ protected function _formShipmentRequest(\Magento\Framework\DataObject $request)
'phoneNumber' => $request->getRecipientContactPhoneNumber()
],
'address' => [
'streetLines' => [$request->getRecipientAddressStreet()],
'streetLines' => $recipientStreetLines,
'city' => $request->getRecipientAddressCity(),
'stateOrProvinceCode' => $request->getRecipientAddressStateOrProvinceCode(),
'postalCode' => $request->getRecipientAddressPostalCode(),
Expand Down