From: fomichev <vladimir.fomichev@erp-flowers.ru>
Date: Thu, 17 Jul 2025 08:34:08 +0000 (+0300)
Subject: Проверка чеков на is_marketplace
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=ba88a7c00c19b9e88fdfd11f23c986d7436866c8;p=erp24_rep%2Fyii-erp24%2F.git

Проверка чеков на is_marketplace
---

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();