From 42f0f943d61957d6ad807ccd57b590c59c794b03 Mon Sep 17 00:00:00 2001
From: Vladimir Fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Fri, 22 Aug 2025 17:37:40 +0300
Subject: [PATCH] =?utf8?q?=D0=9A=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20=D0=BF?=
 =?utf8?q?=D0=BE=20=D1=83=D1=81=D0=BF=D0=B5=D1=85=D1=83=20=D0=B8=20=D0=BF?=
 =?utf8?q?=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D1=87=D0=B5=D0=BA=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 erp24/controllers/MarketplaceOrdersController.php | 2 +-
 erp24/services/MarketplaceService.php             | 1 -
 erp24/views/marketplace-orders/index.php          | 6 +++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/erp24/controllers/MarketplaceOrdersController.php b/erp24/controllers/MarketplaceOrdersController.php
index 09163194..07c89f42 100644
--- a/erp24/controllers/MarketplaceOrdersController.php
+++ b/erp24/controllers/MarketplaceOrdersController.php
@@ -654,7 +654,7 @@ class MarketplaceOrdersController extends Controller
     {
         $model = $this->findModel($id);
 
-        if ($model->status->code !== 'PROCESSING') {
+        if ($model->status->code !== 'DELIVERY') {
             Yii::$app->session->setFlash('error', 'Невозможно обновить статус заказа, так как он не находится в состоянии PROCESSING.');
             return $this->redirect(['index']);
         }
diff --git a/erp24/services/MarketplaceService.php b/erp24/services/MarketplaceService.php
index 4ed103b1..83bf3664 100644
--- a/erp24/services/MarketplaceService.php
+++ b/erp24/services/MarketplaceService.php
@@ -2485,7 +2485,6 @@ class MarketplaceService
             $createChecks = new CreateChecks;
             $createChecks->order_guid = $marketplaceOrder->guid;
             $createChecks->marketplace_order_id = $marketplaceOrder->marketplace_order_id;
-            $createChecks->order_id = (int)$marketplaceOrder->marketplace_order_id;
 
             $eit = ExportImportTable::find()
                 ->select(['export_val'])
diff --git a/erp24/views/marketplace-orders/index.php b/erp24/views/marketplace-orders/index.php
index 92732abd..a2461d54 100644
--- a/erp24/views/marketplace-orders/index.php
+++ b/erp24/views/marketplace-orders/index.php
@@ -113,10 +113,10 @@ YiiAsset::register($this);
                     $cancelUrl = Url::to(['update-to-cancelled-status', 'id' => $model->id]);
                     $output = Html::tag('span', $status, ['class' => "badge $class"]);
                     $output .= '<div class="mt-2">';
-                    if ($status === 'PROCESSING' && Yii::$app->user->identity->group_id == 81) {
-                        if ($substatus === 'STARTED') {
+                    if (in_array($status ,['PROCESSING', 'DELIVERY']) && Yii::$app->user->identity->group_id == 81) {
+                        if ($status === 'DELIVERY') {
                             $output .= '<div class="mt-2">' .
-                                Html::a('Готов', $readyUrl, [
+                                Html::a('Успех из МП', $readyUrl, [
                                     'class' => 'btn btn-sm btn-success',
                                     'data-method' => 'post',
                                     'data-confirm' =>
-- 
2.39.5