Исправление деактивации истории и тестирование

diff --git a/erp24/media/controllers/NotificationController.php b/erp24/media/controllers/NotificationController.php
index b36e951d19f4a3ae0d43dab6d18aad723938e989..8720700d533b2e218f70c66d76f561d076bf79fd 100644 (file)
--- a/erp24/media/controllers/NotificationController.php
+++ b/erp24/media/controllers/NotificationController.php
@@ -3,6 +3,7 @@
 namespace app\controllers;
 
 use JsonException;
+use OpenAPI\Client\ObjectSerializer;
 use Yii;
 use yii\filters\AccessControl;
 use yii\helpers\Json;
@@ -24,12 +25,26 @@ class NotificationController extends Controller
 {
     public function actionTest()
     {
+        $request = Yii::$app->request;
         Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
         Yii::$app->response->statusCode = 200;
+        $body = $request->getRawBody();
+        if (!empty($body)) {
+            $content = json_decode($body, false, 512, JSON_THROW_ON_ERROR);
+            $testCampaignId = $request->get('campaign_id', 109969229);
+            $testData = ObjectSerializer::deserialize($content, '\OpenAPI\Client\Model\GetOrdersResponse', []);
+            if (!empty($testData) && isset($testData['orders'])) {
+                $ordersData[$testCampaignId] = $testData['orders'];
+                $result = MarketplaceService::processOrders($ordersData);
+                return [
+                    'response' => 'OK (test data)',
+                    'storeCount' => count($ordersData),
+                    'result' => $result
+                ];
+            }
+        }
         return [
-            'version'   => '1.0.0',
-            'name'      => 'БазаЦветов24',
-            'time' => gmdate('Y-m-d\TH:i:s\Z'),
+            'response' => 'No data',
         ];
     }
 

diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 05571d91f02af0896ae3c918504c4a86f6279321..dd37e377929c5f6af36b8eea8fb9e7ecb6244dd0 100644 (file)
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -1126,7 +1126,7 @@ class MarketplaceService
                                 $statusHistoryRecord->substatus_id !== (int)$substatusId)
                         ) {
                             $statusHistoryRecord->active = 0;
-                            $statusHistoryRecord->date_to = date('Y-m-d H:i:s');
+                            $statusHistoryRecord->date_end = date('Y-m-d H:i:s');
                             $statusHistoryRecord->save();
 
                             $newStatusHistoryRecord = new MarketplaceOrderStatusHistory();