From 19796636ad5c895a3b412255e68cd4bdf0e87598 Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Tue, 22 Apr 2025 10:05:57 +0300 Subject: [PATCH] [ERP-409] draft --- erp24/media/controllers/NotificationController.php | 11 +++++++++-- erp24/services/MarketplaceService.php | 7 +++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/erp24/media/controllers/NotificationController.php b/erp24/media/controllers/NotificationController.php index 6da06c7f..10808516 100644 --- a/erp24/media/controllers/NotificationController.php +++ b/erp24/media/controllers/NotificationController.php @@ -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)) { diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php index d765084f..400afdd3 100644 --- a/erp24/services/MarketplaceService.php +++ b/erp24/services/MarketplaceService.php @@ -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; -- 2.39.5