From: Alexander Smirnov <fredeom@mail.ru>
Date: Fri, 18 Apr 2025 08:28:59 +0000 (+0300)
Subject: Merge branch 'develop' into feature_smirnov_erp-401_delivery_type_and_link
X-Git-Url: https://gitweb.erp-flowers.ru/?a=commitdiff_plain;h=6300cec5efe437cd77bf95358a0270eaf52f8dde;p=erp24_rep%2Fyii-erp24%2F.git

Merge branch 'develop' into feature_smirnov_erp-401_delivery_type_and_link

# Conflicts:
#	erp24/api2/controllers/DataController.php
---

6300cec5efe437cd77bf95358a0270eaf52f8dde
diff --cc erp24/api2/controllers/DataController.php
index c3e4d74e,48172cae..83fcdf13
--- a/erp24/api2/controllers/DataController.php
+++ b/erp24/api2/controllers/DataController.php
@@@ -794,26 -790,30 +794,30 @@@ class DataController extends BaseContro
                      'cancelled' => false,
                      'marketplace' => $marketplaceOrder->marketplace_id ?? 0,
                      'marketplace_name' => $marketplaceOrder->marketplace_name ?? 'ЯндексМаркет',
+                     'link' => $marketplaceOrder->order_link ?? '',
+                     'order_number' => $marketplaceOrder->marketplace_order_id,
+                     'delivery_date' => '',
+                     'delivery_time' => '',
 +                    'delivery_type' => $delivery_type,
                      '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,
 +//                '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();
              }