]> gitweb.erp-flowers.ru Git - erp24_rep/yii-erp24/.git/commitdiff
[ERP-409] draft
authorAlexander Smirnov <fredeom@mail.ru>
Tue, 22 Apr 2025 07:05:57 +0000 (10:05 +0300)
committerAlexander Smirnov <fredeom@mail.ru>
Tue, 22 Apr 2025 07:05:57 +0000 (10:05 +0300)
erp24/media/controllers/NotificationController.php
erp24/services/MarketplaceService.php

index 6da06c7f9c462dd4da767b9ac5499efdc1cfffc6..10808516b13d8d47d3270988086ea58fb997fb0c 100644 (file)
@@ -13,6 +13,7 @@ use yii\web\NotFoundHttpException;
 use yii_app\api3\core\exceptions\ErrorException;
 use yii_app\helpers\File;
 use yii_app\helpers\ImageHelper;
+use yii_app\records\CreateChecks;
 use yii_app\records\Files;
 use yii_app\records\Images;
 use yii_app\records\MarketplaceOrders;
@@ -197,13 +198,19 @@ class NotificationController extends Controller
                     }
                     $campaignId       = $data['campaignId'];
                     $orderId          = $data['orderId'];
-                    $newStatusCode    = $data['status'];
-                    $newSubstatusCode = $data['substatus'];
+                    $newStatusCode    = $data['status']; // DELIVERED
+                    $newSubstatusCode = $data['substatus']; // DELIVERY_SERVICE_DELIVERED
 
                     $marketplaceOrder = MarketplaceOrders::find()
                         ->where(['marketplace_order_id' => (string)$orderId])
                         ->one();
 
+                    /* @var $marketplaceOrder MarketplaceOrders */
+                    if ($newStatusCode == 'DELIVERED' && $newSubstatusCode == 'DELIVERY_SERVICE_DELIVERED' && $marketplaceOrder) {
+                        $createChecks = new CreateChecks;
+//
+                    }
+
                     if (!$marketplaceOrder) {
                         $orderData = MarketplaceService::fetchOrder($campaignId, $orderId);
                         if (empty($orderData)) {
index d765084f794942b7671c021ce4a7d13cbefe784d..400afdd38f249a071afd6e9c8dda03fe14b2dd6b 100644 (file)
@@ -1655,6 +1655,13 @@ class MarketplaceService
                     $substatusCode = 'DELIVERY_SERVICE_DELIVERED';
                 }
                 $count += self::processFlowwowOrders($order, $store, $statusCode, $substatusCode, $message['subject_index']);
+
+                if ($statusCode == 'DELIVERED' && $substatusCode == 'DELIVERY_SERVICE_DELIVERED') {
+                    $marketplaceOrder = MarketplaceOrders::find()
+                        ->where(['marketplace_order_id' => (string)key($order)])
+                        ->one();
+
+                }
             }
         }
         return $count;