|
@@ -8,7 +8,6 @@ use RuntimeException;
|
|
|
use SixShop\Core\Contracts\ExtensionInterface;
|
|
use SixShop\Core\Contracts\ExtensionInterface;
|
|
|
use SixShop\Core\Service\CoreService;
|
|
use SixShop\Core\Service\CoreService;
|
|
|
use SixShop\Payment\Contracts\PaymentExtensionInterface;
|
|
use SixShop\Payment\Contracts\PaymentExtensionInterface;
|
|
|
-use SixShop\System\Config\ExtensionConfig;
|
|
|
|
|
use SixShop\System\Enum\ExtensionStatusEnum;
|
|
use SixShop\System\Enum\ExtensionStatusEnum;
|
|
|
use SixShop\System\Model\ExtensionConfigModel;
|
|
use SixShop\System\Model\ExtensionConfigModel;
|
|
|
use SixShop\System\Model\ExtensionModel;
|
|
use SixShop\System\Model\ExtensionModel;
|
|
@@ -324,7 +323,7 @@ class ExtensionManager extends Service
|
|
|
|
|
|
|
|
private function getLocalConfig(string $extensionID): Collection
|
|
private function getLocalConfig(string $extensionID): Collection
|
|
|
{
|
|
{
|
|
|
- $config = array_merge(ExtensionConfig::BASE, $this->getExtension($extensionID)->getConfig());
|
|
|
|
|
|
|
+ $config = $this->getExtension($extensionID)->getConfig();
|
|
|
$configCollection = new Collection($config);
|
|
$configCollection = new Collection($config);
|
|
|
Event::trigger('after_read_extension_config', [$configCollection, $extensionID]);
|
|
Event::trigger('after_read_extension_config', [$configCollection, $extensionID]);
|
|
|
Event::trigger('after_read_extension_config_' . $extensionID, $configCollection);
|
|
Event::trigger('after_read_extension_config_' . $extensionID, $configCollection);
|