From e8eeaf2bc2495b2b98edf1fc5fb8cf58f96496e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Thu, 2 May 2024 18:40:01 +0300
Subject: [PATCH] Fixed installation default module `FinishInstallation`
 listener issue

---
 app/Utilities/ModuleActivator.php |  4 ++++
 app/Utilities/helpers.php         | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/app/Utilities/ModuleActivator.php b/app/Utilities/ModuleActivator.php
index e56c8363a..4060288c5 100644
--- a/app/Utilities/ModuleActivator.php
+++ b/app/Utilities/ModuleActivator.php
@@ -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;
         }
diff --git a/app/Utilities/helpers.php b/app/Utilities/helpers.php
index cd52d1d01..249d126e2 100644
--- a/app/Utilities/helpers.php
+++ b/app/Utilities/helpers.php
@@ -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
     {