From 0391c2c1af02482af9bf3c6e8e560b8068868d61 Mon Sep 17 00:00:00 2001
From: kirostumm <kirostumm@gmail.com>
Date: Mon, 4 Dec 2023 18:08:55 +0300
Subject: [PATCH] =?utf8?q?=D0=91=D0=B8=D0=BB=D0=B4=20=D1=80=D0=B0=D0=B1?=
 =?utf8?q?=D0=BE=D1=82=D0=B0=D0=B5=D1=82=20=D0=B1=D0=B5=D0=B7=20=D0=B7?=
 =?utf8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BE=D0=B2,=20=D0=BD=D0=BE=20?=
 =?utf8?q?=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=BD=D0=B5=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 20 +++++++++++--------
 ....php => ChartsForManagementController.php} |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)
 rename erp24/controllers/{ChartForManagementController.php => ChartsForManagementController.php} (99%)

diff --git a/README.md b/README.md
index 1d68d77..0653767 100644
--- a/README.md
+++ b/README.md
@@ -3,29 +3,33 @@
 ### Первоначальный запуск
 ```shell
 docker compose up -d
-docker compose exec php composer install
-docker compose exec php composer -o dump-autoload
-docker compose exec php mkdir /www/web/uploads
-docker compose exec php chmod -R 777 /www/web/uploads
+docker compose exec php-yii_erp24 composer install
+docker compose exec php-yii_erp24 composer -o dump-autoload
+docker compose exec php-yii_erp24 mkdir /www/web/uploads
+docker compose exec php-yii_erp24 chmod -R 777 /www/web/uploads
 
 docker compose run --no-deps --rm node-yii_erp24 npm install
 docker compose up -d node-yii_erp24
 
-gzip -d -c erp24.sql.gz | docker compose exec -T db mysql -proot_password erp24 
+gzip -d -c erp24.sql.gz | docker compose exec -T db-yii_erp24 mysql -proot_password erp24 
 ```
 
 ### Выкладка
 
 Перед выкладкой выполнить
 ```shell
-docker compose run --rm node sh -c "npm install && npm run prod && cp -r /www/dist-prod/* /www/dist"
+docker compose run --rm node-yii_erp24 sh -c "npm install && npm run prod && cp -r /www/dist-prod/* /www/dist"
 ```
 Скопировать dist и нужные папки в продакшн
 
 ### Выгрузка базы в сжатый sql
 ```shell
-docker compose exec db mysqldump -proot_password erp24 > erp24.sql && gzip erp24.sql
+docker compose exec db-yii_erp24 mysql mysqldump -proot_password erp24 > erp24.sql && gzip erp24.sql
 ```
 
 ### Разработка
-* [Работа с gii](doc/gii.md)
\ No newline at end of file
+* [Работа с gii](doc/gii.md)
+
+### Перенести данные в Pgsql
+* Нужно раскомментировать в docker-compose.yml "pgloader-mysql-yii_erp24 ...."
+* И поднять этот контейнер
\ No newline at end of file
diff --git a/erp24/controllers/ChartForManagementController.php b/erp24/controllers/ChartsForManagementController.php
similarity index 99%
rename from erp24/controllers/ChartForManagementController.php
rename to erp24/controllers/ChartsForManagementController.php
index efe3a7e..fdbd43d 100644
--- a/erp24/controllers/ChartForManagementController.php
+++ b/erp24/controllers/ChartsForManagementController.php
@@ -13,7 +13,7 @@ use yii_app\records\Admin;
 use yii_app\records\ChartDataSearch;
 use yii_app\records\WriteOffs;
 
-class ChartForManagementController extends Controller
+class ChartsForManagementController extends Controller
 {
     public function actionIndex()
     {
-- 
2.39.5