@@ -492,12 +492,17 @@ public function isAutoNewsletterSubscriptionOn($scopeId = null, $scope = null):
492
492
public function getConfig ($ configPath , $ scopeId = null , $ scope = null )
493
493
{
494
494
if (!$ scope && $ this ->isSingleStoreMode ()) {
495
- return $ this ->scopeConfig ->getValue ($ configPath );
495
+ $ singleStoreResult = $ this ->scopeConfig ->getValue ($ configPath );
496
+ if ($ singleStoreResult !== null ) {
497
+ return $ singleStoreResult ;
498
+ }
496
499
}
497
500
try {
498
501
$ value = $ this ->scopeConfig ->getValue (
499
- $ configPath , $ scope ?: ScopeInterface::SCOPE_STORE , $ scopeId === null
500
- ? $ this ->storeManager ->getStore ()->getId () : $ scopeId
502
+ $ configPath ,
503
+ $ scope ?: ScopeInterface::SCOPE_STORE ,
504
+ $ scopeId === null
505
+ ? $ this ->storeManager ->getStore ()->getId () : $ scopeId
501
506
);
502
507
} catch (NoSuchEntityException $ e ) {
503
508
return null ;
@@ -838,7 +843,8 @@ public function getAllFBEInstalledStores()
838
843
{
839
844
$ stores = $ this ->storeManager ->getStores ();
840
845
return array_filter (
841
- $ stores , function ($ store ) {
846
+ $ stores ,
847
+ function ($ store ) {
842
848
$ scopeId = $ store ->getId ();
843
849
return $ this ->isPostOnboardingState ($ scopeId );
844
850
}
@@ -852,7 +858,8 @@ public function getAllOnsiteFBEInstalledStores()
852
858
{
853
859
$ stores = $ this ->storeManager ->getStores ();
854
860
return array_filter (
855
- $ stores , function ($ store ) {
861
+ $ stores ,
862
+ function ($ store ) {
856
863
$ scopeId = $ store ->getId ();
857
864
return $ this ->isPostOnboardingState ($ scopeId ) &&
858
865
$ this ->isActiveExtension ($ scopeId ) &&
0 commit comments