ENGCOM-3850: Las Palmas and Tenerife should be represented by Canary Islands in UPS #20222

magento-engcom-team · magento-engcom-team · commit 0059ff445ffa · 2019-01-16T06:47:10.000-06:00
- Merge Pull Request #20222 from duckchip/magento2:canary_islands_in_ups_carrier - Merged commits: 1. 9286183 2. eab5472 3. 204e9d8
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
@@ -333,9 +333,9 @@ public function setRequest(RateRequest $request)
         }
 
         // For UPS, Las Palmas and Santa Cruz de Tenerife will be represented by Canary Islands country
-        if (
-            $destCountry == self::SPAIN_COUNTRY_ID &&
-            ($request->getDestRegionCode() == self::LAS_PALMAS_REGION_ID || $request->getDestRegionCode() == self::SANTA_CRUZ_DE_TENERIFE_REGION_ID)
+        if ($destCountry === self::SPAIN_COUNTRY_ID &&
+            ($request->getDestRegionCode() === self::LAS_PALMAS_REGION_ID
+                || $request->getDestRegionCode() === self::SANTA_CRUZ_DE_TENERIFE_REGION_ID)
         ) {
             $destCountry = self::CANARY_ISLANDS_COUNTRY_ID;
         }
@@ -1708,6 +1708,7 @@ public function getCustomizableContainerTypes()
 
     /**
      * Get delivery confirmation level based on origin/destination
+     *
      * Return null if delivery confirmation is not acceptable
      *
      * @param string|null $countyDestination

Original file line number	Diff line number	Diff line change
`@@ -333,9 +333,9 @@ public function setRequest(RateRequest $request)`
`333`	`333`	`}`
`334`	`334`
`335`	`335`	`// For UPS, Las Palmas and Santa Cruz de Tenerife will be represented by Canary Islands country`
`336`		`- if (`
`337`		`- $destCountry == self::SPAIN_COUNTRY_ID &&`
`338`		`- ($request->getDestRegionCode() == self::LAS_PALMAS_REGION_ID \|\| $request->getDestRegionCode() == self::SANTA_CRUZ_DE_TENERIFE_REGION_ID)`
	`336`	`+ if ($destCountry === self::SPAIN_COUNTRY_ID &&`
	`337`	`+ ($request->getDestRegionCode() === self::LAS_PALMAS_REGION_ID`
	`338`	`+ \|\| $request->getDestRegionCode() === self::SANTA_CRUZ_DE_TENERIFE_REGION_ID)`
`339`	`339`	`) {`
`340`	`340`	`$destCountry = self::CANARY_ISLANDS_COUNTRY_ID;`
`341`	`341`	`}`
`@@ -1708,6 +1708,7 @@ public function getCustomizableContainerTypes()`
`1708`	`1708`
`1709`	`1709`	`/**`
`1710`	`1710`	`* Get delivery confirmation level based on origin/destination`
	`1711`	`+ *`
`1711`	`1712`	`* Return null if delivery confirmation is not acceptable`
`1712`	`1713`	`*`
`1713`	`1714`	`* @param string\|null $countyDestination`