Skip to content

Commit e86e8b3

Browse files
committed
#AC-11811-UPS REST A shipment cannot have a KGS/IN or LBS/CM or OZS/CM as its unit of measurements
1 parent e1babcf commit e86e8b3

File tree

1 file changed

+21
-5
lines changed

1 file changed

+21
-5
lines changed

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

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,11 @@ public function setRequest(RateRequest $request)
432432
$unit = $this->getConfigData('unit_of_measure');
433433
}
434434
$rowRequest->setUnitMeasure($unit);
435+
436+
$rowRequest->setPackageHeight($request->getPackageHeight());
437+
$rowRequest->setPackageWidth($request->getPackageWidth());
438+
$rowRequest->setPackageDepth($request->getPackageDepth());
439+
435440
$rowRequest->setIsReturn($request->getIsReturn());
436441
$rowRequest->setBaseSubtotalInclTax($request->getBaseSubtotalInclTax());
437442

@@ -1134,6 +1139,17 @@ protected function _getRestQuotes()
11341139
$rateParams['RateRequest']['Shipment']['Service']['Description'] = $serviceDescription;
11351140
}
11361141

1142+
if ($rowRequest->getUnitMeasure() == 'KGS') {
1143+
$dimensionUnit = 'CM';
1144+
$dimensionUnitDescription = 'Centimeter';
1145+
} else {
1146+
$dimensionUnit = 'IN';
1147+
$dimensionUnitDescription = 'Inches';
1148+
}
1149+
$height = $rowRequest->getPackageHeight() ?? 0;
1150+
$width = $rowRequest->getPackageWidth() ?? 0;
1151+
$length = $rowRequest->getPackageDepth() ?? 0;
1152+
11371153
foreach ($rowRequest->getPackages() as $package) {
11381154
$rateParams['RateRequest']['Shipment']['Package'][] = [
11391155
"PackagingType" => [
@@ -1142,12 +1158,12 @@ protected function _getRestQuotes()
11421158
],
11431159
"Dimensions" => [
11441160
"UnitOfMeasurement" => [
1145-
"Code" => "IN",
1146-
"Description" => "Inches"
1161+
"Code" => "{$dimensionUnit}",
1162+
"Description" => "{$dimensionUnitDescription}"
11471163
],
1148-
"Length" => "5",
1149-
"Width" => "5",
1150-
"Height" => "5"
1164+
"Length" => "{$length}",
1165+
"Width" => "{$width}",
1166+
"Height" => "{$height}"
11511167
],
11521168
"PackageWeight" => [
11531169
"UnitOfMeasurement" => [

0 commit comments

Comments
 (0)