From: fomichev Date: Thu, 24 Apr 2025 09:39:37 +0000 (+0300) Subject: Форма загрузки X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=a5e8d981c2c0d2ffb44603c68f071853e8206108;p=erp24_rep%2Fyii-erp24%2F.git Форма загрузки --- diff --git a/erp24/media/config/media.config.php b/erp24/media/config/media.config.php index 74448dac..5e51a59e 100644 --- a/erp24/media/config/media.config.php +++ b/erp24/media/config/media.config.php @@ -97,8 +97,6 @@ return [ '@npm' => '@vendor/npm-asset', '@dist' => '@app/dist', '@uploads' => "@yii_app/uploads", - - ], 'params' => require dirname(__DIR__, 2) . '/config/params.php', 'timeZone' => 'Europe/Moscow', diff --git a/erp24/media/controllers/MarketplaceController.php b/erp24/media/controllers/MarketplaceController.php index 388ea99b..f1c52c33 100644 --- a/erp24/media/controllers/MarketplaceController.php +++ b/erp24/media/controllers/MarketplaceController.php @@ -74,7 +74,6 @@ class MarketplaceController extends Controller throw new \yii\web\NotFoundHttpException("Заказ не найден."); } if (Yii::$app->request->isPost) { - Yii::error('Ошибка' ); $files = UploadedFile::getInstancesByName('files'); Files::deleteAll(['entity_id' => $order->id, 'entity' => $entity]); $uploads = Yii::getAlias("@uploads"); @@ -82,6 +81,8 @@ class MarketplaceController extends Controller foreach ($files as $file) { $filePath = $uploads . $target_dir; + Yii::warning('UPLOADS = ' . Yii::getAlias('@uploads')); + Yii::warning('filePath = ' . $filePath); if (!is_dir($filePath)) { mkdir($filePath, 0777, true); } @@ -107,12 +108,12 @@ class MarketplaceController extends Controller } } Yii::$app->session->setFlash('success', 'Файлы успешно загружены.'); - return $this->render('upload', [ + return $this->render('upload.php', [ 'guid' => $guid, ]); } - - return $this->render('upload', [ + Yii::warning('Путь к вью: ' . dirname(__DIR__, 2) . '/views/marketplace/upload.php'); + return $this->render('upload.php', [ 'guid' => $guid, ]); } diff --git a/erp24/media/index.php b/erp24/media/index.php index abd42f99..8747f018 100644 --- a/erp24/media/index.php +++ b/erp24/media/index.php @@ -9,11 +9,11 @@ require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php'; $config = require __DIR__.'/config/media.config.php'; Yii::setAlias('@yii_app', dirname(__DIR__)); -Yii::setAlias('@webroot', dirname(__DIR__, 3) . '/web'); +Yii::setAlias('@uploads', dirname(__DIR__) . '/uploads'); +Yii::setAlias('@webroot', dirname(__DIR__) . '/web'); Yii::setAlias('@web', '/'); -Yii::setAlias('@uploads', dirname(__DIR__, 3) . '/uploads'); -// echo Yii::getAlias('@webroot'); // Должно вывести путь до web/ -// exit; + + $application = new yii\web\Application($config); $exitCode = $application->run(); exit($exitCode); diff --git a/erp24/media/views/layouts/_____main.php b/erp24/media/views/layouts/_____main.php deleted file mode 100644 index 047fa9a1..00000000 --- a/erp24/media/views/layouts/_____main.php +++ /dev/null @@ -1,83 +0,0 @@ -registerCsrfMetaTags(); -$this->registerMetaTag(['charset' => Yii::$app->charset], 'charset'); -$this->registerMetaTag(['name' => 'viewport', 'content' => 'width=device-width, initial-scale=1, shrink-to-fit=no']); -$this->registerMetaTag(['name' => 'description', 'content' => $this->params['meta_description'] ?? '']); -$this->registerMetaTag(['name' => 'keywords', 'content' => $this->params['meta_keywords'] ?? '']); -$this->registerLinkTag(['rel' => 'icon', 'type' => 'image/x-icon', 'href' => Yii::getAlias('@web/favicon.ico')]); -?> -beginPage() ?> - - - - <?= Html::encode($this->title) ?> - head() ?> - - -beginBody() ?> - - - -
-
- params['breadcrumbs'])): ?> - $this->params['breadcrumbs']]) ?> - - - -
-
- - - -endBody() ?> - - -endPage() ?> diff --git a/erp24/media/views/layouts/api2_menu.php b/erp24/media/views/layouts/api2_menu.php deleted file mode 100644 index 18e16f09..00000000 --- a/erp24/media/views/layouts/api2_menu.php +++ /dev/null @@ -1,7 +0,0 @@ -registerJS(" - var ADMIN_ID = " . (Yii::$app->user->id ?? 0) . "; -", \yii\web\View::POS_BEGIN, 'api2_menu_init_global_vars'); - -$this->registerJsFile('/js/site/get_menu.js', ['position' => \yii\web\View::POS_END]); diff --git a/erp24/media/views/layouts/footer.php b/erp24/media/views/layouts/footer.php deleted file mode 100755 index b9cbac8a..00000000 --- a/erp24/media/views/layouts/footer.php +++ /dev/null @@ -1,22 +0,0 @@ -getDbProfiling(); -global $modul, $act, $tstart; - -$totalTime=round((microtime(1)-$tstart),4); -?> - diff --git a/erp24/media/views/layouts/header.php b/erp24/media/views/layouts/header.php deleted file mode 100755 index a3673896..00000000 --- a/erp24/media/views/layouts/header.php +++ /dev/null @@ -1,274 +0,0 @@ -registerCssFile('/css/timetable/style.css'); -?> -
- - -
-
-
-
- - - -
-
-
-
- - - -
-
-
- - -
- " height=40 alt="img" class="avatar"> -
- - -
- - - :
- - - -
- - -
- -
- -
- -
-
-
-
-
- - diff --git a/erp24/media/views/layouts/main.php b/erp24/media/views/layouts/main.php index edcf0f5f..199636ad 100755 --- a/erp24/media/views/layouts/main.php +++ b/erp24/media/views/layouts/main.php @@ -5,11 +5,6 @@ */ global $_CONFIG; - app\assets\CommonAsset::register($this); -app\assets\CachemenutopAsset::register($this); - app\assets\JQueryPluginsAsset::register($this); /** @TODO удалить после переписывания основного функционала */ - -use yii\widgets\Breadcrumbs; ?> beginPage() ?> @@ -21,69 +16,21 @@ use yii\widgets\Breadcrumbs; <?= $this->title ? $this->title : \yii_app\records\CrmMenu::getTitle(parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)) ?> head(); ?> - - + + beginBody(); ?>
- -
- render('header.php'); ?> - isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [], - ]) */?> - +
+
- render('footer.php'); ?> -
- + + endBody(); ?> diff --git a/erp24/media/views/layouts/menu.php b/erp24/media/views/layouts/menu.php deleted file mode 100755 index 122108a2..00000000 --- a/erp24/media/views/layouts/menu.php +++ /dev/null @@ -1,53 +0,0 @@ - \ No newline at end of file diff --git a/erp24/media/views/marketplace/upload.php b/erp24/media/views/marketplace/upload.php index fe4596b2..92275590 100644 --- a/erp24/media/views/marketplace/upload.php +++ b/erp24/media/views/marketplace/upload.php @@ -8,16 +8,91 @@ use yii\helpers\Html; $this->title = 'Загрузка фотографий заказа (GUID: ' . $guid . ')'; ?> -

title) ?>

+
+
+

title) ?>

-session->hasFlash('success')): ?> -
- session->getFlash('success') ?> + session->hasFlash('success')): ?> +
+ session->getFlash('success') ?> +
+ + +
+ + +
+ + +
+ + +
+
- -
- - - -
\ No newline at end of file +registerCss(<< \ No newline at end of file diff --git a/erp24/views/marketplace/upload.php b/erp24/views/marketplace/upload.php new file mode 100644 index 00000000..ca248862 --- /dev/null +++ b/erp24/views/marketplace/upload.php @@ -0,0 +1,23 @@ +title = 'Загрузка фотографий заказа (GUID: ' . $guid . ')'; +?> + +

title) ?>

+ +session->hasFlash('success')): ?> +
+ session->getFlash('success') ?> +
+ + +
+ + + +
\ No newline at end of file