Skip to content

Commit dd7dabd

Browse files
pradeep.rauthanpradeep.rauthan
authored andcommitted
ACP2E-159:Getting RegionID issue in backoffice for Create Order
1 parent 46369a9 commit dd7dabd

File tree

1 file changed

+1
-11
lines changed
  • app/code/Magento/Directory/Helper

1 file changed

+1
-11
lines changed

app/code/Magento/Directory/Helper/Data.php

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,36 +65,26 @@ class Data extends AbstractHelper
6565
const XML_PATH_WEIGHT_UNIT = 'general/locale/weight_unit';
6666

6767
/**
68-
* Country collection
69-
*
7068
* @var Collection
7169
*/
7270
protected $_countryCollection;
7371

7472
/**
75-
* Region collection
76-
*
7773
* @var \Magento\Directory\Model\ResourceModel\Region\Collection
7874
*/
7975
protected $_regionCollection;
8076

8177
/**
82-
* Json representation of regions data
83-
*
8478
* @var string
8579
*/
8680
protected $_regionJson;
8781

8882
/**
89-
* Currency cache
90-
*
9183
* @var array
9284
*/
9385
protected $_currencyCache = [];
9486

9587
/**
96-
* ISO2 country codes which have optional Zip/Postal pre-configured
97-
*
9888
* @var array
9989
*/
10090
protected $_optZipCountries = null;
@@ -434,7 +424,7 @@ private function getCurrentScope(): array
434424
'value' => $request->getParam(self::STORE_ID),
435425
];
436426
} else {
437-
$storeId = $this->_storeManager->getStore()->getId();
427+
$storeId = $this->_storeManager->getStore()->getId() ?? null;
438428
if ($storeId) {
439429
$scope = [
440430
'type' => ScopeInterface::SCOPE_STORE,

0 commit comments

Comments
 (0)