ENGCOM-8077: #25192 fixed #25244

 - Merge Pull Request #25244 from vishalverma279/magento2:25192fixed
 - Merged commits:
   1. 4ac223b
   2. a220df1
   3. ab97e97
   4. cef3fe7

Author: magento-engcom-team

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

@@ -676,6 +676,7 @@ public function getDhlProducts($doc)
             'H' => __('Economy select'),
             'J' => __('Jumbo box'),
             'M' => __('Express 10:30'),
+            'N' => __('Domestic express'),
             'V' => __('Europack'),
             'Y' => __('Express 12:00'),
         ];
@@ -1767,9 +1768,8 @@ protected function _shipmentDetails($xml, $rawRequest, $originRegion = '')
          */
         $nodeShipmentDetails->addChild('DoorTo', 'DD');
         $nodeShipmentDetails->addChild('DimensionUnit', substr($this->_getDimensionUnit(), 0, 1));
-        if ($package['params']['container'] == self::DHL_CONTENT_TYPE_NON_DOC) {
-            $packageType = 'CP';
-        }
+        $contentType = isset($package['params']['container']) ? $package['params']['container'] : '';
+        $packageType = $contentType === self::DHL_CONTENT_TYPE_NON_DOC ? 'CP' : '';
         $nodeShipmentDetails->addChild('PackageType', $packageType);
         if ($this->isDutiable($rawRequest->getOrigCountryId(), $rawRequest->getDestCountryId())) {
             $nodeShipmentDetails->addChild('IsDutiable', 'Y');

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

@@ -333,6 +333,7 @@ public function dhlProductsDataProvider(): array
                     'H' => 'Economy select',
                     'J' => 'Jumbo box',
                     'M' => 'Express 10:30',
+                    'N' => 'Domestic express',
                     'V' => 'Europack',
                     'Y' => 'Express 12:00',
                 ],

app/code/Magento/Dhl/etc/config.xml

@@ -21,7 +21,7 @@
                 <active>0</active>
                 <title>DHL</title>
                 <sallowspecific>0</sallowspecific>
-                <nondoc_methods>1,3,4,8,P,Q,E,F,H,J,M,V,Y</nondoc_methods>
+                <nondoc_methods>1,3,4,8,P,Q,E,F,H,J,M,N,V,Y</nondoc_methods>
                 <doc_methods>2,5,6,7,9,B,C,D,U,K,L,G,W,I,N,O,R,S,T,X</doc_methods>
                 <free_method>G</free_method>
                 <gateway_url>https://xmlpi-ea.dhl.com/XMLShippingServlet</gateway_url>