Merge pull request #9800 from magento-gl/AC-14601-V1

AC-14601 - in case of Regular Size, hight/width/depth fields should n…

Author: glo71317

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

@@ -1436,11 +1436,12 @@ protected function _getQuotesRest()
             "packages" => [
                 [
                     "typeCode" => "3BX",
-                    "weight" => (int) $this->_getWeight($rawRequest->getWeight()),
+                    "weight" => (float) $this->_getWeight($rawRequest->getWeight()),
                     "dimensions" => [
-                        "length" => $this->_getDimension($this->getConfigData('depth')),
-                        "width" => $this->_getDimension($this->getConfigData('width')),
-                        "height" => $this->_getDimension($this->getConfigData('height'))
+                        // If no value is provided for the dimension, a default size of 3 will be used
+                        "length" => $this->_getDimension(max(3, $this->getConfigData('depth'))),
+                        "width" => $this->_getDimension(max(3, $this->getConfigData('width'))),
+                        "height" => $this->_getDimension(max(3, $this->getConfigData('height')))
                     ]
                 ]
             ]
@@ -1575,7 +1576,7 @@ protected function _addRestRate(array $product, array $exchangeRates): self
             $dhlProduct = (string)$product['productCode'];
             $totalPrice = $product['totalPrice'];
             $billic_price = array_column(
-                array_filter($totalPrice, fn($price) => $price['currencyType'] === 'BILLC'),
+                array_filter($totalPrice, fn ($price) => $price['currencyType'] === 'BILLC'),
                 'price'
             );
 
@@ -2245,7 +2246,7 @@ protected function _doShipmentRequestRest(): DataObject
                     "invoice" => [
                         "number" => $rawRequest->getOrderShipment()->getOrder()->getIncrementId(),
                         "date" => date('Y-m-d')
-                        ]
+                    ]
                 ]
             ];
         }

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

@@ -803,9 +803,9 @@ public function testCollectRestRates()
         }
         $requestRest = $this->httpClient->getLastRequest()->getBody();
         self::assertStringContainsString('"weight": 18', $requestRest);
-        self::assertStringContainsString('"height": 0.63', $requestRest);
-        self::assertStringContainsString('"width": 0.63', $requestRest);
-        self::assertStringContainsString('"length": 0', $requestRest);
+        self::assertStringContainsString('"height": 1.181', $requestRest);
+        self::assertStringContainsString('"width": 1.181', $requestRest);
+        self::assertStringContainsString('"length": 1.181', $requestRest);
     }
 
     /**