Кнопка сроков доставки

diff --git a/erp24/controllers/MarketplaceOrdersController.php b/erp24/controllers/MarketplaceOrdersController.php
index d6006b7cd60efed8cdc0aef7c8b004e4bfbb26dd..3f5b79955f680f04b629efd1d4a89248832e7ab6 100644 (file)
--- 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 d949b8439f339508cbfdee982748eea1ac88b8cb..7cd7e6fca4faecf702b8f94a70660fe5a7586779 100644 (file)
--- 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('Ð\9fÑ\80оÑ\81Ñ\82авиÑ\82Ñ\8c доÑ\81Ñ\82авкÑ\83', ['set-order-delivery'], ['class' => 'btn btn-primary my-4']) ?>
+    <?= Html::a('Ð\97аполнение Ñ\81Ñ\80оков доÑ\81Ñ\82авки Ñ\83 Ñ\81Ñ\82аÑ\80Ñ\8bÑ\85 заказов', ['set-order-delivery'], ['class' => 'btn btn-primary my-4']) ?>
     <h1><?= Html::encode($this->title) ?></h1>
 
 <?php $form = ActiveForm::begin(); ?>