Skip to content

Commit e7ae79b

Browse files
authored
Load Region in correct way (#134)
If region Id exist the model should be loaded by ->load() method instead of loadByCode().
1 parent e74f923 commit e7ae79b

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Model/Observer/AddressFormat.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ public function __construct(
3838
*/
3939
public function execute(\Magento\Framework\Event\Observer $observer)
4040
{
41-
41+
/** @var $address \Magento\Sales\Model\Order\Address */
4242
$address = $observer->getEvent()->getAddress();
4343
if($address->getAddressType()) {
44-
if ($address->getRegion() == null) {
45-
$regionId = $address->getRegionId();
44+
if ($address->getRegionId() !== null && $address->getRegion() === null) {
4645
/** @var \Magento\Directory\Model\Region $region */
47-
$region = $this->regionFactory->create();
48-
$region->loadByCode($region, $regionId);
49-
$address->setRegion($region->getName());
50-
$address->setRegionCode($region->getCode());
51-
$address->save();
46+
$region = $this->regionFactory->create()->load($address->getRegionId());
47+
if($region->getId()) {
48+
$address->setRegion($region->getName());
49+
$address->setRegionCode($region->getCode());
50+
$address->save();
51+
}
5252
}
5353
}
5454

0 commit comments

Comments
 (0)