From ba88a7c00c19b9e88fdfd11f23c986d7436866c8 Mon Sep 17 00:00:00 2001 From: fomichev Date: Thu, 17 Jul 2025 11:34:08 +0300 Subject: [PATCH] =?utf8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0?= =?utf8?q?=20=D1=87=D0=B5=D0=BA=D0=BE=D0=B2=20=D0=BD=D0=B0=20is=5Fmarketpl?= =?utf8?q?ace?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- erp24/api2/controllers/DataController.php | 36 ++++++++++++----------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php index 995cff78..89ed6c11 100644 --- a/erp24/api2/controllers/DataController.php +++ b/erp24/api2/controllers/DataController.php @@ -125,23 +125,25 @@ class DataController extends BaseController ->orderBy(['date' => SORT_DESC])->limit(10)->all(); foreach ($createChecks as $createCheck) { /** @var $createCheck CreateChecks */ - $mess["create_checks"][] = [ - "phone" => $createCheck->phone, - "kkm_id" => $createCheck->kkm_id, - "store_id" => $createCheck->store_id, - "seller_id" => $createCheck->seller_id, - "order_id" => trim($createCheck->order_id), - "type" => $createCheck->type, - "id" => $createCheck->check_id, - "sales_check" => $createCheck->sales_check, - "items" => json_decode($createCheck->items, true, 512, JSON_UNESCAPED_UNICODE), - "payments" => json_decode(empty($createCheck->payments) ? '[]' : $createCheck->payments, true, 512, JSON_UNESCAPED_UNICODE), - 'order_guid' => $createCheck->order_guid, - 'order_marketplace' => $createCheck->marketplace_order_id, - 'guid' => $createCheck->guid, - 'is_marketplace' => $createCheck->is_marketplace, - 'marketplace_name' => $createCheck->marketplace_name, - ]; + if ($createCheck->is_marketplace == 1 || (!empty($createCheck->kkm_id))) { + $mess["create_checks"][] = [ + "phone" => $createCheck->phone, + "kkm_id" => $createCheck->kkm_id, + "store_id" => $createCheck->store_id, + "seller_id" => $createCheck->seller_id, + "order_id" => trim($createCheck->order_id), + "type" => $createCheck->type, + "id" => $createCheck->check_id, + "sales_check" => $createCheck->sales_check, + "items" => json_decode($createCheck->items, true, 512, JSON_UNESCAPED_UNICODE), + "payments" => json_decode(empty($createCheck->payments) ? '[]' : $createCheck->payments, true, 512, JSON_UNESCAPED_UNICODE), + 'order_guid' => $createCheck->order_guid, + 'order_marketplace' => $createCheck->marketplace_order_id, + 'guid' => $createCheck->guid, + 'is_marketplace' => $createCheck->is_marketplace, + 'marketplace_name' => $createCheck->marketplace_name, + ]; + } } // $createChecksBags = CreateChecksBags::find()->where(['status' => '0'])->all(); -- 2.39.5