Merge remote-tracking branch 'gl_magento2ce/AC11811' into UPS_AC11811_29APR

Author: glo05363

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

@@ -432,6 +432,19 @@ public function setRequest(RateRequest $request)
             $unit = $this->getConfigData('unit_of_measure');
         }
         $rowRequest->setUnitMeasure($unit);
+
+        $rowRequest->setPackageHeight($request->getPackageHeight());
+        $rowRequest->setPackageWidth($request->getPackageWidth());
+        $rowRequest->setPackageDepth($request->getPackageDepth());
+
+        if ($rowRequest->getUnitMeasure() == 'KGS') {
+            $rowRequest->setUnitDimensions('CM');
+            $rowRequest->setUnitDimensionsDescription('Centimeter');
+        } else {
+            $rowRequest->setUnitDimensions('IN');
+            $rowRequest->setUnitDimensionsDescription('Inches');
+        }
+
         $rowRequest->setIsReturn($request->getIsReturn());
         $rowRequest->setBaseSubtotalInclTax($request->getBaseSubtotalInclTax());
 
@@ -1134,6 +1147,10 @@ protected function _getRestQuotes()
             $rateParams['RateRequest']['Shipment']['Service']['Description'] = $serviceDescription;
         }
 
+        $height = $rowRequest->getPackageHeight() ?? 0;
+        $width = $rowRequest->getPackageWidth() ?? 0;
+        $length = $rowRequest->getPackageDepth() ?? 0;
+
         foreach ($rowRequest->getPackages() as $package) {
             $rateParams['RateRequest']['Shipment']['Package'][] = [
                 "PackagingType" => [
@@ -1142,12 +1159,12 @@ protected function _getRestQuotes()
                 ],
                 "Dimensions" => [
                     "UnitOfMeasurement" => [
-                        "Code" => "IN",
-                        "Description" => "Inches"
+                        "Code" => "{$rowRequest->getUnitDimensions()}",
+                        "Description" => "{$rowRequest->getUnitDimensionsDescription()}"
                     ],
-                    "Length" => "5",
-                    "Width" => "5",
-                    "Height" => "5"
+                    "Length" => "{$length}",
+                    "Width" => "{$width}",
+                    "Height" => "{$height}"
                 ],
                 "PackageWeight" => [
                     "UnitOfMeasurement" => [