Fixed installation default module `FinishInstallation` listener issue
This commit is contained in:
parent
b91951547d
commit
e8eeaf2bc2
|
|
@ -37,6 +37,10 @@ class ModuleActivator implements ActivatorInterface
|
|||
return true;
|
||||
}
|
||||
|
||||
if (running_in_install() && in_array($module->getAlias(), ['offline-payments', 'paypal-standard'])) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (! isset($this->statuses[$module->getAlias()])) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -165,6 +165,16 @@ if (! function_exists('array_values_recursive')) {
|
|||
}
|
||||
}
|
||||
|
||||
if (! function_exists('running_in_install')) {
|
||||
/**
|
||||
* Detect if application is running in queue.
|
||||
*/
|
||||
function running_in_install(): bool
|
||||
{
|
||||
return request_is_install() && env('APP_INSTALLED', false) == false;
|
||||
}
|
||||
}
|
||||
|
||||
if (! function_exists('running_in_queue')) {
|
||||
/**
|
||||
* Detect if application is running in queue.
|
||||
|
|
@ -340,6 +350,15 @@ if (! function_exists('is_cloud')) {
|
|||
}
|
||||
}
|
||||
|
||||
if (! function_exists('request_is_install')) {
|
||||
function request_is_install(Request|null $request = null): bool
|
||||
{
|
||||
$r = $request ?: request();
|
||||
|
||||
return $r->is('install/*');
|
||||
}
|
||||
}
|
||||
|
||||
if (! function_exists('request_is_api')) {
|
||||
function request_is_api(Request|null $request = null): bool
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue