Merge pull request #6112 from magento-tsg-csl3/MC-37313

[tsg] MC-37313: [Create UPS shipping label] Error message appears "Failed to send items" if Signature Confirmation is set to Not Required

Author: viktym

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

@@ -1118,6 +1118,7 @@ protected function _getXmlTracking($trackings)
 
         /** @var HttpResponseDeferredInterface[] $trackingResponses */
         $trackingResponses = [];
+        $tracking = '';
         foreach ($trackings as $tracking) {
             /**
              * RequestOption==>'1' to request all activities
@@ -1362,6 +1363,7 @@ public function getAllowedMethods()
     protected function _formShipmentRequest(DataObject $request)
     {
         $packages = $request->getPackages();
+        $shipmentItems = [];
         foreach ($packages as $package) {
             $shipmentItems[] = $package['items'];
         }
@@ -1538,7 +1540,7 @@ protected function _formShipmentRequest(DataObject $request)
             }
         }
 
-        if (isset($deliveryConfirmation) && $deliveryConfirmationLevel === self::DELIVERY_CONFIRMATION_SHIPMENT) {
+        if (!empty($deliveryConfirmation) && $deliveryConfirmationLevel === self::DELIVERY_CONFIRMATION_SHIPMENT) {
             $serviceOptionsNode = $shipmentPart->addChild('ShipmentServiceOptions');
             $serviceOptionsNode->addChild(
                 'DeliveryConfirmation'
@@ -1624,6 +1626,7 @@ protected function _sendShipmentAcceptRequest(Element $shipmentConfirmResponse)
             $xmlResponse = '';
         }
 
+        $response = '';
         try {
             $response = $this->_xmlElFactory->create(['data' => $xmlResponse]);
         } catch (Throwable $e) {
@@ -1800,6 +1803,7 @@ protected function _doShipmentRequest(DataObject $request)
         $this->setXMLAccessRequest();
         $xmlRequest = $this->_xmlAccessRequest . $rawXmlRequest;
         $xmlResponse = $this->_getCachedQuotes($xmlRequest);
+        $debugData = [];
 
         if ($xmlResponse === null) {
             $debugData['request'] = $this->filterDebugData($this->_xmlAccessRequest) . $rawXmlRequest;

dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php

@@ -252,6 +252,7 @@ public function testRequestToShipment(): void
                             'weight' => '0.55',
                             'customs_value' => '20.00',
                             'container' => 'Large Express Box',
+                            'delivery_confirmation' => 0,
                         ],
                         'items' => [
                             'item2' => [
@@ -262,6 +263,7 @@ public function testRequestToShipment(): void
                 ]
             ]
         );
+        $request->setRecipientAddressCountryCode('UK');
 
         $result = $this->carrier->requestToShipment($request);
 

dev/tests/integration/testsuite/Magento/Ups/_files/ShipmentConfirmRequest.xml

@@ -27,7 +27,7 @@
             <AddressLine1 />
             <AddressLine2 />
             <City />
-            <CountryCode />
+            <CountryCode>UK</CountryCode>
             <PostalCode />
             <ResidentialAddress />
         </Address>