File tree Expand file tree Collapse file tree 1 file changed +1
-11
lines changed
app/code/Magento/Directory/Helper Expand file tree Collapse file tree 1 file changed +1
-11
lines changed Original file line number Diff line number Diff line change @@ -65,36 +65,26 @@ class Data extends AbstractHelper
65
65
const XML_PATH_WEIGHT_UNIT = 'general/locale/weight_unit ' ;
66
66
67
67
/**
68
- * Country collection
69
- *
70
68
* @var Collection
71
69
*/
72
70
protected $ _countryCollection ;
73
71
74
72
/**
75
- * Region collection
76
- *
77
73
* @var \Magento\Directory\Model\ResourceModel\Region\Collection
78
74
*/
79
75
protected $ _regionCollection ;
80
76
81
77
/**
82
- * Json representation of regions data
83
- *
84
78
* @var string
85
79
*/
86
80
protected $ _regionJson ;
87
81
88
82
/**
89
- * Currency cache
90
- *
91
83
* @var array
92
84
*/
93
85
protected $ _currencyCache = [];
94
86
95
87
/**
96
- * ISO2 country codes which have optional Zip/Postal pre-configured
97
- *
98
88
* @var array
99
89
*/
100
90
protected $ _optZipCountries = null ;
@@ -434,7 +424,7 @@ private function getCurrentScope(): array
434
424
'value ' => $ request ->getParam (self ::STORE_ID ),
435
425
];
436
426
} else {
437
- $ storeId = $ this ->_storeManager ->getStore ()->getId ();
427
+ $ storeId = $ this ->_storeManager ->getStore ()->getId () ?? null ;
438
428
if ($ storeId ) {
439
429
$ scope = [
440
430
'type ' => ScopeInterface::SCOPE_STORE ,
You can’t perform that action at this time.
0 commit comments