From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Mon, 28 Apr 2025 10:25:09 +0000 (+0300)
Subject: Проверка на готовность к отправке
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=e14ef3acf81c472692e4f7fdcbb6249ed6c3b465;p=erp24_rep%2Fyii-erp24%2F.git

Проверка на готовность к отправке
---

diff --git a/erp24/controllers/MarketplaceOrdersController.php b/erp24/controllers/MarketplaceOrdersController.php
index 7451fc04..59ac80cb 100644
--- a/erp24/controllers/MarketplaceOrdersController.php
+++ b/erp24/controllers/MarketplaceOrdersController.php
@@ -162,7 +162,7 @@ class MarketplaceOrdersController extends Controller
             $m->status_1c = MarketplaceOrders::STATUSES_1C_CREATED_IN_ERP;
             $m->guid = DataHelper::createGuidMy('08');
             $m->delivery_to = date('Y-m-d H:i:s', strtotime( '+1 hour'));
-            $m->readyto_1c = 1;
+            //$m->readyto_1c = 1;
 
             if ($m->save()) {
                 MarketplaceService::createOrUpdateStatusHistory($m->id, $status->id, $substatus->id, $orderDetails);
@@ -237,7 +237,7 @@ class MarketplaceOrdersController extends Controller
                 }
 
 
-
+                MarketplaceService::setReadyMarketplaceOrders($m);
                 Yii::$app->session->setFlash('success', "Тестовый заказ Flowwow #{$orderNumber} создан");
             } else {
                 Yii::$app->session->setFlash(
@@ -360,7 +360,7 @@ class MarketplaceOrdersController extends Controller
             $m->status_1c = MarketplaceOrders::STATUSES_1C_CREATED_IN_ERP;
             $deliveryTo = $raw['delivery']['shipments'][0]['shipmentDate'] . ' ' . $raw['delivery']['shipments'][0]['shipmentTime'];
             $m->delivery_to = $deliveryTo;
-            $m->readyto_1c = 1;
+            //$m->readyto_1c = 1;
             if (!$m->save()) {
                 Yii::$app->session->setFlash('error', 'Ошибка создания Яндекс-заказа: '
                     . json_encode($m->getErrors(), JSON_UNESCAPED_UNICODE));
@@ -429,7 +429,7 @@ class MarketplaceOrdersController extends Controller
                 }
 
             }
-
+            MarketplaceService::setReadyMarketplaceOrders($m);
             Yii::$app->session->setFlash('success', "Тестовый заказ Яндекс.Маркет #{$orderNumber} создан");
             return $this->redirect(['index']);
         }
diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 71365614..8580fc6c 100644
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -1356,6 +1356,7 @@ class MarketplaceService
                             $updatedOrdersCount += 1;
                         }
                     }
+                    self::setReadyMarketplaceOrders($marketplaceOrder);
                 }
             }
         }
@@ -1978,6 +1979,7 @@ class MarketplaceService
                          )
                      );
                 }
+                self::setReadyMarketplaceOrders($marketplaceOrder);
             }
         } else {
             $marketplaceOrder->status_id = $statusId;
@@ -1999,6 +2001,7 @@ class MarketplaceService
                 } else {
                     Yii::error('Не удалось обновить заказ' . json_encode($marketplaceOrder->getErrors(), JSON_UNESCAPED_UNICODE));
                 }
+
             } elseif ($index == self::SUBJECT_INDEX[self::SUBJECT_CHANGED]) {
                 $oldRawData = json_decode($marketplaceOrder->raw_data,true, 512, JSON_UNESCAPED_UNICODE);
                 $isChanged = false;
@@ -2032,6 +2035,7 @@ class MarketplaceService
                     } else {
                         Yii::error('Не удалось обновить заказ' . json_encode($marketplaceOrder->getErrors(), JSON_UNESCAPED_UNICODE));
                     }
+
                 }
             } else {
                 // отмена или успешное выполнение
@@ -2042,6 +2046,7 @@ class MarketplaceService
                     Yii::error('Не удалось обновить заказ' . json_encode($marketplaceOrder->getErrors(), JSON_UNESCAPED_UNICODE));
                 }
             }
+            self::setReadyMarketplaceOrders($marketplaceOrder);
         }
 
         return $newOrdersCount;