merge
This commit is contained in:
commit
2ae128ff79
@ -5,6 +5,7 @@ DB_USER={db_user}
|
|||||||
DB_DRIVER=mysql
|
DB_DRIVER=mysql
|
||||||
DB_PASSWORD={db_password}
|
DB_PASSWORD={db_password}
|
||||||
DB_NAME={db_name}
|
DB_NAME={db_name}
|
||||||
|
|
||||||
DB_CHARSET=utf8mb4
|
DB_CHARSET=utf8mb4
|
||||||
DB_COLLATION=utf8mb4_unicode_ci
|
DB_COLLATION=utf8mb4_unicode_ci
|
||||||
DB_PREFIX=''
|
DB_PREFIX=''
|
||||||
|
3
.gitignore
vendored
3
.gitignore
vendored
@ -3,4 +3,5 @@ vendor
|
|||||||
.env
|
.env
|
||||||
views_cache
|
views_cache
|
||||||
resources/upload
|
resources/upload
|
||||||
resources/tmp
|
resources/tmp
|
||||||
|
composer.lock
|
3292
composer.lock
generated
3292
composer.lock
generated
File diff suppressed because it is too large
Load Diff
@ -475,11 +475,9 @@ class ModuleService
|
|||||||
{
|
{
|
||||||
if ($this->isServerAvailable()){
|
if ($this->isServerAvailable()){
|
||||||
$modules_info = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug');
|
$modules_info = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug');
|
||||||
|
|
||||||
if (!$this->issetModuleShopToken()){
|
if (!$this->issetModuleShopToken()){
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$modules_info = json_decode($modules_info->getBody()->getContents(), true);
|
$modules_info = json_decode($modules_info->getBody()->getContents(), true);
|
||||||
$mod_info = $this->getModuleInfoBySlug($slug);
|
$mod_info = $this->getModuleInfoBySlug($slug);
|
||||||
foreach ($modules_info as $mod) {
|
foreach ($modules_info as $mod) {
|
||||||
@ -528,5 +526,4 @@ class ModuleService
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -79,7 +79,5 @@ if ($moduleService->isActive('module_shop_client')) {
|
|||||||
ModuleTabsWidget::create()->run();
|
ModuleTabsWidget::create()->run();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$table->create();
|
$table->create();
|
||||||
$table->render();
|
$table->render();
|
||||||
|
Loading…
Reference in New Issue
Block a user