Merge branch '2.4-develop' into B2B-2224

Author: dhaecker

app/code/Magento/AdminAdobeIms/view/adminhtml/web/js/adobe-ims-reauth.js

@@ -45,17 +45,17 @@ define([
          * @return {window.Promise}
          */
         login: function () {
-            var deferred = $.Deferred();
-            var loginConfig = this.loginConfig;
+            var deferred = $.Deferred(),
+                loginConfig = this.loginConfig;
 
-            $("input.ims_verification").click('click', function(e) {
+            $('input.ims_verification').on('click', function () {
                 login(loginConfig)
                     .then(function (response) {
                         if (response.isAuthorized === true) {
                             $('input.ims_verified').val(true);
                         }
                         deferred.resolve(response);
-                    }.bind(this))
+                    })
                     .fail(function (error) {
                         deferred.reject(error);
                     });

app/code/Magento/AdminAdobeIms/view/adminhtml/web/postcss.config.js

@@ -4,5 +4,5 @@ module.exports = {
         require('postcss-varfallback'),
         require('postcss-dropunusedvars'),
         require('cssnano')
-    ],
+    ]
 };

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

@@ -1522,6 +1522,7 @@ protected function _getMinDimension($dimensionUnit)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
+
     protected function _doRequest()
     {
         $rawRequest = $this->_request;
@@ -1530,8 +1531,8 @@ protected function _doRequest()
             '<req:ShipmentRequest' .
             ' xmlns:req="http://www.dhl.com"' .
             ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' .
-            ' xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.0.xsd"' .
-            ' schemaVersion="6.0" />';
+            ' xsi:schemaLocation="http://www.dhl.com ship-val-global-req.xsd"' .
+            ' schemaVersion="6.2" />';
         $xml = $this->_xmlElFactory->create(['data' => $xmlStr]);
 
         $nodeRequest = $xml->addChild('Request', '', '');
@@ -1545,6 +1546,10 @@ protected function _doRequest()
         $nodeServiceHeader->addChild('SiteID', (string)$this->getConfigData('id'));
         $nodeServiceHeader->addChild('Password', (string)$this->getConfigData('password'));
 
+        $nodeMetaData = $nodeRequest->addChild('MetaData');
+        $nodeMetaData->addChild('SoftwareName', $this->buildSoftwareName());
+        $nodeMetaData->addChild('SoftwareVersion', $this->buildSoftwareVersion());
+
         $originRegion = $this->getCountryParams(
             $this->_scopeConfig->getValue(
                 Shipment::XML_PATH_STORE_COUNTRY_ID,
@@ -1585,10 +1590,10 @@ protected function _doRequest()
             ->getRecipientContactCompanyName() : $rawRequest
             ->getRecipientContactPersonName();
 
-        $nodeConsignee->addChild('CompanyName', is_string($companyName) ? substr($companyName, 0, 35) : '');
+        $nodeConsignee->addChild('CompanyName', is_string($companyName) ? substr($companyName, 0, 60) : '');
 
         $address = $rawRequest->getRecipientAddressStreet1() . ' ' . $rawRequest->getRecipientAddressStreet2();
-        $address = $this->string->split($address, 35, false, true);
+        $address = $this->string->split($address, 45, false, true);
         if (is_array($address)) {
             foreach ($address as $addressLine) {
                 $nodeConsignee->addChild('AddressLine', $addressLine);
@@ -1657,7 +1662,7 @@ protected function _doRequest()
         $nodeShipper->addChild('RegisteredAccount', (string)$this->getConfigData('account'));
 
         $address = $rawRequest->getShipperAddressStreet1() . ' ' . $rawRequest->getShipperAddressStreet2();
-        $address = $this->string->split($address, 35, false, true);
+        $address = $this->string->split($address, 45, false, true);
         if (is_array($address)) {
             foreach ($address as $addressLine) {
                 $nodeShipper->addChild('AddressLine', $addressLine);
@@ -1714,7 +1719,6 @@ protected function _doRequest()
             $this->_debug($debugData);
         }
         $this->_isShippingLabelFlag = true;
-
         return $this->_parseResponse($responseBody);
     }
 
@@ -1940,7 +1944,7 @@ protected function _parseXmlTrackingResponse($trackings, $response)
                             $shipmentEventArray['deliverydate'] = (string)$shipmentEvent->Date;
                             $shipmentEventArray['deliverytime'] = (string)$shipmentEvent->Time;
                             $shipmentEventArray['deliverylocation'] = (string)$shipmentEvent->ServiceArea
-                                ->Description . ' [' . (string)$shipmentEvent->ServiceArea->ServiceAreaCode . ']';
+                                    ->Description . ' [' . (string)$shipmentEvent->ServiceArea->ServiceAreaCode . ']';
                             $packageProgress[] = $shipmentEventArray;
                         }
                         $awbinfoData['progressdetail'] = $packageProgress;

dev/tests/integration/testsuite/Magento/Dhl/_files/domestic_shipment_request.xml

@@ -6,14 +6,18 @@
  */
 -->
 <req:ShipmentRequest xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                     xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.0.xsd" schemaVersion="6.0">
+                     xsi:schemaLocation="http://www.dhl.com ship-val-global-req.xsd" schemaVersion="6.2">
     <Request xmlns="">
         <ServiceHeader>
             <MessageTime>currentTime</MessageTime>
             <MessageReference>MAGE_SHIP_28TO32_Char_CHECKED</MessageReference>
             <SiteID>some ID</SiteID>
             <Password>some password</Password>
         </ServiceHeader>
+        <MetaData>
+            <SoftwareName>Magento</SoftwareName>
+            <SoftwareVersion>1.0.0+no-v</SoftwareVersion>
+        </MetaData>
     </Request>
     <RegionCode xmlns="">CHECKED</RegionCode>
     <RequestedPickupTime xmlns="">N</RequestedPickupTime>
@@ -85,4 +89,4 @@
         </Contact>
     </Shipper>
     <LabelImageFormat xmlns="">PDF</LabelImageFormat>
-</req:ShipmentRequest>
+</req:ShipmentRequest>

dev/tests/integration/testsuite/Magento/Dhl/_files/shipment_request.xml

@@ -6,14 +6,18 @@
  */
 -->
 <req:ShipmentRequest xmlns:req="http://www.dhl.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                     xsi:schemaLocation="http://www.dhl.com ship-val-global-req-6.0.xsd" schemaVersion="6.0">
+                     xsi:schemaLocation="http://www.dhl.com ship-val-global-req.xsd" schemaVersion="6.2">
     <Request xmlns="">
         <ServiceHeader>
             <MessageTime>currentTime</MessageTime>
             <MessageReference>MAGE_SHIP_28TO32_Char_CHECKED</MessageReference>
             <SiteID>some ID</SiteID>
             <Password>some password</Password>
         </ServiceHeader>
+        <MetaData>
+            <SoftwareName>Magento</SoftwareName>
+            <SoftwareVersion>1.0.0+no-v</SoftwareVersion>
+        </MetaData>
     </Request>
     <RegionCode xmlns="">CHECKED</RegionCode>
     <RequestedPickupTime xmlns="">N</RequestedPickupTime>

dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt

@@ -7,6 +7,7 @@ app/code/Magento/Sales/view/adminhtml/web/order/create/giftmessage.js
 app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
 app/code/Magento/Shipping/view/adminhtml/web/order/packaging.js
 app/code/Magento/Swagger/view/frontend/web/swagger-ui/js/magento-swagger.js
+app/code/Magento/AdminAdobeIms/view/adminhtml/web/js/loadicons.js
 lib/web/mage/adminhtml/tools.js
 lib/web/mage/adminhtml/varienLoader.js
 lib/web/magnifier/magnifier.js