From 9d291b0702d87704dd4c0e96f619e4b75b343cdf Mon Sep 17 00:00:00 2001
From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Wed, 30 Apr 2025 17:14:10 +0300
Subject: [PATCH] =?utf8?q?=D0=9A=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20=D1=81?=
 =?utf8?q?=D1=80=D0=BE=D0=BA=D0=BE=D0=B2=20=D0=B4=D0=BE=D1=81=D1=82=D0=B0?=
 =?utf8?q?=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/controllers/MarketplaceOrdersController.php     | 10 ++++++++--
 erp24/views/marketplace-orders/get-flowwow-orders.php |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/erp24/controllers/MarketplaceOrdersController.php b/erp24/controllers/MarketplaceOrdersController.php
index d6006b7c..3f5b7995 100644
--- a/erp24/controllers/MarketplaceOrdersController.php
+++ b/erp24/controllers/MarketplaceOrdersController.php
@@ -569,7 +569,7 @@ class MarketplaceOrdersController extends Controller
     public function actionSetOrderDelivery()
     {
         $orders = MarketplaceOrders::find()->where(['delivery_to' => null])->all();
-
+        $countSetDelivery = 0;
         foreach ($orders as $order) {
             $data = json_decode($order->raw_data, true);
             if ($order->marketplace_id == 1 && isset($data['delivery'])) {
@@ -609,7 +609,10 @@ class MarketplaceOrdersController extends Controller
                     $order->readyto_1c = 1;
                     if (!$order->save()) {
                         Yii::error('Ошибка сохранения delivery_to: ' . json_encode($order->getErrors(), JSON_UNESCAPED_UNICODE), __METHOD__);
+                    } else {
+                        $countSetDelivery += 1;
                     }
+
                 } else {
                     Yii::warning("Не удалось разобрать delivery: '{$deliveryText}'", __METHOD__);
                 }
@@ -631,6 +634,8 @@ class MarketplaceOrdersController extends Controller
                             $order->delivery_to = date('Y-m-d H:i:s', strtotime($datetimeString));
                             if(!$order->save()) {
                                 Yii::error('Ошибка сохранения Времени доставки' . json_encode($order->getErrors(), JSON_UNESCAPED_UNICODE), __METHOD__);
+                            } else {
+                                $countSetDelivery += 1;
                             }
                         }
                     }
@@ -639,7 +644,8 @@ class MarketplaceOrdersController extends Controller
                 continue;
             }
         }
-        $this->redirect(['/marketplace-orders/index']);
+        Yii::$app->session->setFlash('success', "Сроки доставки проставлены у {$countSetDelivery} заказов");
+        return $this->redirect(['get-flowwow-orders']);
 
     }
 
diff --git a/erp24/views/marketplace-orders/get-flowwow-orders.php b/erp24/views/marketplace-orders/get-flowwow-orders.php
index d949b843..7cd7e6fc 100644
--- a/erp24/views/marketplace-orders/get-flowwow-orders.php
+++ b/erp24/views/marketplace-orders/get-flowwow-orders.php
@@ -26,7 +26,7 @@ $this->title = 'Загрузка заказов Flowwow';
 
     <?= Html::a('Назад', ['index'], ['class' => 'btn btn-primary my-4']) ?>
     <?= Html::a('Заполнение ссылок на заказы у старых заказов', ['set-order-link'], ['class' => 'btn btn-primary my-4']) ?>
-    <?= Html::a('Проставить доставку', ['set-order-delivery'], ['class' => 'btn btn-primary my-4']) ?>
+    <?= Html::a('Заполнение сроков доставки у старых заказов', ['set-order-delivery'], ['class' => 'btn btn-primary my-4']) ?>
     <h1><?= Html::encode($this->title) ?></h1>
 
 <?php $form = ActiveForm::begin(); ?>
-- 
2.39.5