From 3f858f8975ca310afbf6f7a97d6bf7e639a8da9f Mon Sep 17 00:00:00 2001 From: fomichev Date: Fri, 6 Jun 2025 11:09:07 +0300 Subject: [PATCH] =?utf8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?utf8?q?=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=B4=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api2/controllers/MarketplaceController.php | 13 +++++++++---- .../crud/MarketplaceOrder1cStatusesController.php | 2 -- .../_form.php | 0 .../create.php | 0 .../index.php | 0 .../update.php | 0 .../view.php | 0 7 files changed, 9 insertions(+), 6 deletions(-) rename erp24/views/crud/{marketplace-order-1c-statuses => marketplace-order1c-statuses}/_form.php (100%) rename erp24/views/crud/{marketplace-order-1c-statuses => marketplace-order1c-statuses}/create.php (100%) rename erp24/views/crud/{marketplace-order-1c-statuses => marketplace-order1c-statuses}/index.php (100%) rename erp24/views/crud/{marketplace-order-1c-statuses => marketplace-order1c-statuses}/update.php (100%) rename erp24/views/crud/{marketplace-order-1c-statuses => marketplace-order1c-statuses}/view.php (100%) diff --git a/erp24/api2/controllers/MarketplaceController.php b/erp24/api2/controllers/MarketplaceController.php index 411c1109..4d2a9dfc 100644 --- a/erp24/api2/controllers/MarketplaceController.php +++ b/erp24/api2/controllers/MarketplaceController.php @@ -42,22 +42,26 @@ class MarketplaceController extends BaseController $marketplaceGuid = Yii::$app->request->post('guid'); $marketplaceOrder = MarketplaceOrders::find()->where(['guid' => $marketplaceGuid])->one(); /** @var $marketplaceOrder MarketplaceOrders */ - $statuses = MarketplaceOrder1cStatuses::find()->where(['marketplace_id' => $marketplaceOrder->marketplace_id])->orderBy(['posit' => SORT_ASC])->all(); + $statuses = MarketplaceOrder1cStatuses::find() + ->where(['marketplace_id' => $marketplaceOrder->marketplace_id]) + ->orderBy(['posit' => SORT_ASC]) + ->all(); $data = []; foreach ($statuses as $status) { /* @var $status MarketplaceOrder1cStatuses */ $relftions = $status->relationsFrom; $relationsToSend = []; foreach ($relftions as $relation) { - $status = MarketplaceOrder1cStatuses ::find()->where(['id' => $relation['status_id_to']])->one(); - if(!$status) { + $statusTo = MarketplaceOrder1cStatuses::find()->where(['id' => $relation['status_id_to']])->one(); + if(!$statusTo) { continue; } $order = $relation['order']; $description = $relation['description']; $buttonText = $relation['button_text']; $relationsToSend[] = [ - 'status' => $status->status, + 'status' => $statusTo->status, + 'status_id' => $statusTo->status_id, 'description' => $description, 'button_text' => $buttonText, 'order' => $order, @@ -66,6 +70,7 @@ class MarketplaceController extends BaseController $data []= [ 'marketplace' => [1 => "ФлауВау", 2 => "ЯндексМаркет"][$status->marketplace_id], 'status' => $status->status, + 'status_id' => $status->status_id, 'status_instruction' => $status->status_instruction, 'status_relations' => $relationsToSend ]; diff --git a/erp24/controllers/crud/MarketplaceOrder1cStatusesController.php b/erp24/controllers/crud/MarketplaceOrder1cStatusesController.php index e6908e4e..2e2dad4e 100644 --- a/erp24/controllers/crud/MarketplaceOrder1cStatusesController.php +++ b/erp24/controllers/crud/MarketplaceOrder1cStatusesController.php @@ -59,8 +59,6 @@ class MarketplaceOrder1cStatusesController extends Controller } } - - $dataProvider = new ActiveDataProvider([ 'query' => MarketplaceOrder1cStatuses::find() ->with(['relationsFrom', 'nextStatuses']) diff --git a/erp24/views/crud/marketplace-order-1c-statuses/_form.php b/erp24/views/crud/marketplace-order1c-statuses/_form.php similarity index 100% rename from erp24/views/crud/marketplace-order-1c-statuses/_form.php rename to erp24/views/crud/marketplace-order1c-statuses/_form.php diff --git a/erp24/views/crud/marketplace-order-1c-statuses/create.php b/erp24/views/crud/marketplace-order1c-statuses/create.php similarity index 100% rename from erp24/views/crud/marketplace-order-1c-statuses/create.php rename to erp24/views/crud/marketplace-order1c-statuses/create.php diff --git a/erp24/views/crud/marketplace-order-1c-statuses/index.php b/erp24/views/crud/marketplace-order1c-statuses/index.php similarity index 100% rename from erp24/views/crud/marketplace-order-1c-statuses/index.php rename to erp24/views/crud/marketplace-order1c-statuses/index.php diff --git a/erp24/views/crud/marketplace-order-1c-statuses/update.php b/erp24/views/crud/marketplace-order1c-statuses/update.php similarity index 100% rename from erp24/views/crud/marketplace-order-1c-statuses/update.php rename to erp24/views/crud/marketplace-order1c-statuses/update.php diff --git a/erp24/views/crud/marketplace-order-1c-statuses/view.php b/erp24/views/crud/marketplace-order1c-statuses/view.php similarity index 100% rename from erp24/views/crud/marketplace-order-1c-statuses/view.php rename to erp24/views/crud/marketplace-order1c-statuses/view.php -- 2.39.5