From: Aleksey Filippov <Aleksey.Filippov@erp-flowers.ru>
Date: Thu, 17 Apr 2025 12:40:30 +0000 (+0300)
Subject: отладка мп
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=27e2f181bc87f800dc6640162fa3b5d834c25ad0;p=erp24_rep%2Fyii-erp24%2F.git

отладка мп
---

diff --git a/erp24/api2/controllers/DataController.php b/erp24/api2/controllers/DataController.php
index 3e0169bc..08a0c84d 100644
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@ -187,33 +187,22 @@ class DataController extends BaseController
             if (!empty($replacementInvoiceResult)) {
                 $mess['create_resortings'] = $replacementInvoiceResult;
             }
-            $mess['line'][] = __LINE__;
-            $onlyNewOrdersArray = $this->getMarketplaceNewOrders();
-            if (!empty($onlyNewOrdersArray)) {
-                $mess['line'][] = __LINE__;
-                $mess['create_new_orders'] = $onlyNewOrdersArray;
-            }
 
             $mess['line'][] = __LINE__;
             $newOrdersArray = $this->getMarketplaceOrders();
             if (!empty($newOrdersArray)) {
                 $mess['line'][] = __LINE__;
-//                if(!empty($newOrdersArray['items'])) {
-                    $mess['create_orders'] = $newOrdersArray;
-
-                    $mess['line'][] = ' '. __LINE__;
-//                }
+                $mess['create_orders'] = $newOrdersArray;
             }
             $mess['line'][] = __LINE__;
 
-
 //            $mess['delete_employee'] = [
 //                ['id' => '06202309-2808-0427-d4c9-100030128795'],
 //                ['id' => '06202309-2855-0215-4f5d-100043236389']
 //            ];
 
         } catch (Exception $e) {
-            $mess['line'][] = __LINE__;
+            $mess['line'][] = ' error ' . __LINE__;
             file_put_contents(self::OUT_DIR . '/request_error.txt', PHP_EOL . date("d.m.Y H:i:s", time()) . $e->getMessage() . ' ' . $e->getFile() . ' ' . $e->getLine(), FILE_APPEND);
         } finally {
             $jsonArray = [];
@@ -788,38 +777,39 @@ class DataController extends BaseController
                 }
                 $summ += $item['price'] * $item['count'];
             }
-            $eit = ExportImportTable::find()->where(['entity' => 'city_store', 'export_id' => 1, 'entity_id' => $marketplaceOrder->store_id])->one();
-            $store_id = $eit->export_val ?? '';
-            $result[] = [
-                'id' => $marketplaceOrder->guid,
-                'store_id' => $store_id,
-                'comment' => 'Создано из ERP ' . $marketplaceOrder->marketplace_order_id,
-                'summ' => $summ,
-                'seller_id' => '',
-                'status' => 0,
-                'cancelled' => false,
-                'marketplace' => $marketplaceOrder->marketplace_id ?? 0,
-                'marketplace_name' => $marketplaceOrder->marketplace_name ?? 'ЯндексМаркет',
-                'items' => $itemsFiltered,
-//                'marketplace_order_id' => $marketplaceOrder->marketplace_order_id,
-//                'status_id' => $marketplaceOrder->status_id,
-//                'substatus_id' => $marketplaceOrder->substatus_id,
-//                'warehouse_guid' => $marketplaceOrder->warehouse_guid,
-//                'creation_date' => $marketplaceOrder->creation_date,
-//                'updated_at' => $marketplaceOrder->updated_at,
-//                'returned_at' => $marketplaceOrder->returned_at,
-//                'return_data' => $marketplaceOrder->return_data,
-//                'fake' => $marketplaceOrder->fake,
-//                'total' => $marketplaceOrder->total,
-//                'delivery_total' => $marketplaceOrder->delivery_total,
-//                'buyer_total_before_discount' => $marketplaceOrder->buyer_total_before_discount,
-//                'tax_system' => $marketplaceOrder->tax_system,
-//                'payment_type' => $marketplaceOrder->payment_type,
-//                'payment_method' => $marketplaceOrder->payment_method,
-//                'cancel_requested' => $marketplaceOrder->cancel_requested,
-//                'raw_data' => $marketplaceOrder->raw_data,
-            ];
-            if (!empty($result['items'])) {
+            if (!empty($itemsFiltered)) {
+                $eit = ExportImportTable::find()->where(['entity' => 'city_store', 'export_id' => 1, 'entity_id' => $marketplaceOrder->store_id])->one();
+                $store_id = $eit->export_val ?? '';
+                $result[] = [
+                    'id' => $marketplaceOrder->guid,
+                    'store_id' => $store_id,
+                    'comment' => 'Создано из ERP ' . $marketplaceOrder->marketplace_order_id,
+                    'summ' => $summ,
+                    'seller_id' => '',
+                    'status' => 0,
+                    'cancelled' => false,
+                    'marketplace' => $marketplaceOrder->marketplace_id ?? 0,
+                    'marketplace_name' => $marketplaceOrder->marketplace_name ?? 'ЯндексМаркет',
+                    'items' => $itemsFiltered,
+    //                'marketplace_order_id' => $marketplaceOrder->marketplace_order_id,
+    //                'status_id' => $marketplaceOrder->status_id,
+    //                'substatus_id' => $marketplaceOrder->substatus_id,
+    //                'warehouse_guid' => $marketplaceOrder->warehouse_guid,
+    //                'creation_date' => $marketplaceOrder->creation_date,
+    //                'updated_at' => $marketplaceOrder->updated_at,
+    //                'returned_at' => $marketplaceOrder->returned_at,
+    //                'return_data' => $marketplaceOrder->return_data,
+    //                'fake' => $marketplaceOrder->fake,
+    //                'total' => $marketplaceOrder->total,
+    //                'delivery_total' => $marketplaceOrder->delivery_total,
+    //                'buyer_total_before_discount' => $marketplaceOrder->buyer_total_before_discount,
+    //                'tax_system' => $marketplaceOrder->tax_system,
+    //                'payment_type' => $marketplaceOrder->payment_type,
+    //                'payment_method' => $marketplaceOrder->payment_method,
+    //                'cancel_requested' => $marketplaceOrder->cancel_requested,
+    //                'raw_data' => $marketplaceOrder->raw_data,
+                ];
+
                 $marketplaceOrder->status_1c = MarketplaceOrders::STATUSES_1C_SENDED_TO_1C;
                 $marketplaceOrder->save();
             }