Настройка очередей

diff --git a/docker/supervisor/Dockerfile b/docker/supervisor/Dockerfile
index 293de9983f54f25895d3d1a3487f2aabba6f53ce..c9a1eca131087490f701cbe404db3e14fbc1f881 100644 (file)
--- a/docker/supervisor/Dockerfile
+++ b/docker/supervisor/Dockerfile
@@ -6,7 +6,7 @@ RUN mkdir -p /var/log/supervisor
 
 # Добавление PostgreSQL драйверов
 RUN apk add --no-cache postgresql-dev \
-    && docker-php-ext-install pdo_pgsql
+    && docker-php-ext-install pdo_pgsql calendar
 # Копирование конфигурации
 COPY ./conf/supervisord.conf /etc/supervisor/supervisord.conf
 COPY ./conf/queue-worker.conf /etc/supervisor/conf.d/queue-worker.conf

diff --git a/docker/supervisor/conf/queue-worker.conf b/docker/supervisor/conf/queue-worker.conf
index beea37157fe5d7f1e9ea38dde15aea0a3e56d6d7..49a8ef4e68f92ad906e25425b93fe91fbfe8ff72 100644 (file)
--- a/docker/supervisor/conf/queue-worker.conf
+++ b/docker/supervisor/conf/queue-worker.conf
@@ -1,5 +1,5 @@
 [program:yii-queue]
-command=/usr/local/bin/php /www/yii queue/listen --verbose
+command=/usr/local/bin/php -d memory_limit=512M /www/yii queue/listen amqp --verbose=1 --color=0
 autostart=true
 autorestart=true
 stderr_logfile=/var/log/supervisor/yii-queue.err.log

diff --git a/erp24/composer.json b/erp24/composer.json
index a5ef737e0ccc3f99cd6fda7c0f2a04530c5baff2..75a9bfcd370bc49bf0efe7e8b243469718f6b3d4 100644 (file)
--- a/erp24/composer.json
+++ b/erp24/composer.json
@@ -42,6 +42,7 @@
         "kartik-v/yii2-export": "@dev",
         "ramsey/uuid": "^4.7",
         "ext-imap": "*",
+        "ext-calendar": "*",
         "voku/simple_html_dom": "^4.8"
     },
     "require-dev": {

diff --git a/erp24/controllers/CategoryPlanController.php b/erp24/controllers/CategoryPlanController.php
index 7805e95dfeb00d64d886b2f121b990c24e04b953..86c608b114beec2752f597b894dddc5cc7a9151d 100644 (file)
--- a/erp24/controllers/CategoryPlanController.php
+++ b/erp24/controllers/CategoryPlanController.php
@@ -48,7 +48,7 @@ class CategoryPlanController extends Controller {
 
         $service = new AutoPlannogrammaService();
         $isEditable = date($model->year . '-' . $model->month . '-d') > date('Y-m-d') && (
-            (date('d') < 28) || (date('Y-m-d', strtotime('-1 month', strtotime(date($model->year . '-' . $model->month . '-d')))) > date('Y-m-d')));
+            (date('d') < 27) || (date('Y-m-d', strtotime('-1 month', strtotime(date($model->year . '-' . $model->month . '-d')))) > date('Y-m-d')));
 
         $categoryPlan = CategoryPlan::find()->where(['year' => $model->year, 'month' => $model->month, 'store_id' => $model->store_id])->indexBy('category')->asArray()->all();
         $types = [];
@@ -445,7 +445,7 @@ class CategoryPlanController extends Controller {
 
         $service = new AutoPlannogrammaService();
         $isEditable = date($model->year . '-' . $model->month . '-d') > date('Y-m-d') && (
-            (date('d') < 28) || (date('Y-m-d', strtotime('-1 month', strtotime(date($model->year . '-' . $model->month . '-d')))) > date('Y-m-d')));
+            (date('d') < 31) || (date('Y-m-d', strtotime('-1 month', strtotime(date($model->year . '-' . $model->month . '-d')))) > date('Y-m-d')));
 
         $categoryPlan = CategoryPlan::find()->where(['year' => $model->year, 'month' => $model->month, 'store_id' => $model->store_id])->indexBy('category')->asArray()->all();
         $types = [];
@@ -494,7 +494,7 @@ class CategoryPlanController extends Controller {
                 });
 
                 return $this->redirect(array_merge(
-                    ['index'],
+                    ['new'],
                     $params
                 ));
 
@@ -516,7 +516,7 @@ class CategoryPlanController extends Controller {
                 });
 
                 return $this->redirect(array_merge(
-                    ['index'],
+                    ['new'],
                     $params
                 ));
             }

diff --git a/erp24/media/config/media.config.php b/erp24/media/config/media.config.php
index 8bdec6d6d70d2544673028af8bb0c2a36d7c0898..f49f217a9d14046c55beb516a7e9fae58115d7bf 100644 (file)
--- a/erp24/media/config/media.config.php
+++ b/erp24/media/config/media.config.php
@@ -32,9 +32,6 @@ return [
             'ttr' => 300, // Время для выполнения задания
             'attempts' => 3, // Количество попыток
             'exchangeName' => 'telegram-exchange',
-
-
-
         ],
         'urlManager' => [
             'enablePrettyUrl' => true,
@@ -66,16 +63,7 @@ return [
                 ],
             ],
         ],
-        'queue' => [
-            'class' => Queue::class,
-            //'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@rabbitmq-yii_erp24:5672',
-            'dsn' => 'amqp://admin:3qqHK2MRgGgxUdVT61@localhost:5672',
-            'queueName' => 'telegram-queue',
-            'as log' => \yii\queue\LogBehavior::class,
-            'ttr' => 300, // Время для выполнения задания
-            'attempts' => 3, // Количество попыток
-            'exchangeName' => 'telegram-exchange',
-        ],
+
         'user' => [
             'identityClass' => \yii_app\records\Admin::class,
             'enableAutoLogin' => false,