ACP2E-873 Allowed Country per website issue

rajan-adobe · rajan-adobe · commit cc0286af93ee · 2022-06-08T06:28:24.000+05:30
Unit test failures fixed
diff --git a/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php b/app/code/Magento/Customer/Model/ResourceModel/AddressRepository.php
@@ -120,7 +120,10 @@ public function save(\Magento\Customer\Api\Data\AddressInterface $address)
         } else {
             $addressModel->updateData($address);
         }
-        if ($customerModel->getSharingConfig()->isWebsiteScope()) {
+        if (
+            $customerModel->getSharingConfig() !== null &&
+            $customerModel->getSharingConfig()->isWebsiteScope()
+        ) {
             $addressModel->setStoreId($customerModel->getStoreId());
         }
 

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,10 @@ public function save(\Magento\Customer\Api\Data\AddressInterface $address)`
`120`	`120`	`} else {`
`121`	`121`	`$addressModel->updateData($address);`
`122`	`122`	`}`
`123`		`- if ($customerModel->getSharingConfig()->isWebsiteScope()) {`
	`123`	`+ if (`
	`124`	`+ $customerModel->getSharingConfig() !== null &&`
	`125`	`+ $customerModel->getSharingConfig()->isWebsiteScope()`
	`126`	`+ ) {`
`124`	`127`	`$addressModel->setStoreId($customerModel->getStoreId());`
`125`	`128`	`}`
`126`	`129`