feat: provide current opencart timezone to App

This commit is contained in:
2025-11-30 11:45:40 +03:00
committed by Nikita Kiselev
parent eabc66246c
commit 51f462922e

View File

@@ -7,7 +7,6 @@ use Cart\Currency;
use Cart\Tax; use Cart\Tax;
use Monolog\Handler\RotatingFileHandler; use Monolog\Handler\RotatingFileHandler;
use Monolog\Logger; use Monolog\Logger;
use Openguru\OpenCartFramework\Http\Response as HttpResponse;
use Openguru\OpenCartFramework\ImageTool\ImageTool; use Openguru\OpenCartFramework\ImageTool\ImageTool;
use Openguru\OpenCartFramework\ImageTool\ImageToolInterface; use Openguru\OpenCartFramework\ImageTool\ImageToolInterface;
use Openguru\OpenCartFramework\OpenCart\Decorators\OcRegistryDecorator; use Openguru\OpenCartFramework\OpenCart\Decorators\OcRegistryDecorator;
@@ -41,9 +40,6 @@ class ControllerExtensionTgshopHandle extends Controller
public function index(): void public function index(): void
{ {
$bootstrapLogger = $this->createLogger();
try {
$this->session->data['language'] = $this->config->get('config_language'); $this->session->data['language'] = $this->config->get('config_language');
$json = $this->model_setting_setting->getSetting('module_telecart'); $json = $this->model_setting_setting->getSetting('module_telecart');
@@ -54,7 +50,8 @@ class ControllerExtensionTgshopHandle extends Controller
$items = Arr::mergeArraysRecursively($json['module_telecart_settings'], [ $items = Arr::mergeArraysRecursively($json['module_telecart_settings'], [
'app' => [ 'app' => [
'shop_base_url' => HTTPS_SERVER, // for catalog: HTTPS_SERVER, for admin: HTTPS_CATALOG 'shop_base_url' => HTTPS_SERVER, // for catalog: HTTPS_SERVER, for admin: HTTPS_CATALOG
'language_id' => (int) $this->config->get('config_language_id'), 'language_id' => (int)$this->config->get('config_language_id'),
'timezone' => $this->config->get('config_timezone'),
], ],
'logs' => [ 'logs' => [
'path' => DIR_LOGS, 'path' => DIR_LOGS,
@@ -65,7 +62,7 @@ class ControllerExtensionTgshopHandle extends Controller
'username' => DB_USERNAME, 'username' => DB_USERNAME,
'password' => DB_PASSWORD, 'password' => DB_PASSWORD,
'prefix' => DB_PREFIX, 'prefix' => DB_PREFIX,
'port' => (int) DB_PORT, 'port' => (int)DB_PORT,
], ],
'store' => [ 'store' => [
'oc_store_id' => 0, 'oc_store_id' => 0,
@@ -73,7 +70,7 @@ class ControllerExtensionTgshopHandle extends Controller
'oc_config_tax' => filter_var($this->config->get('config_tax'), FILTER_VALIDATE_BOOLEAN), 'oc_config_tax' => filter_var($this->config->get('config_tax'), FILTER_VALIDATE_BOOLEAN),
], ],
'orders' => [ 'orders' => [
'oc_customer_group_id' => (int) $this->config->get('config_customer_group_id'), 'oc_customer_group_id' => (int)$this->config->get('config_customer_group_id'),
], ],
]); ]);
@@ -96,14 +93,6 @@ class ControllerExtensionTgshopHandle extends Controller
$app $app
->withLogger(fn($app) => $this->createLogger($appDebug)) ->withLogger(fn($app) => $this->createLogger($appDebug))
->bootAndHandleRequest(); ->bootAndHandleRequest();
} catch (Throwable $e) {
$bootstrapLogger->error($e->getMessage(), ['exception' => $e]);
http_response_code(HttpResponse::HTTP_INTERNAL_SERVER_ERROR);
header('Content-Type: application/json');
echo json_encode([
'error' => 'Server Error.',
], JSON_THROW_ON_ERROR);
}
} }
function extractPureJs($input) function extractPureJs($input)