From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Mon, 11 Aug 2025 06:27:51 +0000 (+0300)
Subject: Merge branch 'refs/heads/develop' into feature_zozirova_erp-433_fix_view_and_add_new_... 
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=47a4244bd5e5d5f1fef30b0323f397d985685c16;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'refs/heads/develop' into feature_zozirova_erp-433_fix_view_and_add_new_report

# Conflicts:
#	erp24/services/MarketplaceService.php
---

47a4244bd5e5d5f1fef30b0323f397d985685c16
diff --cc erp24/services/MarketplaceService.php
index 3cefeedb,7f895d36..712c3878
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@@ -1802,28 -1778,35 +1814,35 @@@ class MarketplaceServic
      {
          $count = 0;
          if ($message) {
 -                $store = MarketplaceStore::getWarehouseGuidByAccountEmail($message['to']) ?? 206008;
 +            $store = MarketplaceStore::getWarehouseGuidByAccountEmail($message['to']) ?? 206008;
  
 -                $order = self::getOrdersDataFromMessage($message);
 +            $order = self::getOrdersDataFromMessage($message);
  
-             if ($message['subject_index'] == self::SUBJECT_INDEX[self::SUBJECT_NEW]) {
-                 $statusCode = 'PROCESSING';
-                 $substatusCode = 'STARTED';
-             } elseif ($message['subject_index'] == self::SUBJECT_INDEX[self::SUBJECT_APPROVED]) {
-                 $statusCode = 'PROCESSING';
-                 $substatusCode = 'APPROVED';
-             } elseif ($message['subject_index'] == self::SUBJECT_INDEX[self::SUBJECT_CANCELLED]) {
-                 $statusCode = 'CANCELLED';
-                 $substatusCode = 'USER_CHANGED_MIND';
-             } elseif ($message['subject_index'] == self::SUBJECT_INDEX[self::SUBJECT_CHANGED]) {
-                 $statusCode = 'PROCESSING';
-                 $substatusCode = 'CHANGED';
-             } elseif ($message['subject_index'] == self::SUBJECT_INDEX[self::SUBJECT_DELIVERED]) {
-                 $statusCode = 'DELIVERED';
-                 $substatusCode = 'DELIVERY_SERVICE_DELIVERED';
-             }
-             $count = self::processFlowwowOrders($order, $store, $statusCode, $substatusCode, $message['subject_index']);
- 
+                 if ($message['subject_index'] == self::SUBJECT_INDEX[self::SUBJECT_NEW]) {
+                     $statusCode = 'PROCESSING';
+                     $substatusCode = 'STARTED';
+                 } elseif ($message['subject_index'] == self::SUBJECT_INDEX[self::SUBJECT_APPROVED]) {
+                     $statusCode = 'PROCESSING';
+                     $substatusCode = 'APPROVED';
+                 } elseif ($message['subject_index'] == self::SUBJECT_INDEX[self::SUBJECT_CANCELLED]) {
+                     $statusCode = 'CANCELLED';
+                     $substatusCode = 'USER_CHANGED_MIND';
+                 } elseif ($message['subject_index'] == self::SUBJECT_INDEX[self::SUBJECT_CHANGED]) {
+                     $statusCode = 'PROCESSING';
+                     $substatusCode = 'CHANGED';
+                 } elseif ($message['subject_index'] == self::SUBJECT_INDEX[self::SUBJECT_DELIVERED]) {
+                     $statusCode = 'DELIVERED';
+                     $substatusCode = 'DELIVERY_SERVICE_DELIVERED';
+                 }
+                 $count = self::processFlowwowOrders($order, $store, $statusCode, $substatusCode, $message['subject_index']);
+                 $marketplaceOrder = MarketplaceOrders::find()
+                 ->where(['marketplace_order_id' => (string)key($order)])
+                 ->one();
+                 if ($statusCode == 'DELIVERED' && $substatusCode == 'DELIVERY_SERVICE_DELIVERED' && $marketplaceOrder) {
+                     Yii::error('Заказ ' . $marketplaceOrder->marketplace_order_id);
+                     /* @var $marketplaceOrder MarketplaceOrders */
+                     $isCheckCreated = self::createCheckForMarketplaceOrder($marketplaceOrder);
+                 }
          }
          return $count;
      }
@@@ -2051,17 -2026,17 +2062,17 @@@
              if ($index == self::SUBJECT_INDEX[self::SUBJECT_NEW]) {
                  $marketplaceOrder = self::createOrder($orderDetails, $campaignId, $statusId, $substatusId);
                  if ($marketplaceOrder->save()) {
-                     self::sendMessageToTelegram($marketplaceOrder->guid, "Тестовое сообщение для https://tracker.yandex.ru/ERP-326 из [2]");
-                     $newOrdersCount += 1;
-                     self::createOrUpdateStatusHistory($marketplaceOrder->id, $statusId, $substatusId, $orderDetails);
-                     self::saveOrderItems($orderDetails, $marketplaceOrder->id, $marketplaceOrder->warehouse_guid);
+                     self::sendMessageToTelegram($marketplaceOrder->guid, "Новый  заказ Флаувау");
+                      $newOrdersCount += 1;
+                      self::createOrUpdateStatusHistory($marketplaceOrder->id, $statusId, $substatusId, $orderDetails);
+                      self::saveOrderItems($orderDetails, $marketplaceOrder->id, $marketplaceOrder->warehouse_guid);
                  } else {
 -                     Yii::error(
 -                         'Ошибка сохранения заказа: ' . json_encode(
 -                             $marketplaceOrder->getErrors(),
 -                             JSON_UNESCAPED_UNICODE
 -                         )
 -                     );
 +                    Yii::error(
 +                        'Ошибка сохранения заказа: ' . json_encode(
 +                            $marketplaceOrder->getErrors(),
 +                            JSON_UNESCAPED_UNICODE
 +                        )
 +                    );
                  }
                  self::setReadyMarketplaceOrders($marketplaceOrder);
              }