Кнопка ссылок

diff --git a/erp24/controllers/MarketplaceOrdersController.php b/erp24/controllers/MarketplaceOrdersController.php
index c6829fa14995a123584756983ca591645becf0a6..d6006b7cd60efed8cdc0aef7c8b004e4bfbb26dd 100644 (file)
--- a/erp24/controllers/MarketplaceOrdersController.php
+++ b/erp24/controllers/MarketplaceOrdersController.php
@@ -529,7 +529,7 @@ class MarketplaceOrdersController extends Controller
     public function actionSetOrderLink()
     {
         $orders = MarketplaceOrders::find()->where(['order_link' => null])->all();
-
+        $countSetLink = 0;
         foreach ($orders as $order) {
             if ($order->marketplace_id == 1) {
                 $baseUrl = "https://flowwow.com/admin/order/index?Order%5Bid%5D=";
@@ -537,6 +537,9 @@ class MarketplaceOrdersController extends Controller
                 if(!$order->save()) {
                     Yii::error('Ошибка сохранения ссылки' . json_encode($order->getErrors(), JSON_UNESCAPED_UNICODE), __METHOD__);
                 }
+                else {
+                    $countSetLink += 1;
+                }
 //                $data = json_decode($order->raw_data, true);
 //                if (isset($data['orderLink'])) {
 //                    $order->order_link = $data['orderLink'];
@@ -549,14 +552,17 @@ class MarketplaceOrdersController extends Controller
                 $order->order_link = $baseUrl . $order->marketplace_order_id . "?tld=ru&partnerId=197274828";
                 if(!$order->save()) {
                     Yii::error('Ошибка сохранения ссылки' . json_encode($order->getErrors(), JSON_UNESCAPED_UNICODE), __METHOD__);
+                } else {
+                    $countSetLink += 1;
                 }
             } else {
                 continue;
             }
 
         }
+        Yii::$app->session->setFlash('success', "Создание ссылок завершено - создано {$countSetLink} ссылок");
+        return $this->redirect(['get-flowwow-orders']);
 
-        $this->redirect(['/marketplace-orders/index']);
 
     }
 

diff --git a/erp24/views/marketplace-orders/get-flowwow-orders.php b/erp24/views/marketplace-orders/get-flowwow-orders.php
index 88e186b9f33455811f91f409bc475565ef0f9321..d949b8439f339508cbfdee982748eea1ac88b8cb 100644 (file)
--- a/erp24/views/marketplace-orders/get-flowwow-orders.php
+++ b/erp24/views/marketplace-orders/get-flowwow-orders.php
@@ -6,13 +6,26 @@ use yii\widgets\ActiveForm;
 /* @var $model FlowwowOrdersForm */
 /* @var $progress array */
 /* @var $result string */
-
+$this->registerJsFile('/js/marketplace-orders/marketplace-orders.js', ['position' => \yii\web\View::POS_END]);
 $this->title = 'Загрузка заказов Flowwow';
 ?>
 <div class="get-flowwow-orders p-4">
+    <?php if (Yii::$app->session->hasFlash('error')): ?>
+        <div class="alert alert-danger alert-dismissable">
+            <button  data-dismiss="alert" class="close" type="button">×</button>
+            <?= Yii::$app->session->getFlash('error') ?>
+        </div>
+    <?php endif; ?>
+
+    <?php if (Yii::$app->session->hasFlash('success')): ?>
+        <div class="alert alert-success alert-dismissable">
+            <button  data-dismiss="alert" class="close" type="button">×</button>
+            <?= Yii::$app->session->getFlash('success') ?>
+        </div>
+    <?php endif; ?>
 
     <?= Html::a('Назад', ['index'], ['class' => 'btn btn-primary my-4']) ?>
-    <?= Html::a('СÑ\81Ñ\8bлки на заказÑ\8b', ['set-order-link'], ['class' => 'btn btn-primary my-4']) ?>
+    <?= Html::a('Ð\97аполнение Ñ\81Ñ\81Ñ\8bлок на заказÑ\8b Ñ\83 Ñ\81Ñ\82аÑ\80Ñ\8bÑ\85 заказов', ['set-order-link'], ['class' => 'btn btn-primary my-4']) ?>
     <?= Html::a('Проставить доставку', ['set-order-delivery'], ['class' => 'btn btn-primary my-4']) ?>
     <h1><?= Html::encode($this->title) ?></h1>
 

diff --git a/erp24/web/js/marketplace-orders/marketplace-orders.js b/erp24/web/js/marketplace-orders/marketplace-orders.js
index cb371bc485f720f60ec5b117e5f0589c1659bef5..61c773a311e8610ce777b5aa38d8733e81c4ce63 100644 (file)
--- a/erp24/web/js/marketplace-orders/marketplace-orders.js
+++ b/erp24/web/js/marketplace-orders/marketplace-orders.js
@@ -77,3 +77,11 @@ $(".toggle-composition").on("click", function () {
         }
     });
 });
+
+document.addEventListener('DOMContentLoaded', function () {
+    document.querySelectorAll('.alert .close').forEach(function (btn) {
+        btn.addEventListener('click', function () {
+            this.parentElement.style.display = 'none';
+        });
+    });
+});